Fix an issue reported by Psalm

MauricioFauth · MauricioFauth · commit 3d3010916e95 · 2022-05-21T17:31:03.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
@@ -90,7 +90,6 @@ public static function run(): void
         $GLOBALS['auth_plugin'] = $GLOBALS['auth_plugin'] ?? null;
         $GLOBALS['theme'] = $GLOBALS['theme'] ?? null;
         $GLOBALS['urlParams'] = $GLOBALS['urlParams'] ?? null;
-        $GLOBALS['isMinimumCommon'] = $GLOBALS['isMinimumCommon'] ?? null;
         $GLOBALS['token_mismatch'] = $GLOBALS['token_mismatch'] ?? null;
 
         $request = self::getRequest();
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
@@ -429,8 +429,6 @@ private function setConnectionCollation(): void
      */
     public function loadUserPreferences(): void
     {
-        $GLOBALS['isMinimumCommon'] = $GLOBALS['isMinimumCommon'] ?? null;
-
         // index.php should load these settings, so that phpmyadmin.css.php
         // will have everything available in session cache
         $server = $GLOBALS['server'] ?? (! empty($GLOBALS['cfg']['ServerDefault'])
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -249,14 +249,13 @@
       <code>$GLOBALS['cfg']['MysqlMinVersion']['internal']</code>
       <code>$GLOBALS['cfg']['Server']['user']</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="15">
+    <MixedAssignment occurrences="14">
       <code>$GLOBALS['auth_plugin']</code>
       <code>$GLOBALS['back']</code>
       <code>$GLOBALS['back']</code>
       <code>$GLOBALS['cfg']</code>
       <code>$GLOBALS['goto']</code>
       <code>$GLOBALS['isConfigLoading']</code>
-      <code>$GLOBALS['isMinimumCommon']</code>
       <code>$GLOBALS['server']</code>
       <code>$GLOBALS['sql_query']</code>
       <code>$GLOBALS['theme']</code>
@@ -345,10 +344,9 @@
       <code>$this-&gt;settings['Servers'][$server]</code>
       <code>$this-&gt;settings['Servers'][$this-&gt;settings['ServerDefault']]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="30">
+    <MixedAssignment occurrences="29">
       <code>$GLOBALS['cfg']['LoginCookieValidity']</code>
       <code>$GLOBALS['isConfigLoading']</code>
-      <code>$GLOBALS['isMinimumCommon']</code>
       <code>$collation_connection</code>
       <code>$config_data</code>
       <code>$default_value</code>
@@ -16601,9 +16599,4 @@
       <code>is_string($text)</code>
     </RedundantConditionGivenDocblockType>
   </file>
-  <file src="url.php">
-    <UnusedVariable occurrences="1">
-      <code>$isMinimumCommon</code>
-    </UnusedVariable>
-  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -255,6 +255,7 @@
             import_file: string,
             import_file_name: string,
             import_text: string,
+            isMinimumCommon?: true,
             is_create_db_priv: bool,
             is_reload_priv: bool,
             knjenc: string,
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
@@ -39,7 +39,7 @@
 // use default error handler
 restore_error_handler();
 
-// Save current language in a cookie, required since we set $isMinimumCommon
+// Save current language in a cookie, required since we set $GLOBALS['isMinimumCommon']
 $GLOBALS['config']->setCookie('pma_lang', (string) $GLOBALS['lang']);
 $GLOBALS['config']->set('is_setup', true);
 
diff --git a/url.php b/url.php
@@ -35,7 +35,7 @@
 
 require AUTOLOAD_FILE;
 
-$isMinimumCommon = true;
+$GLOBALS['isMinimumCommon'] = true;
 
 Common::run();
 

Original file line number	Diff line number	Diff line change
`@@ -429,8 +429,6 @@ private function setConnectionCollation(): void`
`429`	`429`	`*/`
`430`	`430`	`public function loadUserPreferences(): void`
`431`	`431`	`{`
`432`		`- $GLOBALS['isMinimumCommon'] = $GLOBALS['isMinimumCommon'] ?? null;`
`433`		`-`
`434`	`432`	`// index.php should load these settings, so that phpmyadmin.css.php`
`435`	`433`	`// will have everything available in session cache`
`436`	`434`	`$server = $GLOBALS['server'] ?? (! empty($GLOBALS['cfg']['ServerDefault'])`