Fix for php/php-src#17858

danog · Feb 18, 2025 · 2b291ff · 2b291ff
1 parent b01cf3c
commit 2b291ff
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1,783 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -24,7 +24,7 @@
     <file>tests/</file>
 
     <!-- These are just examples and stub classes/files, so it doesn't really matter if they're PSR-2 compliant. -->
-    <exclude-pattern>src/Psalm/Internal/Preloader.php</exclude-pattern>
+    <exclude-pattern>src/Psalm/Internal/PreloaderList.php</exclude-pattern>
     <exclude-pattern>src/Psalm/Internal/Stubs/</exclude-pattern>
     <exclude-pattern>tests/fixtures/</exclude-pattern>
 

diff --git a/src/Psalm/Internal/Cli/LanguageServer.php b/src/Psalm/Internal/Cli/LanguageServer.php
@@ -13,7 +13,6 @@
 use Psalm\Internal\LanguageServer\ClientConfiguration;
 use Psalm\Internal\LanguageServer\LanguageServer as LanguageServerLanguageServer;
 use Psalm\Internal\LanguageServer\PathMapper;
-use Psalm\Internal\Preloader;
 use Psalm\Report;
 
 use function array_key_exists;
@@ -315,8 +314,6 @@ static function (string $arg) use ($valid_long_options): void {
             $ini_handler->check();
         }
 
-        Preloader::preload();
-
         setlocale(LC_CTYPE, 'C');
 
         $path_mapper = self::createPathMapper($options, $current_dir);

diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -1019,13 +1019,7 @@ private static function restart(array $options, int $threads, int $scanThreads,
             }
         }
 
-        if ($hasJit) {
-            $progress->write("JIT compilation in progress... ");
-        }
-        Preloader::preload();
-        if ($hasJit) {
-            $progress->write("Done.".PHP_EOL.PHP_EOL);
-        }
+        Preloader::preload($progress, $hasJit);
     }
 
     /** @param array<int, string> $argv */