Implement proper global function/constant hoisting

src/Psalm/Codebase.php

@@ -589,6 +589,14 @@ public function getStubbedConstantType(string $const_id): ?Union
         return self::$stubbed_constants[$const_id] ?? null;
     }
 
+    /**
+     * @return array<string, Union>
+     */
+    public function addGlobalConstantTypes(array $stubs): void
+    {
+        self::$stubbed_constants += $stubs;
+    }
+
     /**
      * @return array<string, Union>
      */

src/Psalm/Internal/Codebase/Functions.php

@@ -153,6 +153,14 @@ public function addGlobalFunction(string $function_id, FunctionStorage $storage)
         self::$stubbed_functions[strtolower($function_id)] = $storage;
     }
 
+    /**
+     * @return array<string, FunctionStorage>
+     */
+    public function addGlobalFunctions(array $stubs): void
+    {
+        self::$stubbed_functions += $stubs;
+    }
+
     public function hasStubbedFunction(string $function_id): bool
     {
         return isset(self::$stubbed_functions[strtolower($function_id)]);

src/Psalm/Internal/Codebase/Scanner.php

@@ -78,7 +78,9 @@
  *     classlike_storage:array<string, ClassLikeStorage>,
  *     file_storage:array<lowercase-string, FileStorage>,
  *     new_file_content_hashes: array<string, string>,
- *     taint_data: ?TaintFlowGraph
+ *     taint_data: ?TaintFlowGraph,
+ *     global_constants: array<string, Union>,
+ *     global_functions: array<string, FunctionStorage>
  * }
  */
 
@@ -352,6 +354,9 @@ private function scanFilePaths(int $pool_size): bool
                         $pool_data['new_file_content_hashes'],
                     );
                 }
+
+                $this->codebase->addGlobalConstantTypes($pool['global_constants']);
+                $this->codebase->functions->addGlobalFunctions($pool['global_functions']);
             }
         } else {
             foreach ($files_to_scan as $file_path => $_) {
@@ -364,31 +369,6 @@ private function scanFilePaths(int $pool_size): bool
             $this->codebase->statements_provider->parser_cache_provider->saveFileContentHashes();
         }
 
-        foreach ($files_to_scan as $scanned_file) {
-            if ($this->codebase->all_functions_global || $this->config->hasStubFile($scanned_file)) {
-                $file_storage = $this->file_storage_provider->get($scanned_file);
-
-                foreach ($file_storage->functions as $function_storage) {
-                    if ($function_storage->cased_name
-                        && !$this->codebase->functions->hasStubbedFunction($function_storage->cased_name)
-                    ) {
-                        $this->codebase->functions->addGlobalFunction(
-                            $function_storage->cased_name,
-                            $function_storage,
-                        );
-                    }
-                }
-            }
-
-            if ($this->codebase->all_constants_global || $this->config->hasStubFile($scanned_file)) {
-                $file_storage = $this->file_storage_provider->get($scanned_file);
-
-                foreach ($file_storage->constants as $name => $type) {
-                    $this->codebase->addGlobalConstantType($name, $type);
-                }
-            }
-        }
-
         $this->file_reference_provider->addClassLikeFiles($this->classlike_files);
 
         return true;

src/Psalm/Internal/Fork/ShutdownScannerTask.php

@@ -47,6 +47,8 @@ public function run(Channel $channel, Cancellation $cancellation): mixed
                 ? $statements_provider->parser_cache_provider->getNewFileContentHashes()
                 : [],
             'taint_data' => $codebase->taint_flow_graph,
+            'global_constants' => $codebase->getAllStubbedConstants(),
+            'global_functions' => $codebase->functions->getAllStubbedFunctions(),
         ];
     }
 }