phpmyadmin
diff --git a/‎libraries/classes/Config.php‎
Lines changed: 6 additions & 7 deletions b/‎libraries/classes/Config.php‎
Lines changed: 6 additions & 7 deletions
diff --git a/‎psalm-baseline.xml‎
Lines changed: 2 additions & 3 deletions b/‎psalm-baseline.xml‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎test/classes/ConfigTest.php‎
Lines changed: 2 additions & 0 deletions b/‎test/classes/ConfigTest.php‎
Lines changed: 2 additions & 0 deletions
@@ -93,6 +93,9 @@ class Config
     /** @var int<0, max> */
     public int $server = 0;
 
+    /** @var array<string,string|null> $tempDir */
+    private static array $tempDir = [];
+
     public function __construct()
     {
         $this->config = new Settings([]);
@@ -1001,15 +1004,11 @@ public static function renderHeader(): string
      * Returns temporary dir path
      *
      * @param string $name Directory name
-     *
-     * @staticvar array<string,string|null> $temp_dir
      */
     public function getTempDir(string $name): string|null
     {
-        static $tempDir = [];
-
-        if (isset($tempDir[$name]) && ! defined('TESTSUITE')) {
-            return $tempDir[$name];
+        if (isset(self::$tempDir[$name])) {
+            return self::$tempDir[$name];
         }
 
         $path = $this->get('TempDir');
@@ -1026,7 +1025,7 @@ public function getTempDir(string $name): string|null
             }
         }
 
-        $tempDir[$name] = $path;
+        self::$tempDir[$name] = $path;
 
         return $path;
     }
 
@@ -263,7 +263,6 @@
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs']]]></code>
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs_mtime']]]></code>
       <code><![CDATA[$_SESSION['cache'][$cacheKey]['userprefs_type']]]></code>
-      <code>$tempDir[$name]</code>
     </MixedArrayAssignment>
     <MixedAssignment>
       <code><![CDATA[$GLOBALS['cfg']['LoginCookieValidity']]]></code>
@@ -280,10 +279,10 @@
       <code>$value</code>
     </MixedAssignment>
     <MixedInferredReturnType>
-      <code>string|null</code>
+      <code>string</code>
     </MixedInferredReturnType>
     <MixedReturnStatement>
-      <code>$tempDir[$name]</code>
+      <code>$cookiePath</code>
     </MixedReturnStatement>
     <PossiblyInvalidArgument>
       <code>$defaultValue</code>
 
@@ -12,6 +12,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\Attributes\Group;
+use ReflectionProperty;
 
 use function define;
 use function defined;
@@ -672,6 +673,7 @@ public function testGetTempDir(): void
         $this->assertDirectoryExists($dir);
         $this->assertDirectoryIsWritable($dir);
 
+        (new ReflectionProperty(Config::class, 'tempDir'))->setValue([]);
         $this->object->set('TempDir', $dir . DIRECTORY_SEPARATOR);
         // Check no double slash is here
         $this->assertEquals(
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ class Config`
`93`	`93`	`/** @var int<0, max> */`
`94`	`94`	`public int $server = 0;`
`95`	`95`
	`96`	`+ /** @var array<string,string\|null> $tempDir */`
	`97`	`+ private static array $tempDir = [];`
	`98`	`+`
`96`	`99`	`public function __construct()`
`97`	`100`	`{`
`98`	`101`	`$this->config = new Settings([]);`
`@@ -1001,15 +1004,11 @@ public static function renderHeader(): string`
`1001`	`1004`	`* Returns temporary dir path`
`1002`	`1005`	`*`
`1003`	`1006`	`* @param string $name Directory name`
`1004`		`- *`
`1005`		`- * @staticvar array<string,string\|null> $temp_dir`
`1006`	`1007`	`*/`
`1007`	`1008`	`public function getTempDir(string $name): string\|null`
`1008`	`1009`	`{`
`1009`		`- static $tempDir = [];`
`1010`		`-`
`1011`		`- if (isset($tempDir[$name]) && ! defined('TESTSUITE')) {`
`1012`		`- return $tempDir[$name];`
	`1010`	`+ if (isset(self::$tempDir[$name])) {`
	`1011`	`+ return self::$tempDir[$name];`
`1013`	`1012`	`}`
`1014`	`1013`
`1015`	`1014`	`$path = $this->get('TempDir');`
`@@ -1026,7 +1025,7 @@ public function getTempDir(string $name): string\|null`
`1026`	`1025`	`}`
`1027`	`1026`	`}`
`1028`	`1027`
`1029`		`- $tempDir[$name] = $path;`
	`1028`	`+ self::$tempDir[$name] = $path;`
`1030`	`1029`
`1031`	`1030`	`return $path;`
`1032`	`1031`	`}`