Remove non-autoloadable classes from preload

jderusse · jderusse · commit 8c47b4792680 · 2021-12-01T10:34:09.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -90,6 +90,7 @@ class PhpDumper extends Dumper
     private $serviceLocatorTag;
     private $exportedVariables = [];
     private $baseClass;
+    private $preloadableCache = [];
 
     /**
      * @var ProxyDumper
@@ -335,7 +336,7 @@ class %s extends {$options['class']}
                     if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void'], true)) {
                         continue;
                     }
-                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
+                    if ($this->isPreloadable($class)) {
                         $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);
                     }
                 }
@@ -398,6 +399,57 @@ class %s extends {$options['class']}
         return $code;
     }
 
+    private function isPreloadable(string $class): ?bool
+    {
+        if (array_key_exists($class, $this->preloadableCache)) {
+            return $this->preloadableCache[$class];
+        }
+        $this->preloadableCache[$class] = true; // prevent recursion
+
+        if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
+            return $this->preloadableCache[$class] = false;
+        }
+        $reflection = new \ReflectionClass($class);
+        if (!$reflection->isUserDefined()) {
+            return $this->preloadableCache[$class] = null;
+        }
+
+        // Since PHP 8.1, typehinted properties does not have to be auto-loadable.
+        // Before PHP 8.0, user can not define typehinted properties
+        if (\PHP_VERSION_ID >= 80100 || \PHP_VERSION_ID < 80000) {
+            return $this->preloadableCache[$class] = true;
+        }
+
+        foreach ($reflection->getProperties() as $property) {
+            if (null === $type = $property->getType()) {
+                continue;
+            }
+            $typesToCheck = [$type];
+            while (!empty($typesToCheck)) {
+                $typeToCheck = array_shift($typesToCheck);
+                if ($typeToCheck instanceof \ReflectionUnionType || $typeToCheck instanceof \ReflectionIntersectionType) {
+                    foreach ($typeToCheck->getTypes() as $t) {
+                        $typesToCheck[] = $t;
+                    }
+
+                    continue;
+                }
+                if (!$typeToCheck instanceof \ReflectionNamedType) {
+                    continue;
+                }
+                $typeName = $typeToCheck->getName();
+                if (!$typeName || str_contains($typeName, '$') || \in_array($typeName, ['int', 'false', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void'], true)) {
+                    continue;
+                }
+                if (false === $this->isPreloadable($typeName)) {
+                    return $this->preloadableCache[$class] = false;
+                }
+            }
+        }
+
+        return $this->preloadableCache[$class] = true;
+    }
+
     /**
      * Retrieves the currently set proxy dumper or instantiates one.
      */
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
@@ -137,7 +137,6 @@ require __DIR__.'/Container%s/ProjectServiceContainer.php';
 require __DIR__.'/Container%s/getClosureService.php';
 
 $classes = [];
-$classes[] = 'FooClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
 Preloader::preload($classes);
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
@@ -935,17 +935,8 @@ require __DIR__.'/Container%s/getBAR2Service.php';
 
 $classes = [];
 $classes[] = 'Bar\FooClass';
-$classes[] = 'Baz';
-$classes[] = 'ConfClass';
-$classes[] = 'Bar';
 $classes[] = 'BazClass';
-$classes[] = 'Foo';
 $classes[] = 'LazyContext';
-$classes[] = 'FooBarBaz';
-$classes[] = 'FactoryClass';
-$classes[] = 'Some\Sidekick1';
-$classes[] = 'Some\Sidekick2';
-$classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
 Preloader::preload($classes);
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
@@ -566,17 +566,8 @@ require __DIR__.'/Container%s/ProjectServiceContainer.php';
 
 $classes = [];
 $classes[] = 'Bar\FooClass';
-$classes[] = 'Baz';
-$classes[] = 'ConfClass';
-$classes[] = 'Bar';
 $classes[] = 'BazClass';
-$classes[] = 'Foo';
 $classes[] = 'LazyContext';
-$classes[] = 'FooBarBaz';
-$classes[] = 'FactoryClass';
-$classes[] = 'Some\Sidekick1';
-$classes[] = 'Some\Sidekick2';
-$classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
 Preloader::preload($classes);
