[DependencyInjection] Fix autowire attribute with nullable parameters

alamirault · alamirault · commit 82d35a690883 · 2023-02-14T21:51:46.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -293,7 +293,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
             }
 
             if (!$type) {
-                if (isset($arguments[$index])) {
+                if (\array_key_exists($index, $arguments)) {
                     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->assertSame(null, $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
`@@ -293,7 +293,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`if (!$type) {`
`296`		`- if (isset($arguments[$index])) {`
	`296`	`+ if (\array_key_exists($index, $arguments)) {`
`297`	`297`	`continue;`
`298`	`298`	`}`
`299`	`299`