set synthetic flag from $definition, not $parentDef

kbond · kbond · commit 9da5da3ba15a · 2022-01-14T13:19:46.000-05:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -111,10 +111,11 @@ private function doResolveDefinition(ChildDefinition $definition): Definition
         $def->setLazy($parentDef->isLazy());
         $def->setAutowired($parentDef->isAutowired());
         $def->setChanges($parentDef->getChanges());
-        $def->setSynthetic($parentDef->isSynthetic());
 
         $def->setBindings($definition->getBindings() + $parentDef->getBindings());
 
+        $def->setSynthetic($definition->isSynthetic());
+
         // overwrite with values specified in the decorator
         $changes = $definition->getChanges();
         if (isset($changes['class'])) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -417,13 +417,11 @@ public function testProcessCopiesSyntheticStatus()
     {
         $container = new ContainerBuilder();
 
-        $container
-            ->register('parent')
-            ->setSynthetic(true)
-        ;
+        $container->register('parent');
 
         $container
             ->setDefinition('child', new ChildDefinition('parent'))
+            ->setSynthetic(true)
         ;
 
         $this->process($container);

Original file line number	Diff line number	Diff line change
`@@ -417,13 +417,11 @@ public function testProcessCopiesSyntheticStatus()`
`417`	`417`	`{`
`418`	`418`	`$container = new ContainerBuilder();`
`419`	`419`
`420`		`- $container`
`421`		`- ->register('parent')`
`422`		`- ->setSynthetic(true)`
`423`		`- ;`
	`420`	`+ $container->register('parent');`
`424`	`421`
`425`	`422`	`$container`
`426`	`423`	`->setDefinition('child', new ChildDefinition('parent'))`
	`424`	`+ ->setSynthetic(true)`
`427`	`425`	`;`
`428`	`426`
`429`	`427`	`$this->process($container);`