Fixing a bug where autoconfigure was "lost" if the service had an instanceof

weaverryan · weaverryan · commit 13b9dc89a95d · 2017-04-28T11:31:51.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
@@ -170,6 +170,9 @@ private function doResolveDefinition(ChildDefinition $definition)
         // these attributes are always taken from the child
         $def->setAbstract($definition->isAbstract());
         $def->setTags($definition->getTags());
+        // autoconfigure is never taken from parent (on purpose)
+        // and it's not legal on an instanceof
+        $def->setAutoconfigured($definition->isAutoconfigured());
 
         return $def;
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/integration/defaults_instanceof_importance/expected.yml
@@ -4,6 +4,7 @@ services:
         class: Symfony\Component\DependencyInjection\Tests\Compiler\IntegrationTestStub
         # _instanceof overrides _defaults
         autowire: false
+        # inherited from _defaults
         autoconfigure: true
         # from _instanceof
         shared: false

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ private function doResolveDefinition(ChildDefinition $definition)`
`170`	`170`	`// these attributes are always taken from the child`
`171`	`171`	`$def->setAbstract($definition->isAbstract());`
`172`	`172`	`$def->setTags($definition->getTags());`
	`173`	`+ // autoconfigure is never taken from parent (on purpose)`
	`174`	`+ // and it's not legal on an instanceof`
	`175`	`+ $def->setAutoconfigured($definition->isAutoconfigured());`
`173`	`176`
`174`	`177`	`return $def;`
`175`	`178`	`}`