Merge #18489 - Remove $cookiePath

williamdes · williamdes · commit 8468c104af1c · 2023-06-13T00:17:27.000+02:00
Pull-request: #18489 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -792,17 +792,9 @@ public function isHttps(): bool
 
     /**
      * Get phpMyAdmin root path
-     *
-     * @staticvar string|null $cookie_path
      */
     public function getRootPath(): string
     {
-        static $cookiePath = null;
-
-        if ($cookiePath !== null && ! defined('TESTSUITE')) {
-            return $cookiePath;
-        }
-
         $url = $this->get('PmaAbsoluteUri');
 
         if (! empty($url)) {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -282,11 +282,9 @@
       <code>$value</code>
     </MixedAssignment>
     <MixedInferredReturnType>
-      <code>string</code>
       <code>string|null</code>
     </MixedInferredReturnType>
     <MixedReturnStatement>
-      <code>$cookiePath</code>
       <code>$tempDir[$name]</code>
     </MixedReturnStatement>
     <PossiblyInvalidArgument>
