diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
index f363a64829c24..61460ca2e0f71 100644
--- a/src/Symfony/Component/DependencyInjection/ChildDefinition.php
+++ b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -121,14 +121,6 @@ public function setInstanceofConditionals(array $instanceof)
{
throw new BadMethodCallException('A ChildDefinition cannot have instanceof conditionals set on it.');
}
-
- /**
- * @internal
- */
- public function setBindings(array $bindings)
- {
- throw new BadMethodCallException('A ChildDefinition cannot have bindings set on it.');
- }
}
class_alias(ChildDefinition::class, DefinitionDecorator::class);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index a124e472aca81..eefb0cefd4ff7 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -103,7 +103,7 @@ private function doResolveDefinition(ChildDefinition $definition)
$def->setAutowired($parentDef->isAutowired());
$def->setChanges($parentDef->getChanges());
- $def->setBindings($parentDef->getBindings());
+ $def->setBindings($definition->getBindings() + $parentDef->getBindings());
// overwrite with values specified in the decorator
$changes = $definition->getChanges();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index 23a1915fd777c..18c0fb7c5987f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -382,6 +382,27 @@ public function testProcessSetsArguments()
$this->assertSame(array(2, 1, 'foo' => 3), $def->getArguments());
}
+ public function testBindings()
+ {
+ $container = new ContainerBuilder();
+
+ $container->register('parent', 'stdClass')
+ ->setBindings(array('a' => '1', 'b' => '2'))
+ ;
+
+ $child = $container->setDefinition('child', new ChildDefinition('parent'))
+ ->setBindings(array('b' => 'B', 'c' => 'C'))
+ ;
+
+ $this->process($container);
+
+ $bindings = array();
+ foreach ($container->getDefinition('child')->getBindings() as $k => $v) {
+ $bindings[$k] = $v->getValues()[0];
+ }
+ $this->assertEquals(array('b' => 'B', 'c' => 'C', 'a' => '1'), $bindings);
+ }
+
public function testSetAutoconfiguredOnServiceIsParent()
{
$container = new ContainerBuilder();
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy