Fix @Tobion's comments

dunglas · dunglas · commit a3da23ae6675 · 2016-10-13T16:41:13.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -135,16 +135,15 @@ private function getMethodsToAutowire(\ReflectionClass $reflectionClass, $autowi
 
     /**
      * @param \ReflectionClass $reflectionClass
+     * @param string[]         $autowired
      *
      * @return \ReflectionMethod[]
      */
-    public function getMethods(\ReflectionClass $reflectionClass, array $autowired)
+    private function getMethods(\ReflectionClass $reflectionClass, array $autowired)
     {
-        if (is_array($autowired)) {
-            foreach ($autowired as $methodName) {
-                if ($reflectionClass->hasMethod($methodName)) {
-                    yield $reflectionClass->getMethod($methodName);
-                }
+        foreach ($autowired as $methodName) {
+            if ($reflectionClass->hasMethod($methodName)) {
+                yield $reflectionClass->getMethod($methodName);
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -243,7 +243,12 @@ private function parseDefinition(\DOMElement $service, $file)
         foreach ($this->getChildren($service, 'autowire') as $type) {
             $autowireTags[] = $type->textContent;
         }
+
         if (!empty($autowireTags)) {
+            if ($service->hasAttribute('autowire')) {
+                throw new InvalidArgumentException(sprintf('The "autowire" attribute cannot be used together with "<autowire>" tags for service "%s" in %s.', (string) $service->getAttribute('id'), $file));
+            }
+
             $definition->setAutowired($autowireTags);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services26.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services26.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="autowire_array" class="Foo" autowire="*">
+            <autowire>setFoo</autowire>
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -561,6 +561,16 @@ public function testAutowire()
         $this->assertEquals(array('setFoo', 'bar'), $container->getDefinition('autowire_array')->getAutowired());
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     */
+    public function testAutowireAttributeAndTag()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services26.xml');
+    }
+
     /**
      * @group legacy
      * @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered

Original file line number	Diff line number	Diff line change
`@@ -135,16 +135,15 @@ private function getMethodsToAutowire(\ReflectionClass $reflectionClass, $autowi`
`135`	`135`
`136`	`136`	`/**`
`137`	`137`	`* @param \ReflectionClass $reflectionClass`
	`138`	`+ * @param string[] $autowired`
`138`	`139`	`*`
`139`	`140`	`* @return \ReflectionMethod[]`
`140`	`141`	`*/`
`141`		`- public function getMethods(\ReflectionClass $reflectionClass, array $autowired)`
	`142`	`+ private function getMethods(\ReflectionClass $reflectionClass, array $autowired)`
`142`	`143`	`{`
`143`		`- if (is_array($autowired)) {`
`144`		`- foreach ($autowired as $methodName) {`
`145`		`- if ($reflectionClass->hasMethod($methodName)) {`
`146`		`- yield $reflectionClass->getMethod($methodName);`
`147`		`- }`
	`144`	`+ foreach ($autowired as $methodName) {`
	`145`	`+ if ($reflectionClass->hasMethod($methodName)) {`
	`146`	`+ yield $reflectionClass->getMethod($methodName);`
`148`	`147`	`}`
`149`	`148`	`}`
`150`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,12 @@ private function parseDefinition(\DOMElement $service, $file)`
`243`	`243`	`foreach ($this->getChildren($service, 'autowire') as $type) {`
`244`	`244`	`$autowireTags[] = $type->textContent;`
`245`	`245`	`}`
	`246`	`+`
`246`	`247`	`if (!empty($autowireTags)) {`
	`248`	`+ if ($service->hasAttribute('autowire')) {`
	`249`	`+ throw new InvalidArgumentException(sprintf('The "autowire" attribute cannot be used together with "<autowire>" tags for service "%s" in %s.', (string) $service->getAttribute('id'), $file));`
	`250`	`+ }`
	`251`	`+`
`247`	`252`	`$definition->setAutowired($autowireTags);`
`248`	`253`	`}`
`249`	`254`