Add support for method autowiring in the XML loader

dunglas · dunglas · commit 9d4ae0749652 · 2016-10-06T11:25:35.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -239,6 +239,14 @@ private function parseDefinition(\DOMElement $service, $file)
             $definition->addAutowiringType($type->textContent);
         }
 
+        $autowireTags = array();
+        foreach ($this->getChildren($service, 'autowire') as $type) {
+            $autowireTags[] = $type->textContent;
+        }
+        if (!empty($autowireTags)) {
+            $definition->setAutowired($autowireTags);
+        }
+
         if ($value = $service->getAttribute('decorates')) {
             $renameId = $service->hasAttribute('decoration-inner-name') ? $service->getAttribute('decoration-inner-name') : null;
             $priority = $service->hasAttribute('decoration-priority') ? $service->getAttribute('decoration-priority') : 0;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -100,6 +100,7 @@
       <xsd:element name="tag" type="tag" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="property" type="property" minOccurs="0" maxOccurs="unbounded" />
       <xsd:element name="autowiring-type" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="autowire" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
     </xsd:choice>
     <xsd:attribute name="id" type="xsd:string" />
     <xsd:attribute name="class" type="xsd:string" />
@@ -113,7 +114,7 @@
     <xsd:attribute name="decorates" type="xsd:string" />
     <xsd:attribute name="decoration-inner-name" type="xsd:string" />
     <xsd:attribute name="decoration-priority" type="xsd:integer" />
-    <xsd:attribute name="autowire" type="boolean" />
+    <xsd:attribute name="autowire" type="boolean_or_star" />
   </xsd:complexType>
 
   <xsd:complexType name="tag">
@@ -204,4 +205,10 @@
       <xsd:pattern value="(%.+%|true|false)" />
     </xsd:restriction>
   </xsd:simpleType>
+
+  <xsd:simpleType name="boolean_or_star">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="(%.+%|true|false|\*)" />
+    </xsd:restriction>
+  </xsd:simpleType>
 </xsd:schema>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services25.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services25.xml
@@ -0,0 +1,10 @@
+<?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_star" class="Foo" autowire="*" />
+        <service id="autowire_array" class="Foo">
+            <autowire>setFoo</autowire>
+            <autowire>bar</autowire>
+        </service>
+    </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -554,6 +554,11 @@ public function testAutowire()
         $loader->load('services23.xml');
 
         $this->assertTrue($container->getDefinition('bar')->isAutowired());
+        $this->assertTrue($container->getDefinition('bar')->getAutowired());
+
+        $loader->load('services25.xml');
+        $this->assertSame('*', $container->getDefinition('autowire_star')->getAutowired());
+        $this->assertEquals(array('setFoo', 'bar'), $container->getDefinition('autowire_array')->getAutowired());
     }
 
     /**
