Merge pull request #18024 from kamil-tekiela/Fix-ColumnPreferencesController

MauricioFauth · web-flow · commit a4a2915b9405 · 2023-01-26T11:27:23.000-03:00
Fix ColumnPreferencesController
diff --git a/libraries/classes/Controllers/Sql/ColumnPreferencesController.php b/libraries/classes/Controllers/Sql/ColumnPreferencesController.php
@@ -10,7 +10,6 @@
 use PhpMyAdmin\Http\ServerRequest;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\ResponseRenderer;
-use PhpMyAdmin\Sql;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Template;
 
@@ -29,7 +28,6 @@ final class ColumnPreferencesController extends AbstractController
     public function __construct(
         ResponseRenderer $response,
         Template $template,
-        Sql $sql,
         CheckUserPrivileges $checkUserPrivileges,
         DatabaseInterface $dbi
     ) {
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1865,11 +1865,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Setup/ServersController.php
 
-		-
-			message: "#^Constructor of class PhpMyAdmin\\\\Controllers\\\\Sql\\\\ColumnPreferencesController has an unused parameter \\$sql\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Sql/ColumnPreferencesController.php
-
 		-
 			message: "#^Parameter \\#1 \\$string of function htmlentities expects string, mixed given\\.$#"
 			count: 1
