minor #21829 [DependencyInjection] Add a missing test for @required autowiring (dunglas)

fabpot · fabpot · commit 0caf212599c0 · 2017-03-01T17:36:47.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DependencyInjection] Add a missing test for @required autowiring | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 8f0b629 [DependencyInjection] Add a missing test for @required autowiring
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -473,7 +473,7 @@ public function testSetterInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            array('setWithCallsConfigured', 'setFoo', 'setDependencies'),
+            array('setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'),
             array_column($methodCalls, 0)
         );
 
@@ -509,7 +509,7 @@ public function testExplicitMethodInjection()
         $methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();
 
         $this->assertEquals(
-            array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured'),
+            array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'),
             array_column($methodCalls, 0)
         );
         $this->assertEquals(
@@ -953,6 +953,10 @@ protected function setProtectedMethod(A $a)
     {
         // should not be called
     }
+
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
 }
 
 class SetterInjectionParent
@@ -972,6 +976,11 @@ public function notASetter(A $a)
     public function setWithCallsConfigured(A $a)
     {
     }
+
+    /** @required */
+    public function setChildMethodWithoutDocBlock(A $a)
+    {
+    }
 }
 
 class SetterInjectionCollision

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ public function testSetterInjection()`
`473`	`473`	`$methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();`
`474`	`474`
`475`	`475`	`$this->assertEquals(`
`476`		`- array('setWithCallsConfigured', 'setFoo', 'setDependencies'),`
	`476`	`+ array('setWithCallsConfigured', 'setFoo', 'setDependencies', 'setChildMethodWithoutDocBlock'),`
`477`	`477`	`array_column($methodCalls, 0)`
`478`	`478`	`);`
`479`	`479`
`@@ -509,7 +509,7 @@ public function testExplicitMethodInjection()`
`509`	`509`	`$methodCalls = $container->getDefinition('setter_injection')->getMethodCalls();`
`510`	`510`
`511`	`511`	`$this->assertEquals(`
`512`		`- array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured'),`
	`512`	`+ array('notASetter', 'setFoo', 'setDependencies', 'setWithCallsConfigured', 'setChildMethodWithoutDocBlock'),`
`513`	`513`	`array_column($methodCalls, 0)`
`514`	`514`	`);`
`515`	`515`	`$this->assertEquals(`
`@@ -953,6 +953,10 @@ protected function setProtectedMethod(A $a)`
`953`	`953`	`{`
`954`	`954`	`// should not be called`
`955`	`955`	`}`
	`956`	`+`
	`957`	`+ public function setChildMethodWithoutDocBlock(A $a)`
	`958`	`+ {`
	`959`	`+ }`
`956`	`960`	`}`
`957`	`961`
`958`	`962`	`class SetterInjectionParent`
`@@ -972,6 +976,11 @@ public function notASetter(A $a)`
`972`	`976`	`public function setWithCallsConfigured(A $a)`
`973`	`977`	`{`
`974`	`978`	`}`
	`979`	`+`
	`980`	`+ /** @required */`
	`981`	`+ public function setChildMethodWithoutDocBlock(A $a)`
	`982`	`+ {`
	`983`	`+ }`
`975`	`984`	`}`
`976`	`985`
`977`	`986`	`class SetterInjectionCollision`