symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/PrivateService.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestServiceContainer/PrivateService.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/TestServiceContainer/services.yml
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
Lines changed: 3 additions & 1 deletion
@@ -41,6 +41,9 @@ public function process(ContainerBuilder $container)
                 if ($id !== $target) {
                     $renamedIds[$id] = $target;
                 }
+                if ($inner = $definitions[$target]->getTag('container.decorator')[0]['inner'] ?? null) {
+                    $renamedIds[$id] = $inner;
+                }
             } else {
                 unset($privateServices[$id]);
             }
 
@@ -13,4 +13,5 @@
 
 class PrivateService
 {
+    public $inner;
 }
@@ -40,6 +40,17 @@ public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()
         $this->assertFalse(static::getContainer()->has(UnusedPrivateService::class));
     }
 
+    public function testSetDecoratedService()
+    {
+        static::bootKernel(['test_case' => 'TestServiceContainer']);
+
+        $container = static::getContainer();
+
+        $service = new PrivateService();
+        $container->set(PrivateService::class, $service);
+        $this->assertSame($service, $container->get(PrivateService::class)->inner);
+    }
+
     /**
      * @doesNotPerformAssertions
      */
 
@@ -13,3 +13,9 @@ services:
         arguments:
             - '@Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\NonPublicService'
             - '@Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PrivateService'
+
+    decorator:
+        class: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PrivateService
+        decorates: Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestServiceContainer\PrivateService
+        properties:
+            inner: '@.inner'
@@ -21,7 +21,7 @@
         "ext-xml": "*",
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^6.1",
-        "symfony/dependency-injection": "^6.3",
+        "symfony/dependency-injection": "^6.3.1",
         "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.1",
         "symfony/event-dispatcher": "^5.4|^6.0",
 
@@ -42,6 +42,7 @@ public function process(ContainerBuilder $container)
             $definitions->insert([$id, $definition], [$decorated[2], --$order]);
         }
         $decoratingDefinitions = [];
+        $decoratedIds = [];
 
         $tagsToKeep = $container->hasParameter('container.behavior_describing_tags')
             ? $container->getParameter('container.behavior_describing_tags')
@@ -58,6 +59,7 @@ public function process(ContainerBuilder $container)
                 $renamedId = $id.'.inner';
             }
 
+            $decoratedIds[$inner] ??= $renamedId;
             $this->currentId = $renamedId;
             $this->processValue($definition);
 
@@ -114,7 +116,7 @@ public function process(ContainerBuilder $container)
         }
 
         foreach ($decoratingDefinitions as $inner => $definition) {
-            $definition->addTag('container.decorator', ['id' => $inner]);
+            $definition->addTag('container.decorator', ['id' => $inner, 'inner' => $decoratedIds[$inner]]);
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ public function process(ContainerBuilder $container)`
`41`	`41`	`if ($id !== $target) {`
`42`	`42`	`$renamedIds[$id] = $target;`
`43`	`43`	`}`
	`44`	`+ if ($inner = $definitions[$target]->getTag('container.decorator')[0]['inner'] ?? null) {`
	`45`	`+ $renamedIds[$id] = $inner;`
	`46`	`+ }`
`44`	`47`	`} else {`
`45`	`48`	`unset($privateServices[$id]);`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@`
`13`	`13`
`14`	`14`	`class PrivateService`
`15`	`15`	`{`
	`16`	`+ public $inner;`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public function process(ContainerBuilder $container)`
`42`	`42`	`$definitions->insert([$id, $definition], [$decorated[2], --$order]);`
`43`	`43`	`}`
`44`	`44`	`$decoratingDefinitions = [];`
	`45`	`+ $decoratedIds = [];`
`45`	`46`
`46`	`47`	`$tagsToKeep = $container->hasParameter('container.behavior_describing_tags')`
`47`	`48`	`? $container->getParameter('container.behavior_describing_tags')`
`@@ -58,6 +59,7 @@ public function process(ContainerBuilder $container)`
`58`	`59`	`$renamedId = $id.'.inner';`
`59`	`60`	`}`
`60`	`61`
	`62`	`+ $decoratedIds[$inner] ??= $renamedId;`
`61`	`63`	`$this->currentId = $renamedId;`
`62`	`64`	`$this->processValue($definition);`
`63`	`65`
`@@ -114,7 +116,7 @@ public function process(ContainerBuilder $container)`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`foreach ($decoratingDefinitions as $inner => $definition) {`
`117`		`- $definition->addTag('container.decorator', ['id' => $inner]);`
	`119`	`+ $definition->addTag('container.decorator', ['id' => $inner, 'inner' => $decoratedIds[$inner]]);`
`118`	`120`	`}`
`119`	`121`	`}`
`120`	`122`