bug #34297 [DI] fix locators with numeric keys (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 98e9fc8aee63 · 2019-11-08T17:22:08.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] fix locators with numeric keys | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34296 | License | MIT | Doc PR | - Commits ------- dad4344 [DI] fix locators with numeric keys
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -41,6 +41,8 @@ protected function processValue($value, $isRoot = false)
             throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
         }
 
+        $i = 0;
+
         foreach ($arguments[0] as $k => $v) {
             if ($v instanceof ServiceClosureArgument) {
                 continue;
@@ -49,10 +51,13 @@ protected function processValue($value, $isRoot = false)
                 throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k));
             }
 
-            if (\is_int($k)) {
+            if ($i === $k) {
                 unset($arguments[0][$k]);
 
                 $k = (string) $v;
+                ++$i;
+            } elseif (\is_int($k)) {
+                $i = null;
             }
             $arguments[0][$k] = new ServiceClosureArgument($v);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -114,6 +114,7 @@ public function testInheritedKeyOverwritesPreviousServiceWithKey()
             ->setArguments([[
                 'bar' => new Reference('baz'),
                 new Reference('bar'),
+                16 => new Reference('baz'),
             ]])
             ->addTag('container.service_locator')
         ;
@@ -124,6 +125,7 @@ public function testInheritedKeyOverwritesPreviousServiceWithKey()
         $locator = $container->get('foo');
 
         $this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
+        $this->assertSame(TestDefinition2::class, \get_class($locator(16)));
     }
 
     public function testBindingsAreCopied()

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ protected function processValue($value, $isRoot = false)`
`41`	`41`	`throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ $i = 0;`
	`45`	`+`
`44`	`46`	`foreach ($arguments[0] as $k => $v) {`
`45`	`47`	`if ($v instanceof ServiceClosureArgument) {`
`46`	`48`	`continue;`
`@@ -49,10 +51,13 @@ protected function processValue($value, $isRoot = false)`
`49`	`51`	`throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k));`
`50`	`52`	`}`
`51`	`53`
`52`		`- if (\is_int($k)) {`
	`54`	`+ if ($i === $k) {`
`53`	`55`	`unset($arguments[0][$k]);`
`54`	`56`
`55`	`57`	`$k = (string) $v;`
	`58`	`+ ++$i;`
	`59`	`+ } elseif (\is_int($k)) {`
	`60`	`+ $i = null;`
`56`	`61`	`}`
`57`	`62`	`$arguments[0][$k] = new ServiceClosureArgument($v);`
`58`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ public function testInheritedKeyOverwritesPreviousServiceWithKey()`
`114`	`114`	`->setArguments([[`
`115`	`115`	`'bar' => new Reference('baz'),`
`116`	`116`	`new Reference('bar'),`
	`117`	`+ 16 => new Reference('baz'),`
`117`	`118`	`]])`
`118`	`119`	`->addTag('container.service_locator')`
`119`	`120`	`;`
`@@ -124,6 +125,7 @@ public function testInheritedKeyOverwritesPreviousServiceWithKey()`
`124`	`125`	`$locator = $container->get('foo');`
`125`	`126`
`126`	`127`	`$this->assertSame(TestDefinition1::class, \get_class($locator('bar')));`
	`128`	`+ $this->assertSame(TestDefinition2::class, \get_class($locator(16)));`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`public function testBindingsAreCopied()`