Merge pull request #18460 from kamil-tekiela/Globals-in-Status

MauricioFauth · web-flow · commit 94812363883e · 2023-06-05T12:50:55.000-03:00
Remove unused globals
diff --git a/libraries/classes/Controllers/Import/StatusController.php b/libraries/classes/Controllers/Import/StatusController.php
@@ -31,11 +31,9 @@ public function __construct(private Template $template)
     public function __invoke(ServerRequest $request): void
     {
         $GLOBALS['SESSION_KEY'] ??= null;
-        $GLOBALS['upload_id'] ??= null;
-        $GLOBALS['plugins'] ??= null;
         $GLOBALS['timestamp'] ??= null;
 
-        [$GLOBALS['SESSION_KEY'], $GLOBALS['upload_id'], $GLOBALS['plugins']] = Ajax::uploadProgressSetup();
+        [$GLOBALS['SESSION_KEY']] = Ajax::uploadProgressSetup();
 
         // $_GET["message"] is used for asking for an import message
         if ($request->hasQueryParam('message')) {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2154,9 +2154,7 @@
   </file>
   <file src="libraries/classes/Controllers/Import/StatusController.php">
     <InvalidArrayOffset>
-      <code><![CDATA[$GLOBALS['plugins']]]></code>
       <code><![CDATA[$GLOBALS['timestamp']]]></code>
-      <code><![CDATA[$GLOBALS['upload_id']]]></code>
     </InvalidArrayOffset>
     <MixedArgument>
       <code><![CDATA[$_SESSION['Import_message']['message'] ?? '']]></code>
@@ -2166,9 +2164,7 @@
       <code><![CDATA[$_SESSION['Import_message']['message']]]></code>
     </MixedArrayAssignment>
     <MixedAssignment>
-      <code><![CDATA[$GLOBALS['plugins']]]></code>
       <code><![CDATA[$GLOBALS['timestamp']]]></code>
-      <code><![CDATA[$GLOBALS['upload_id']]]></code>
     </MixedAssignment>
     <PossiblyUnusedMethod>
       <code>__construct</code>
