Merge pull request #19801 from MauricioFauth/dbi-tests

MauricioFauth · web-flow · commit b47640bde7a9 · 2025-08-07T18:14:33.000-03:00
Add unit tests for some `Dbal\DatabaseInterface` methods
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -17305,7 +17305,7 @@ parameters:
 			message: '#^@readonly property PhpMyAdmin\\Config\\Settings\\Debug\:\:\$sql is assigned outside of its declaring class\.$#'
 			identifier: property.readOnlyByPhpDocAssignOutOfClass
 			count: 2
-			path: tests/unit/DatabaseInterfaceTest.php
+			path: tests/unit/Dbal/DatabaseInterfaceTest.php
 
 		-
 			message: '''
@@ -17314,7 +17314,7 @@ parameters:
 			'''
 			identifier: staticMethod.deprecated
 			count: 7
-			path: tests/unit/DatabaseInterfaceTest.php
+			path: tests/unit/Dbal/DatabaseInterfaceTest.php
 
 		-
 			message: '''
@@ -17323,19 +17323,19 @@ parameters:
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
-			path: tests/unit/DatabaseInterfaceTest.php
+			path: tests/unit/Dbal/DatabaseInterfaceTest.php
 
 		-
 			message: '#^Parameter \#2 \$result of method PhpMyAdmin\\Tests\\Stubs\\DbiDummy\:\:addResult\(\) expects bool\|list\<non\-empty\-list\<float\|int\|string\|null\>\>, array\<array\<string\>\>\|false given\.$#'
 			identifier: argument.type
 			count: 1
-			path: tests/unit/DatabaseInterfaceTest.php
+			path: tests/unit/Dbal/DatabaseInterfaceTest.php
 
 		-
 			message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\) does not accept array\{host\: string, port\: string, socket\: string, ssl\: bool, ssl_key\: string\|null, ssl_cert\: string\|null, ssl_ca\: string\|null, ssl_ca_path\: string\|null, \.\.\.\}\.$#'
 			identifier: assign.propertyType
 			count: 1
-			path: tests/unit/DatabaseInterfaceTest.php
+			path: tests/unit/Dbal/DatabaseInterfaceTest.php
 
 		-
 			message: '''
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -10585,7 +10585,7 @@
       <code><![CDATA[DatabaseInterface::getInstance()]]></code>
     </DeprecatedMethod>
   </file>
-  <file src="tests/unit/DatabaseInterfaceTest.php">
+  <file src="tests/unit/Dbal/DatabaseInterfaceTest.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$value]]></code>
     </ArgumentTypeCoercion>
diff --git a/tests/unit/AbstractTestCase.php b/tests/unit/AbstractTestCase.php
@@ -73,9 +73,11 @@ protected function setUp(): void
         ContainerBuilder::$container = null;
     }
 
-    protected function createDatabaseInterface(DbiExtension|null $extension = null): DatabaseInterface
-    {
-        return DatabaseInterface::getInstanceForTest($extension ?? $this->createDbiDummy());
+    protected function createDatabaseInterface(
+        DbiExtension|null $extension = null,
+        Config|null $config = null,
+    ): DatabaseInterface {
+        return DatabaseInterface::getInstanceForTest($extension ?? $this->createDbiDummy(), $config);
     }
 
     protected function createDbiDummy(): DbiDummy
diff --git a/tests/unit/Dbal/DatabaseInterfaceTest.php b/tests/unit/Dbal/DatabaseInterfaceTest.php

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,11 @@ protected function setUp(): void`
`73`	`73`	`ContainerBuilder::$container = null;`
`74`	`74`	`}`
`75`	`75`
`76`		`- protected function createDatabaseInterface(DbiExtension\|null $extension = null): DatabaseInterface`
`77`		`- {`
`78`		`- return DatabaseInterface::getInstanceForTest($extension ?? $this->createDbiDummy());`
	`76`	`+ protected function createDatabaseInterface(`
	`77`	`+ DbiExtension\|null $extension = null,`
	`78`	`+ Config\|null $config = null,`
	`79`	`+ ): DatabaseInterface {`
	`80`	`+ return DatabaseInterface::getInstanceForTest($extension ?? $this->createDbiDummy(), $config);`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`protected function createDbiDummy(): DbiDummy`