[DependencyInjection] Fix issue between decorator and service locator index

lyrixx · lyrixx · commit 39b216d694ad · 2024-08-13T16:47:52.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -114,6 +114,7 @@ public function process(ContainerBuilder $container)
                 }
 
                 $definition->setTags(array_merge($decoratingTags, $definition->getTags()));
+                $definition->setChanges(array_merge(['original_id' => $inner], $decoratingDefinition->getChanges()));
                 $decoratingDefinition->setTags($resetTags);
                 $decoratingDefinitions[$inner] = $definition;
             }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php b/src/Symfony/Component/DependencyInjection/Compiler/PriorityTaggedServiceTrait.php
@@ -82,7 +82,7 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container
                 } elseif (null === $defaultIndex && $defaultPriorityMethod && $class) {
                     $defaultIndex = PriorityTaggedServiceUtil::getDefault($container, $serviceId, $class, $defaultIndexMethod ?? 'getDefaultName', $tagName, $indexAttribute, $checkTaggedItem);
                 }
-                $index = $index ?? $defaultIndex ?? $defaultIndex = $serviceId;
+                $index = $index ?? $defaultIndex ?? $defaultIndex = ($definition->getChanges()['original_id'] ?? $serviceId);
 
                 $services[] = [$priority, ++$i, $index, $serviceId, $class];
             }

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ public function process(ContainerBuilder $container)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`$definition->setTags(array_merge($decoratingTags, $definition->getTags()));`
	`117`	`+ $definition->setChanges(array_merge(['original_id' => $inner], $decoratingDefinition->getChanges()));`
`117`	`118`	`$decoratingDefinition->setTags($resetTags);`
`118`	`119`	`$decoratingDefinitions[$inner] = $definition;`
`119`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ private function findAndSortTaggedServices($tagName, ContainerBuilder $container`
`82`	`82`	`} elseif (null === $defaultIndex && $defaultPriorityMethod && $class) {`
`83`	`83`	`$defaultIndex = PriorityTaggedServiceUtil::getDefault($container, $serviceId, $class, $defaultIndexMethod ?? 'getDefaultName', $tagName, $indexAttribute, $checkTaggedItem);`
`84`	`84`	`}`
`85`		`- $index = $index ?? $defaultIndex ?? $defaultIndex = $serviceId;`
	`85`	`+ $index = $index ?? $defaultIndex ?? $defaultIndex = ($definition->getChanges()['original_id'] ?? $serviceId);`
`86`	`86`
`87`	`87`	`$services[] = [$priority, ++$i, $index, $serviceId, $class];`
`88`	`88`	`}`