Merge pull request phpmyadmin#18987 from MauricioFauth/config-instance

Inject Config instead of using Config::getInstance()
liviuconcioiu · Feb 14, 2024 · 8dbb62a · 8dbb62a
2 parents 048c51f + fa68771
commit 8dbb62a
Show file tree

Hide file tree

Showing 82 changed files with 935 additions and 1,045 deletions.
diff --git a/app/services.php b/app/services.php
@@ -118,11 +118,11 @@
         'import_simulate_dml' => ['class' => SimulateDml::class, 'arguments' => ['@dbi']],
         'insert_edit' => [
             'class' => InsertEdit::class,
-            'arguments' => ['@dbi', '@relation', '@transformations', '@file_listing', '@template'],
+            'arguments' => ['@dbi', '@relation', '@transformations', '@file_listing', '@template', '@config'],
         ],
         'navigation' => [
             'class' => Navigation::class,
-            'arguments' => ['@template', '@relation', '@dbi'],
+            'arguments' => ['@template', '@relation', '@dbi', '@config'],
         ],
         'normalization' => [
             'class' => Normalization::class,
@@ -142,7 +142,7 @@
             'arguments' => ['$dbi' => '@dbi'],
         ],
         AuthenticationPluginFactory::class => ['class' => AuthenticationPluginFactory::class],
-        'relation' => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi']],
+        'relation' => ['class' => Relation::class, 'arguments' => ['$dbi' => '@dbi', '$config' => '@config']],
         'relation_cleanup' => ['class' => RelationCleanup::class, 'arguments' => ['@dbi', '@relation']],
         'replication' => ['class' => Replication::class, 'arguments' => ['$dbi' => '@dbi']],
         'replication_gui' => [
@@ -173,6 +173,7 @@
                 '@transformations',
                 '@template',
                 '@bookmarkRepository',
+                '@config',
             ],
         ],
         'sql_query_form' => [

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -9390,58 +9390,58 @@ parameters:
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
-		-
-			message: "#^Parameter \\#1 \\$item of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeColumn constructor expects array, mixed given\\.$#"
-			count: 1
-			path: src/Navigation/NavigationTree.php
-
 		-
 			message: "#^Parameter \\#1 \\$key of function array_key_exists expects int\\|string, mixed given\\.$#"
 			count: 2
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeDatabase constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:getChild\\(\\) expects string, \\(int\\|string\\) given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeIndex constructor expects string, mixed given\\.$#"
-			count: 1
+			message: "#^Parameter \\#1 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:getChild\\(\\) expects string, mixed given\\.$#"
+			count: 5
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeTable constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$string of function strlen expects string, mixed given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeTrigger constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$string of method PhpMyAdmin\\\\Navigation\\\\NavigationTree\\:\\:parsePath\\(\\) expects string, mixed given\\.$#"
+			count: 4
+			path: src/Navigation/NavigationTree.php
+
+		-
+			message: "#^Parameter \\#1 \\$string1 of function strcasecmp expects string, string\\|null given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:getChild\\(\\) expects string, \\(int\\|string\\) given\\.$#"
+			message: "#^Parameter \\#2 \\$item of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeColumn constructor expects array, mixed given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:getChild\\(\\) expects string, mixed given\\.$#"
-			count: 5
+			message: "#^Parameter \\#2 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeDatabase constructor expects string, mixed given\\.$#"
+			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$string of function strlen expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeIndex constructor expects string, mixed given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$string of method PhpMyAdmin\\\\Navigation\\\\NavigationTree\\:\\:parsePath\\(\\) expects string, mixed given\\.$#"
-			count: 4
+			message: "#^Parameter \\#2 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeTable constructor expects string, mixed given\\.$#"
+			count: 1
 			path: src/Navigation/NavigationTree.php
 
 		-
-			message: "#^Parameter \\#1 \\$string1 of function strcasecmp expects string, string\\|null given\\.$#"
+			message: "#^Parameter \\#2 \\$name of class PhpMyAdmin\\\\Navigation\\\\Nodes\\\\NodeTrigger constructor expects string, mixed given\\.$#"
 			count: 1
 			path: src/Navigation/NavigationTree.php
 
@@ -9546,7 +9546,7 @@ parameters:
 			path: src/Navigation/Nodes/NodeColumn.php
 
 		-
-			message: "#^Parameter \\#1 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:__construct\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#2 \\$name of method PhpMyAdmin\\\\Navigation\\\\Nodes\\\\Node\\:\\:__construct\\(\\) expects string, mixed given\\.$#"
 			count: 1
 			path: src/Navigation/Nodes/NodeColumn.php
 
@@ -14021,7 +14021,7 @@ parameters:
 			path: src/Sql.php
 
 		-
-			message: "#^Parameter \\#6 \\$sqlQuery of class PhpMyAdmin\\\\Display\\\\Results constructor expects string, mixed given\\.$#"
+			message: "#^Parameter \\#7 \\$sqlQuery of class PhpMyAdmin\\\\Display\\\\Results constructor expects string, mixed given\\.$#"
 			count: 1
 			path: src/Sql.php