Merge branch '7.2' into 7.3

xabbuh · xabbuh · commit ddc27593a0e4 · 2025-04-07T21:11:40.000+02:00
* 7.2:
  [Intl] Update data to ICU 77.1
  Correctly convert SIGSYS to its name
  fix(security): fix OIDC user identifier
  Do not ignore enum when Autowire attribute in RegisterControllerArgumentLocatorsPass
  fix RedisCluster seed if REDIS_CLUSTER_HOST env var is not set
diff --git a/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -155,7 +155,7 @@ public function process(ContainerBuilder $container): void
                         continue;
                     } elseif (!$autowire || (!($autowireAttributes = $p->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) && (!$type || '\\' !== $target[0]))) {
                         continue;
-                    } elseif (is_subclass_of($type, \UnitEnum::class)) {
+                    } elseif (!$autowireAttributes && is_subclass_of($type, \UnitEnum::class)) {
                         // do not attempt to register enum typed arguments if not already present in bindings
                         continue;
                     } elseif (!$p->allowsNull()) {
diff --git a/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -503,13 +503,14 @@ public function testAutowireAttribute()
 
         $locator = $container->get($locatorId)->get('foo::fooAction');
 
-        $this->assertCount(9, $locator->getProvidedServices());
+        $this->assertCount(10, $locator->getProvidedServices());
         $this->assertInstanceOf(\stdClass::class, $locator->get('service1'));
         $this->assertSame('foo/bar', $locator->get('value'));
         $this->assertSame('foo', $locator->get('expression'));
         $this->assertInstanceOf(\stdClass::class, $locator->get('serviceAsValue'));
         $this->assertInstanceOf(\stdClass::class, $locator->get('expressionAsValue'));
         $this->assertSame('bar', $locator->get('rawValue'));
+        $this->stringContains('Symfony_Component_HttpKernel_Tests_Fixtures_Suit_APP_SUIT', $locator->get('suit'));
         $this->assertSame('@bar', $locator->get('escapedRawValue'));
         $this->assertSame('foo', $locator->get('customAutowire'));
         $this->assertInstanceOf(FooInterface::class, $autowireCallable = $locator->get('autowireCallable'));
@@ -752,6 +753,8 @@ public function fooAction(
         \stdClass $expressionAsValue,
         #[Autowire('bar')]
         string $rawValue,
+        #[Autowire(env: 'enum:\Symfony\Component\HttpKernel\Tests\Fixtures\Suit:APP_SUIT')]
+        Suit $suit,
         #[Autowire('@@bar')]
         string $escapedRawValue,
         #[CustomAutowire('some.parameter')]
