Merge pull request #20146 from MauricioFauth/unit-test-fixes

MauricioFauth · web-flow · commit c29949943827 · 2026-02-21T16:43:01.000-03:00
Fix failing unit tests
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -15399,7 +15399,7 @@ parameters:
 				Use dependency injection instead\.$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 9
+			count: 7
 			path: tests/unit/Display/ResultsTest.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -9841,8 +9841,6 @@
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
-      <code><![CDATA[Config::getInstance()]]></code>
-      <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
     <DocblockTypeContradiction>
       <code><![CDATA[assertSame]]></code>
diff --git a/tests/unit/AbstractTestCase.php b/tests/unit/AbstractTestCase.php
@@ -5,12 +5,14 @@
 namespace PhpMyAdmin\Tests;
 
 use PhpMyAdmin\Cache;
+use PhpMyAdmin\Charsets;
 use PhpMyAdmin\Config;
 use PhpMyAdmin\ConfigStorage\Relation;
 use PhpMyAdmin\Container\ContainerBuilder;
 use PhpMyAdmin\Current;
 use PhpMyAdmin\Dbal\DatabaseInterface;
 use PhpMyAdmin\Dbal\DbiExtension;
+use PhpMyAdmin\Encoding;
 use PhpMyAdmin\I18n\LanguageManager;
 use PhpMyAdmin\Plugins\Export\ExportSql;
 use PhpMyAdmin\Sql;
@@ -68,8 +70,14 @@ protected function setUp(): void
         Cache::purge();
         Tracker::disable();
 
-        (new ReflectionProperty(Relation::class, 'cache'))->setValue(null, null);
         ContainerBuilder::$container = null;
+        DatabaseInterface::$instance = null;
+        Config::$instance = null;
+        (new ReflectionProperty(Template::class, 'twig'))->setValue(null, null);
+        (new ReflectionProperty(Relation::class, 'cache'))->setValue(null, null);
+        (new ReflectionProperty(Charsets::class, 'charsets'))->setValue(null, []);
+        (new ReflectionProperty(Charsets::class, 'collations'))->setValue(null, []);
+        (new ReflectionProperty(Encoding::class, 'engine'))->setValue(null, null);
     }
 
     protected function createDatabaseInterface(
@@ -103,18 +111,6 @@ protected function setProxySettings(): void
         HttpRequest::setProxySettingsFromEnv();
     }
 
-    /**
-     * Destroys the environment built for the test.
-     * Clean all variables
-     */
-    protected function tearDown(): void
-    {
-        ContainerBuilder::$container = null;
-        DatabaseInterface::$instance = null;
-        Config::$instance = null;
-        (new ReflectionProperty(Template::class, 'twig'))->setValue(null, null);
-    }
-
     /**
      * Call protected functions by setting visibility to public.
      *
diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php
@@ -73,14 +73,14 @@ protected function setUp(): void
 
         $this->setLanguage();
 
-        $this->dummyDbi = $this->createDbiDummy();
-        $this->dbi = $this->createDatabaseInterface($this->dummyDbi);
-        DatabaseInterface::$instance = $this->dbi;
         Current::$server = 2;
         Current::$database = 'db';
         Current::$table = 'table';
-        $config = Config::getInstance();
+        $config = Config::$instance = new Config();
         $config->selectedServer['DisableIS'] = false;
+        $this->dummyDbi = $this->createDbiDummy();
+        $this->dbi = $this->createDatabaseInterface($this->dummyDbi, $config);
+        DatabaseInterface::$instance = $this->dbi;
         $this->object = new DisplayResults($this->dbi, $config, 'as', '', 2, '', '');
         $_SESSION[' HMAC_secret '] = 'test';
     }
@@ -1118,8 +1118,9 @@ public static function providerSetConfigParamsForDisplayTable(): array
 
     public function testGetTable(): void
     {
-        $config = Config::getInstance();
+        $config = Config::$instance = new Config();
         $config->selectedServer['DisableIS'] = true;
+        $this->dbi = $this->createDatabaseInterface($this->dummyDbi, $config);
 
         Current::$server = 2;
         Current::$database = 'test_db';

Original file line number	Diff line number	Diff line change
`@@ -15399,7 +15399,7 @@ parameters:`
`15399`	`15399`	`Use dependency injection instead\.$#`
`15400`	`15400`	`'''`
`15401`	`15401`	`identifier: staticMethod.deprecated`
`15402`		`- count: 9`
	`15402`	`+ count: 7`
`15403`	`15403`	`path: tests/unit/Display/ResultsTest.php`
`15404`	`15404`
`15405`	`15405`	`-`