[DependencyInjection] Optimize PHP preloading

lyrixx · lyrixx · commit e320c711700a · 2021-09-02T16:47:15.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -342,7 +342,7 @@ class %s extends {$options['class']}
 
                 $code[$options['class'].'.preload.php'] .= <<<'EOF'
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
 EOF;
             }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/Preloader.php b/src/Symfony/Component/DependencyInjection/Dumper/Preloader.php
@@ -37,7 +37,7 @@ public static function append(string $file, array $list): void
         file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), \FILE_APPEND);
     }
 
-    public static function preload(array $classes): void
+    public static function preload(array $classes, array $preloaded = []): array
     {
         set_error_handler(function ($t, $m, $f, $l) {
             if (error_reporting() & $t) {
@@ -50,7 +50,6 @@ public static function preload(array $classes): void
         });
 
         $prev = [];
-        $preloaded = [];
 
         try {
             while ($prev !== $classes) {
@@ -65,6 +64,8 @@ public static function preload(array $classes): void
         } finally {
             restore_error_handler();
         }
+
+        return $preloaded;
     }
 
     private static function doPreload(string $class, array &$preloaded): void
@@ -76,6 +77,10 @@ private static function doPreload(string $class, array &$preloaded): void
         $preloaded[$class] = true;
 
         try {
+            if (!class_exists($class)) {
+                return;
+            }
+
             $r = new \ReflectionClass($class);
 
             if ($r->isInternal()) {

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ class %s extends {$options['class']}`
`342`	`342`
`343`	`343`	`$code[$options['class'].'.preload.php'] .= <<<'EOF'`
`344`	`344`
`345`		`-Preloader::preload($classes);`
	`345`	`+$preloaded = Preloader::preload($classes);`
`346`	`346`
`347`	`347`	`EOF;`
`348`	`348`	`}`