[DependencyInjection] Add check for duplicate services in ServiceLocatorTagPass

codedmonkey · codedmonkey · commit a467c0afa379 · 2018-09-27T10:31:30.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -57,6 +57,10 @@ protected function processValue($value, $isRoot = false)
                 unset($arguments[0][$k]);
 
                 $k = (string) $v;
+
+                if (isset($arguments[0][$k])) {
+                    throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": service key "%s" cannot be inherited from the service definition because the key already exists.', $this->currentId, $k));
+                }
             }
             $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
@@ -76,8 +76,29 @@ public function testProcessValue()
         /** @var ServiceLocator $locator */
         $locator = $container->get('foo');
 
-        $this->assertEquals(CustomDefinition::class, \get_class($locator('bar')));
-        $this->assertEquals(CustomDefinition::class, \get_class($locator('baz')));
-        $this->assertEquals(CustomDefinition::class, \get_class($locator('some.service')));
+        $this->assertSame(CustomDefinition::class, \get_class($locator('bar')));
+        $this->assertSame(CustomDefinition::class, \get_class($locator('baz')));
+        $this->assertSame(CustomDefinition::class, \get_class($locator('some.service')));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid definition for service "foo":  service key "bar" cannot be inherited from the service definition because the key already exists.
+     */
+    public function testDuplicateService()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', CustomDefinition::class);
+
+        $container->register('foo', ServiceLocator::class)
+            ->setArguments(array(array(
+                new Reference('bar'),
+                'bar' => new Reference('bar'),
+            )))
+            ->addTag('container.service_locator')
+        ;
+
+        (new ServiceLocatorTagPass())->process($container);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ protected function processValue($value, $isRoot = false)`
`57`	`57`	`unset($arguments[0][$k]);`
`58`	`58`
`59`	`59`	`$k = (string) $v;`
	`60`	`+`
	`61`	`+ if (isset($arguments[0][$k])) {`
	`62`	`+ throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": service key "%s" cannot be inherited from the service definition because the key already exists.', $this->currentId, $k));`
	`63`	`+ }`
`60`	`64`	`}`
`61`	`65`	`$arguments[0][$k] = new ServiceClosureArgument($v);`
`62`	`66`	`}`