From ed46bcb755280152a79f50f8a3d60b934290cc9f Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Wed, 7 Jun 2023 22:51:04 +0100
Subject: [PATCH] Remove $cookiePath

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 libraries/classes/Config.php | 8 --------
 psalm-baseline.xml           | 2 --
 2 files changed, 10 deletions(-)

diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index 5592609d6c..9b43b680a4 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -792,17 +792,9 @@ class Config
 
     /**
      * 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
index 20463b678b..086d019b17 100644
--- 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>