minor #42855 [DependencyInjection] Optimize PHP preloading (lyrixx)

nicolas-grekas · nicolas-grekas · commit 80427367c1a1 · 2021-09-08T08:54:47.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] Optimize PHP preloading | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | I'm trying to solve a warning when my app is booting: ``` [02-Sep-2021 10:02:59] NOTICE: PHP message: PHP Warning: Can't preload unlinked class Symfony\Component\Security\Core\Authorization\ExpressionLanguageProvider: Unknown interface Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface in /app/vendor/symfony/security-core/Authorization/ExpressionLanguageProvider.php on line 22 ``` It looks like it's not fixable since PHP parse all the file, even if the class declaration is wrapped in an `if (false)` statement. But anyway, I found some optimisations * reuse the `$preloaded` var, to avoid parsing the same list many times (`Preloader::preload()`) is called many times in `var/cache/prod/App_KernelProdContainer.preload.php` * call `class_exist` before using the reflection to avoid a useless throw / catch. Commits ------- 19e4135 [DependencyInjection] Optimize PHP preloading
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
@@ -34,10 +34,10 @@ public static function append(string $file, array $list): void
             $classes[] = sprintf("\$classes[] = %s;\n", var_export($item, true));
         }
 
-        file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), \FILE_APPEND);
+        file_put_contents($file, sprintf("\n\$classes = [];\n%s\$preloaded = Preloader::preload(\$classes, \$preloaded);\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) && !interface_exists($class, false) && !trait_exists($class, false)) {
+                return;
+            }
+
             $r = new \ReflectionClass($class);
 
             if ($r->isInternal()) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10_as_files.txt
@@ -140,7 +140,7 @@ $classes = [];
 $classes[] = 'FooClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -948,7 +948,7 @@ $classes[] = 'Some\Sidekick2';
 $classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -579,7 +579,7 @@ $classes[] = 'Some\Sidekick2';
 $classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -186,7 +186,7 @@ $classes[] = 'Bar\FooClass';
 $classes[] = 'Bar\FooLazyClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -152,7 +152,7 @@ $classes = [];
 $classes[] = 'Bar\FooLazyClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 

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`	`}`