[DependencyInjection] fix parsing classes for attributes

nicolas-grekas · nicolas-grekas · commit f707ecd610cc · 2021-06-11T13:18:06.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterAutoconfigureAttributesPass.php
@@ -36,7 +36,7 @@ public function process(ContainerBuilder $container)
         }
 
         foreach ($container->getDefinitions() as $id => $definition) {
-            if ($this->accept($definition) && null !== $class = $container->getReflectionClass($definition->getClass())) {
+            if ($this->accept($definition) && $class = $container->getReflectionClass($definition->getClass(), false)) {
                 $this->processClass($container, $class);
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -105,7 +105,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
         $serializedPrototype = serialize($prototype);
 
         foreach ($classes as $class => $errorMessage) {
-            if ($autoconfigureAttributes && $this->env) {
+            if (null === $errorMessage && $autoconfigureAttributes && $this->env) {
                 $r = $this->container->getReflectionClass($class);
                 $attribute = null;
                 foreach ($r->getAttributes(When::class) as $attribute) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function process(ContainerBuilder $container)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`foreach ($container->getDefinitions() as $id => $definition) {`
`39`		`- if ($this->accept($definition) && null !== $class = $container->getReflectionClass($definition->getClass())) {`
	`39`	`+ if ($this->accept($definition) && $class = $container->getReflectionClass($definition->getClass(), false)) {`
`40`	`40`	`$this->processClass($container, $class);`
`41`	`41`	`}`
`42`	`42`	`}`