Make sure $argv and $argc are not globally available

src/Psalm/Checker/FileChecker.php

@@ -196,6 +196,13 @@ class FileChecker extends SourceChecker implements StatementsSource
 
         $this->context = new Context();
         $this->context->count_references = $project_checker->count_references;
+        $this->context->vars_in_scope['$argc'] = Type::getInt();
+        $this->context->vars_in_scope['$argv'] = new Type\Union([
+            new Type\Atomic\TArray([
+                Type::getInt(),
+                Type::getString(),
+            ])
+        ]);
     }
 
     /**

src/Psalm/Checker/Statements/ExpressionChecker.php

@@ -490,17 +490,15 @@ class ExpressionChecker
         if (in_array(
             $stmt->name,
             [
+                'GLOBALS',
                 '_SERVER',
                 '_GET',
                 '_POST',
-                '_COOKIE',
-                '_REQUEST',
                 '_FILES',
-                '_ENV',
+                '_COOKIE',
                 '_SESSION',
-                'GLOBALS',
-                'argv',
-                'argc',
+                '_REQUEST',
+                '_ENV',
             ]
         )
         ) {