diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.3 

* 3.4:
  [DI] fix locators with numeric keys
This commit is contained in:
Nicolas Grekas 2019-11-08 17:22:27 +01:00
parent a1fc280bf2 98e9fc8aee
commit 618aec6abe
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
View File

@ -52,6 +52,8 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
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)); 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) { foreach ($arguments[0] as $k => $v) {
if ($v instanceof ServiceClosureArgument) { if ($v instanceof ServiceClosureArgument) {
continue; continue;
@ -60,10 +62,13 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
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)); 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]); unset($arguments[0][$k]);
$k = (string) $v; $k = (string) $v;
++$i;
} elseif (\is_int($k)) {
$i = null;
} }
$arguments[0][$k] = new ServiceClosureArgument($v); $arguments[0][$k] = new ServiceClosureArgument($v);
} }

2
src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
View File

@ -114,6 +114,7 @@ class ServiceLocatorTagPassTest extends TestCase
->setArguments([[ ->setArguments([[
'bar' => new Reference('baz'), 'bar' => new Reference('baz'),
new Reference('bar'), new Reference('bar'),
16 => new Reference('baz'),
]]) ]])
->addTag('container.service_locator') ->addTag('container.service_locator')
; ;
@ -124,6 +125,7 @@ class ServiceLocatorTagPassTest extends TestCase
$locator = $container->get('foo'); $locator = $container->get('foo');
$this->assertSame(TestDefinition1::class, \get_class($locator('bar'))); $this->assertSame(TestDefinition1::class, \get_class($locator('bar')));
$this->assertSame(TestDefinition2::class, \get_class($locator(16)));
} }
public function testBindingsAreCopied() public function testBindingsAreCopied()