bug #21072 [DI] Fix method autowiring in ResolveDefinitionTemplatesPass (dunglas)

fabpot · fabpot · commit 61a67ecc5a04 · 2016-12-30T07:43:06.000+01:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Fix method autowiring in ResolveDefinitionTemplatesPass | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a cc @nicolas-grekas Commits ------- 57661e4 [DI] Fix method autowiring in ResolveDefinitionTemplatesPass
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -137,11 +137,11 @@ public function setDeprecated($boolean = true, $template = null)
     /**
      * {@inheritdoc}
      */
-    public function setAutowired($autowired)
+    public function setAutowiredMethods(array $autowiredMethods)
     {
-        $this->changes['autowire'] = true;
+        $this->changes['autowired_methods'] = true;
 
-        return parent::setAutowired($autowired);
+        return parent::setAutowiredMethods($autowiredMethods);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -141,7 +141,7 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio
         $def->setFile($parentDef->getFile());
         $def->setPublic($parentDef->isPublic());
         $def->setLazy($parentDef->isLazy());
-        $def->setAutowired($parentDef->isAutowired());
+        $def->setAutowiredMethods($parentDef->getAutowiredMethods());
 
         // overwrite with values specified in the decorator
         $changes = $definition->getChanges();
@@ -166,8 +166,8 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio
         if (isset($changes['deprecated'])) {
             $def->setDeprecated($definition->isDeprecated(), $definition->getDeprecationMessage('%service_id%'));
         }
-        if (isset($changes['autowire'])) {
-            $def->setAutowired($definition->isAutowired());
+        if (isset($changes['autowired_methods'])) {
+            $def->setAutowiredMethods($definition->getAutowiredMethods());
         }
         if (isset($changes['decorated_service'])) {
             $decoratedService = $definition->getDecoratedService();
@@ -199,7 +199,7 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio
         }
 
         // append method calls
-        if (count($calls = $definition->getMethodCalls()) > 0) {
+        if ($calls = $definition->getMethodCalls()) {
             $def->setMethodCalls(array_merge($def->getMethodCalls(), $calls));
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/ChildDefinitionTest.php
@@ -70,14 +70,14 @@ public function testSetLazy()
         $this->assertSame(array('lazy' => true), $def->getChanges());
     }
 
-    public function testSetAutowired()
+    public function testSetAutowiredMethods()
     {
         $def = new ChildDefinition('foo');
 
         $this->assertFalse($def->isAutowired());
-        $this->assertSame($def, $def->setAutowired(false));
-        $this->assertFalse($def->isAutowired());
-        $this->assertSame(array('autowire' => true), $def->getChanges());
+        $this->assertSame($def, $def->setAutowiredMethods(array('foo', 'bar')));
+        $this->assertEquals(array('foo', 'bar'), $def->getAutowiredMethods());
+        $this->assertSame(array('autowired_methods' => true), $def->getChanges());
     }
 
     public function testSetArgument()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
@@ -214,30 +214,31 @@ public function testSetAutowiredOnServiceHasParent()
     {
         $container = new ContainerBuilder();
 
-        $container->register('parent', 'stdClass');
+        $container->register('parent', 'stdClass')
+            ->setAutowiredMethods(array('foo', 'bar'));
 
         $container->setDefinition('child1', new ChildDefinition('parent'))
-            ->setAutowired(true)
+            ->setAutowiredMethods(array('baz'))
         ;
 
         $this->process($container);
 
-        $this->assertTrue($container->getDefinition('child1')->isAutowired());
+        $this->assertEquals(array('baz'), $container->getDefinition('child1')->getAutowiredMethods());
     }
 
     public function testSetAutowiredOnServiceIsParent()
     {
         $container = new ContainerBuilder();
 
         $container->register('parent', 'stdClass')
-            ->setAutowired(true)
+            ->setAutowiredMethods(array('__construct', 'set*'))
         ;
 
         $container->setDefinition('child1', new ChildDefinition('parent'));
 
         $this->process($container);
 
-        $this->assertTrue($container->getDefinition('child1')->isAutowired());
+        $this->assertEquals(array('__construct', 'set*'), $container->getDefinition('child1')->getAutowiredMethods());
     }
 
     public function testDeepDefinitionsResolving()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
@@ -72,14 +72,14 @@ public function testSetLazy()
         $this->assertEquals(array('lazy' => true), $def->getChanges());
     }
 
-    public function testSetAutowired()
+    public function testSetAutowiredMethods()
     {
         $def = new DefinitionDecorator('foo');
 
         $this->assertFalse($def->isAutowired());
-        $this->assertSame($def, $def->setAutowired(false));
-        $this->assertFalse($def->isAutowired());
-        $this->assertEquals(array('autowire' => true), $def->getChanges());
+        $this->assertSame($def, $def->setAutowiredMethods(array('foo', 'bar')));
+        $this->assertEquals(array('foo', 'bar'), $def->getAutowiredMethods());
+        $this->assertEquals(array('autowired_methods' => true), $def->getChanges());
     }
 
     public function testSetArgument()

Original file line number	Diff line number	Diff line change
`@@ -137,11 +137,11 @@ public function setDeprecated($boolean = true, $template = null)`
`137`	`137`	`/**`
`138`	`138`	`* {@inheritdoc}`
`139`	`139`	`*/`
`140`		`- public function setAutowired($autowired)`
	`140`	`+ public function setAutowiredMethods(array $autowiredMethods)`
`141`	`141`	`{`
`142`		`- $this->changes['autowire'] = true;`
	`142`	`+ $this->changes['autowired_methods'] = true;`
`143`	`143`
`144`		`- return parent::setAutowired($autowired);`
	`144`	`+ return parent::setAutowiredMethods($autowiredMethods);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio`
`141`	`141`	`$def->setFile($parentDef->getFile());`
`142`	`142`	`$def->setPublic($parentDef->isPublic());`
`143`	`143`	`$def->setLazy($parentDef->isLazy());`
`144`		`- $def->setAutowired($parentDef->isAutowired());`
	`144`	`+ $def->setAutowiredMethods($parentDef->getAutowiredMethods());`
`145`	`145`
`146`	`146`	`// overwrite with values specified in the decorator`
`147`	`147`	`$changes = $definition->getChanges();`
`@@ -166,8 +166,8 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio`
`166`	`166`	`if (isset($changes['deprecated'])) {`
`167`	`167`	`$def->setDeprecated($definition->isDeprecated(), $definition->getDeprecationMessage('%service_id%'));`
`168`	`168`	`}`
`169`		`- if (isset($changes['autowire'])) {`
`170`		`- $def->setAutowired($definition->isAutowired());`
	`169`	`+ if (isset($changes['autowired_methods'])) {`
	`170`	`+ $def->setAutowiredMethods($definition->getAutowiredMethods());`
`171`	`171`	`}`
`172`	`172`	`if (isset($changes['decorated_service'])) {`
`173`	`173`	`$decoratedService = $definition->getDecoratedService();`
`@@ -199,7 +199,7 @@ private function doResolveDefinition(ContainerBuilder $container, ChildDefinitio`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`// append method calls`
`202`		`- if (count($calls = $definition->getMethodCalls()) > 0) {`
	`202`	`+ if ($calls = $definition->getMethodCalls()) {`
`203`	`203`	`$def->setMethodCalls(array_merge($def->getMethodCalls(), $calls));`
`204`	`204`	`}`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -70,14 +70,14 @@ public function testSetLazy()`
`70`	`70`	`$this->assertSame(array('lazy' => true), $def->getChanges());`
`71`	`71`	`}`
`72`	`72`
`73`		`- public function testSetAutowired()`
	`73`	`+ public function testSetAutowiredMethods()`
`74`	`74`	`{`
`75`	`75`	`$def = new ChildDefinition('foo');`
`76`	`76`
`77`	`77`	`$this->assertFalse($def->isAutowired());`
`78`		`- $this->assertSame($def, $def->setAutowired(false));`
`79`		`- $this->assertFalse($def->isAutowired());`
`80`		`- $this->assertSame(array('autowire' => true), $def->getChanges());`
	`78`	`+ $this->assertSame($def, $def->setAutowiredMethods(array('foo', 'bar')));`
	`79`	`+ $this->assertEquals(array('foo', 'bar'), $def->getAutowiredMethods());`
	`80`	`+ $this->assertSame(array('autowired_methods' => true), $def->getChanges());`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public function testSetArgument()`
Original file line number	Diff line number	Diff line change
`@@ -214,30 +214,31 @@ public function testSetAutowiredOnServiceHasParent()`
`214`	`214`	`{`
`215`	`215`	`$container = new ContainerBuilder();`
`216`	`216`
`217`		`- $container->register('parent', 'stdClass');`
	`217`	`+ $container->register('parent', 'stdClass')`
	`218`	`+ ->setAutowiredMethods(array('foo', 'bar'));`
`218`	`219`
`219`	`220`	`$container->setDefinition('child1', new ChildDefinition('parent'))`
`220`		`- ->setAutowired(true)`
	`221`	`+ ->setAutowiredMethods(array('baz'))`
`221`	`222`	`;`
`222`	`223`
`223`	`224`	`$this->process($container);`
`224`	`225`
`225`		`- $this->assertTrue($container->getDefinition('child1')->isAutowired());`
	`226`	`+ $this->assertEquals(array('baz'), $container->getDefinition('child1')->getAutowiredMethods());`
`226`	`227`	`}`
`227`	`228`
`228`	`229`	`public function testSetAutowiredOnServiceIsParent()`
`229`	`230`	`{`
`230`	`231`	`$container = new ContainerBuilder();`
`231`	`232`
`232`	`233`	`$container->register('parent', 'stdClass')`
`233`		`- ->setAutowired(true)`
	`234`	`+ ->setAutowiredMethods(array('__construct', 'set*'))`
`234`	`235`	`;`
`235`	`236`
`236`	`237`	`$container->setDefinition('child1', new ChildDefinition('parent'));`
`237`	`238`
`238`	`239`	`$this->process($container);`
`239`	`240`
`240`		`- $this->assertTrue($container->getDefinition('child1')->isAutowired());`
	`241`	`+ $this->assertEquals(array('__construct', 'set*'), $container->getDefinition('child1')->getAutowiredMethods());`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`public function testDeepDefinitionsResolving()`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@ public function testSetLazy()`
`72`	`72`	`$this->assertEquals(array('lazy' => true), $def->getChanges());`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function testSetAutowired()`
	`75`	`+ public function testSetAutowiredMethods()`
`76`	`76`	`{`
`77`	`77`	`$def = new DefinitionDecorator('foo');`
`78`	`78`
`79`	`79`	`$this->assertFalse($def->isAutowired());`
`80`		`- $this->assertSame($def, $def->setAutowired(false));`
`81`		`- $this->assertFalse($def->isAutowired());`
`82`		`- $this->assertEquals(array('autowire' => true), $def->getChanges());`
	`80`	`+ $this->assertSame($def, $def->setAutowiredMethods(array('foo', 'bar')));`
	`81`	`+ $this->assertEquals(array('foo', 'bar'), $def->getAutowiredMethods());`
	`82`	`+ $this->assertEquals(array('autowired_methods' => true), $def->getChanges());`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public function testSetArgument()`