diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 24091c044c..c01d4f5243 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2956,7 +2956,7 @@ parameters: path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#5 \$errorUrl of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' + message: '#^Parameter \#5 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' identifier: argument.type count: 2 path: src/Controllers/Export/ExportController.php @@ -2967,12 +2967,6 @@ parameters: count: 2 path: src/Controllers/Export/ExportController.php - - - message: '#^Parameter \#6 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportTable\(\) expects string, mixed given\.$#' - identifier: argument.type - count: 2 - path: src/Controllers/Export/ExportController.php - - message: '#^Parameter \#7 \$exportType of method PhpMyAdmin\\Export\\Export\:\:exportDatabase\(\) expects string, mixed given\.$#' identifier: argument.type diff --git a/psalm-baseline.xml b/psalm-baseline.xml index e6dfe2d38f..7383b25b50 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1546,8 +1546,6 @@ - - @@ -1685,8 +1683,6 @@ - - @@ -1703,8 +1699,6 @@ - - @@ -5521,7 +5515,6 @@ - diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php index 1d15d1fa2f..5179962407 100644 --- a/src/Controllers/Export/ExportController.php +++ b/src/Controllers/Export/ExportController.php @@ -446,7 +446,6 @@ final class ExportController implements InvocableController Current::$table, $whatStrucOrData, $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, @@ -467,7 +466,6 @@ final class ExportController implements InvocableController Current::$table, $whatStrucOrData, $exportPlugin, - $GLOBALS['errorUrl'], $GLOBALS['export_type'], $doRelation, $doComments, diff --git a/src/Export/Export.php b/src/Export/Export.php index c0a2c2c33a..8834e8dfb1 100644 --- a/src/Export/Export.php +++ b/src/Export/Export.php @@ -854,7 +854,6 @@ class Export * @param string $table the table to export * @param string $whatStrucOrData structure or data or both * @param ExportPlugin $exportPlugin the selected export plugin - * @param string $errorUrl the URL in case of error * @param string $exportType the export type * @param bool $doRelation whether to export relation info * @param bool $doComments whether to add comments @@ -871,7 +870,6 @@ class Export string $table, string $whatStrucOrData, ExportPlugin $exportPlugin, - string $errorUrl, string $exportType, bool $doRelation, bool $doComments,