bug #21403 [DI] Fix defaults overriding empty strings in AutowirePass (nicolas-grekas)

fabpot · fabpot · commit 21f1be16d563 · 2017-01-25T07:08:36.000-08:00
This PR was merged into the 2.8 branch. Discussion ---------- [DI] Fix defaults overriding empty strings in AutowirePass | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 89e2724 [DI] Fix defaults overriding empty strings in AutowirePass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -95,8 +95,10 @@ private function completeDefinition($id, Definition $definition)
                         throw new RuntimeException(sprintf('Unable to autowire argument index %d ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));
                     }
 
-                    // specifically pass the default value
-                    $arguments[$index] = $parameter->getDefaultValue();
+                    if (!array_key_exists($index, $arguments)) {
+                        // specifically pass the default value
+                        $arguments[$index] = $parameter->getDefaultValue();
+                    }
 
                     continue;
                 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -443,6 +443,22 @@ public function testIgnoreServiceWithClassNotExisting()
 
         $this->assertTrue($container->hasDefinition('bar'));
     }
+
+    public function testEmptyStringIsKept()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('a', __NAMESPACE__.'\A');
+        $container->register('lille', __NAMESPACE__.'\Lille');
+        $container->register('foo', __NAMESPACE__.'\MultipleArgumentsOptionalScalar')
+            ->setAutowired(true)
+            ->setArguments(array('', ''));
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertEquals(array(new Reference('a'), '', new Reference('lille')), $container->getDefinition('foo')->getArguments());
+    }
 }
 
 class Foo

Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,10 @@ private function completeDefinition($id, Definition $definition)`
`95`	`95`	`throw new RuntimeException(sprintf('Unable to autowire argument index %d ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));`
`96`	`96`	`}`
`97`	`97`
`98`		`- // specifically pass the default value`
`99`		`- $arguments[$index] = $parameter->getDefaultValue();`
	`98`	`+ if (!array_key_exists($index, $arguments)) {`
	`99`	`+ // specifically pass the default value`
	`100`	`+ $arguments[$index] = $parameter->getDefaultValue();`
	`101`	`+ }`
`100`	`102`
`101`	`103`	`continue;`
`102`	`104`	`}`