symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_auto_configure_instanceof.xml
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_auto_configure_instanceof.xml
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+10Lines changed: 10 additions & 0 deletions
@@ -180,6 +180,10 @@ private function getServiceDefaults(\DOMDocument $xml, $file)
         if ($defaultsNode->hasAttribute('inherit-tags')) {
             $defaults['inherit-tags'] = XmlUtils::phpize($defaultsNode->getAttribute('inherit-tags'));
         }
+        if ($defaultsNode->hasAttribute('auto-configure-instanceof')) {
+            $defaults['auto-configure-instanceof'] = XmlUtils::phpize($defaultsNode->getAttribute('auto-configure-instanceof'));
+        }
+
 
         return $defaults;
     }
@@ -243,6 +247,12 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults =
             $definition->setAutowired($defaults['autowire']);
         }
 
+        if ($autoConfigureInstanceOfAttr = $service->getAttribute('auto-configure-instanceof')) {
+            $definition->setShouldAutoConfigureInstanceofConditionals(XmlUtils::phpize($autoConfigureInstanceOfAttr));
+        } elseif (isset($defaults['auto-configure-instanceof'])) {
+            $definition->setShouldAutoConfigureInstanceofConditionals($defaults['auto-configure-instanceof']);
+        }
+
         if ($files = $this->getChildren($service, 'file')) {
             $definition->setFile($files[0]->nodeValue);
         }
 
@@ -104,6 +104,7 @@
     <xsd:attribute name="public" type="boolean" />
     <xsd:attribute name="autowire" type="autowire" />
     <xsd:attribute name="inherit-tags" type="boolean" />
+    <xsd:attribute name="auto-configure-instanceof" type="boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="service">
@@ -132,6 +133,7 @@
     <xsd:attribute name="decoration-priority" type="xsd:integer" />
     <xsd:attribute name="autowire" type="autowire" />
     <xsd:attribute name="inherit-tags" type="boolean" />
+    <xsd:attribute name="auto-configure-instanceof" type="boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="instanceof">
@@ -171,6 +173,7 @@
     <xsd:attribute name="parent" type="xsd:string" />
     <xsd:attribute name="autowire" type="autowire" />
     <xsd:attribute name="inherit-tags" type="boolean" />
+    <xsd:attribute name="auto-configure-instanceof" type="boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="tag">
 
@@ -0,0 +1,9 @@
+<?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>
+        <defaults auto-configure-instanceof="true" />
+
+        <service id="use_defaults_settings" />
+        <service id="override_defaults_settings_to_false" auto-configure-instanceof="false" />
+    </services>
+</container>
@@ -687,6 +687,16 @@ public function testInstanceof()
         $this->assertTrue($definition->isLazy());
         $this->assertSame(array('foo' => array(array()), 'bar' => array(array())), $definition->getTags());
     }
+
+    public function testAutoConfigureInstanceof()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('services_auto_configure_instanceof.xml');
+
+        $this->assertTrue($container->getDefinition('use_defaults_settings')->getShouldAutoConfigureInstanceofConditionals());
+        $this->assertFalse($container->getDefinition('override_defaults_settings_to_false')->getShouldAutoConfigureInstanceofConditionals());
+    }
 }
 
 interface BarInterface
Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,10 @@ private function getServiceDefaults(\DOMDocument $xml, $file)`
`180`	`180`	`if ($defaultsNode->hasAttribute('inherit-tags')) {`
`181`	`181`	`$defaults['inherit-tags'] = XmlUtils::phpize($defaultsNode->getAttribute('inherit-tags'));`
`182`	`182`	`}`
	`183`	`+ if ($defaultsNode->hasAttribute('auto-configure-instanceof')) {`
	`184`	`+ $defaults['auto-configure-instanceof'] = XmlUtils::phpize($defaultsNode->getAttribute('auto-configure-instanceof'));`
	`185`	`+ }`
	`186`	`+`
`183`	`187`
`184`	`188`	`return $defaults;`
`185`	`189`	`}`
`@@ -243,6 +247,12 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults =`
`243`	`247`	`$definition->setAutowired($defaults['autowire']);`
`244`	`248`	`}`
`245`	`249`
	`250`	`+ if ($autoConfigureInstanceOfAttr = $service->getAttribute('auto-configure-instanceof')) {`
	`251`	`+ $definition->setShouldAutoConfigureInstanceofConditionals(XmlUtils::phpize($autoConfigureInstanceOfAttr));`
	`252`	`+ } elseif (isset($defaults['auto-configure-instanceof'])) {`
	`253`	`+ $definition->setShouldAutoConfigureInstanceofConditionals($defaults['auto-configure-instanceof']);`
	`254`	`+ }`
	`255`	`+`
`246`	`256`	`if ($files = $this->getChildren($service, 'file')) {`
`247`	`257`	`$definition->setFile($files[0]->nodeValue);`
`248`	`258`	`}`