bug #49379 [DependencyInjection] Fix autowire attribute with nullable parameters (alamirault)

nicolas-grekas · nicolas-grekas · commit a4ef214f2078 · 2023-02-16T15:11:02.000+01:00
This PR was squashed before being merged into the 6.2 branch. Discussion ---------- [DependencyInjection] Fix autowire attribute with nullable parameters | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49370 | License | MIT | Doc PR | N/A This PR fix throwing exception `Cannot autowire service "%s": argument "$%s" of method "%s()" %s, you should configure its value explicitly.` when parameter is nullable with null value. (sorry for pinging reviewers, switching branch trigger that) Commits ------- 75af866 [DependencyInjection] Fix autowire attribute with nullable parameters
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -276,23 +276,17 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 continue;
             }
 
-            $type = ProxyHelper::exportType($parameter, true);
-
             if ($checkAttributes) {
                 foreach ($parameter->getAttributes() as $attribute) {
                     if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {
                         $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
 
-                        break;
+                        continue 2;
                     }
                 }
-
-                if ('' !== ($arguments[$index] ?? '')) {
-                    continue;
-                }
             }
 
-            if (!$type) {
+            if (!$type = ProxyHelper::exportType($parameter, true)) {
                 if (isset($arguments[$index])) {
                     continue;
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -1185,21 +1185,23 @@ public function testAutowireAttribute()
 
         $container->register('some.id', \stdClass::class);
         $container->setParameter('some.parameter', 'foo');
+        $container->setParameter('null.parameter', null);
 
         (new ResolveClassPass())->process($container);
         (new AutowirePass())->process($container);
 
         $definition = $container->getDefinition(AutowireAttribute::class);
 
-        $this->assertCount(8, $definition->getArguments());
+        $this->assertCount(9, $definition->getArguments());
         $this->assertEquals(new Reference('some.id'), $definition->getArgument(0));
         $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(1));
         $this->assertSame('foo/bar', $definition->getArgument(2));
-        $this->assertEquals(new Reference('some.id'), $definition->getArgument(3));
-        $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(4));
-        $this->assertSame('bar', $definition->getArgument(5));
-        $this->assertSame('@bar', $definition->getArgument(6));
-        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(7));
+        $this->assertNull($definition->getArgument(3));
+        $this->assertEquals(new Reference('some.id'), $definition->getArgument(4));
+        $this->assertEquals(new Expression("parameter('some.parameter')"), $definition->getArgument(5));
+        $this->assertSame('bar', $definition->getArgument(6));
+        $this->assertSame('@bar', $definition->getArgument(7));
+        $this->assertEquals(new Reference('invalid.id', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(8));
 
         $container->compile();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
@@ -40,6 +40,8 @@ public function __construct(
         public string $expression,
         #[Autowire(value: '%some.parameter%/bar')]
         public string $value,
+        #[Autowire(value: '%null.parameter%')]
+        public ?string $nullableValue,
         #[Autowire('@some.id')]
         public \stdClass $serviceAsValue,
         #[Autowire("@=parameter('some.parameter')")]

Original file line number	Diff line number	Diff line change
`@@ -276,23 +276,17 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a`
`276`	`276`	`continue;`
`277`	`277`	`}`
`278`	`278`
`279`		`- $type = ProxyHelper::exportType($parameter, true);`
`280`		`-`
`281`	`279`	`if ($checkAttributes) {`
`282`	`280`	`foreach ($parameter->getAttributes() as $attribute) {`
`283`	`281`	`if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {`
`284`	`282`	`$arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());`
`285`	`283`
`286`		`- break;`
	`284`	`+ continue 2;`
`287`	`285`	`}`
`288`	`286`	`}`
`289`		`-`
`290`		`- if ('' !== ($arguments[$index] ?? '')) {`
`291`		`- continue;`
`292`		`- }`
`293`	`287`	`}`
`294`	`288`
`295`		`- if (!$type) {`
	`289`	`+ if (!$type = ProxyHelper::exportType($parameter, true)) {`
`296`	`290`	`if (isset($arguments[$index])) {`
`297`	`291`	`continue;`
`298`	`292`	`}`