[FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container

nicolas-grekas · nicolas-grekas · commit 8a6a320897d0 · 2023-01-10T18:40:25.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -38,6 +39,16 @@ public function process(ContainerBuilder $container)
             }
         }
 
+        foreach ($container->getAliases() as $id => $target) {
+            while ($container->hasAlias($target = (string) $target)) {
+                $target = $container->getAlias($target);
+            }
+
+            if ($definitions[$target]->hasTag('container.private')) {
+                $privateServices[$id] = new ServiceClosureArgument(new Reference($target));
+            }
+        }
+
         $privateContainer->replaceArgument(0, $privateServices);
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/TestServiceContainerRefPassesTest.php
@@ -43,6 +43,13 @@ public function testProcess()
             ->setPublic(true)
             ->addTag('container.private', ['package' => 'foo/bar', 'version' => '1.42'])
         ;
+        $container->register('Test\soon_private_service_decorated')
+            ->setPublic(true)
+            ->addTag('container.private', ['package' => 'foo/bar', 'version' => '1.42'])
+        ;
+        $container->register('Test\soon_private_service_decorator')
+            ->setDecoratedService('Test\soon_private_service_decorated')
+            ->setArguments(['Test\soon_private_service_decorator.inner']);
 
         $container->register('Test\private_used_shared_service');
         $container->register('Test\private_unused_shared_service');
@@ -55,6 +62,8 @@ public function testProcess()
             'Test\private_used_shared_service' => new ServiceClosureArgument(new Reference('Test\private_used_shared_service')),
             'Test\private_used_non_shared_service' => new ServiceClosureArgument(new Reference('Test\private_used_non_shared_service')),
             'Test\soon_private_service' => new ServiceClosureArgument(new Reference('.container.private.Test\soon_private_service')),
+            'Test\soon_private_service_decorator' => new ServiceClosureArgument(new Reference('.container.private.Test\soon_private_service_decorated')),
+            'Test\soon_private_service_decorated' => new ServiceClosureArgument(new Reference('.container.private.Test\soon_private_service_decorated')),
         ];
 
         $privateServices = $container->getDefinition('test.private_services_locator')->getArgument(0);

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;`
`13`	`13`
	`14`	`+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;`
`14`	`15`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`15`	`16`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`16`	`17`	`use Symfony\Component\DependencyInjection\Reference;`
`@@ -38,6 +39,16 @@ public function process(ContainerBuilder $container)`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
	`42`	`+ foreach ($container->getAliases() as $id => $target) {`
	`43`	`+ while ($container->hasAlias($target = (string) $target)) {`
	`44`	`+ $target = $container->getAlias($target);`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ if ($definitions[$target]->hasTag('container.private')) {`
	`48`	`+ $privateServices[$id] = new ServiceClosureArgument(new Reference($target));`
	`49`	`+ }`
	`50`	`+ }`
	`51`	`+`
`41`	`52`	`$privateContainer->replaceArgument(0, $privateServices);`
`42`	`53`	`}`
`43`	`54`	`}`