minor #60079 [HttpKernel] Remove always-true condition on existence of DI Autowire class (GromNaN)

GromNaN · GromNaN · commit d442a43c9f35 · 2025-03-29T00:20:46.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [HttpKernel] Remove always-true condition on existence of DI `Autowire` class | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT This condition was introduced in #45657 The class `RegisterControllerArgumentLocatorsPass` requires the DI component, which cannot be < 6.4 due to a [conflict rule in composer.json](https://github.com/symfony/symfony/blob/79ea49c772ce4b39f414cde5648ad347c3bbcfd7/src/Symfony/Component/HttpKernel/composer.json#L33). So the `Autoconfigure` class always exists. Commits ------- 3975043 Remove always-true condition
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -51,8 +51,6 @@ public function process(ContainerBuilder $container): void
             }
         }
 
-        $emptyAutowireAttributes = class_exists(Autowire::class) ? null : [];
-
         foreach ($container->findTaggedServiceIds('controller.service_arguments', true) as $id => $tags) {
             $def = $container->getDefinition($id);
             $def->setPublic(true);
@@ -129,7 +127,7 @@ public function process(ContainerBuilder $container): void
                     /** @var \ReflectionParameter $p */
                     $type = preg_replace('/(^|[(|&])\\\\/', '\1', $target = ltrim(ProxyHelper::exportType($p) ?? '', '?'));
                     $invalidBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
-                    $autowireAttributes = $autowire ? $emptyAutowireAttributes : [];
+                    $autowireAttributes = null;
                     $parsedName = $p->name;
                     $k = null;
 
@@ -155,7 +153,7 @@ public function process(ContainerBuilder $container): void
                         $args[$p->name] = $bindingValue;
 
                         continue;
-                    } elseif (!$autowire || (!($autowireAttributes ??= $p->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) && (!$type || '\\' !== $target[0]))) {
+                    } elseif (!$autowire || (!($autowireAttributes = $p->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) && (!$type || '\\' !== $target[0]))) {
                         continue;
                     } elseif (is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
