Making all _defaults apply, but this breaks the tests for now

weaverryan · weaverryan · commit 50ad8b48010e · 2017-04-27T12:12:01.000-04:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -357,7 +357,9 @@ private function parseDefinition($id, $service, $file, array $defaults)
             $definition = new ChildDefinition($service['parent']);
         } else {
             $definition = new Definition();
+        }
 
+        if (!$this->isLoadingInstanceof) {
             if (isset($defaults['public'])) {
                 $definition->setPublic($defaults['public']);
             }
@@ -368,7 +370,15 @@ private function parseDefinition($id, $service, $file, array $defaults)
                 $definition->setAutoconfigured($defaults['autoconfigure']);
             }
 
-            $definition->setChanges(array());
+            // don't reset changes for children, otherwise their
+            // parent values will always win, even if they're not
+            // explicitly set. We should be able to remove this if
+            // the ResolveDefinitionTemplatesPass is made smarter
+            // to only override values from the parent *if* they
+            // are explicitly set.
+            if (!$definition instanceof ChildDefinition) {
+                $definition->setChanges(array());
+            }
         }
 
         if (isset($service['class'])) {
