[FrameworkBundle] cleanup generated test container

symfony · nicolas-grekas · May 25, 2018 · May 24, 2018 · May 24, 2018 · d8cbec00ad56d15866dadf4adc9b18a6ea147a33
commit d8cbec00ad56d15866dadf4adc9b18a6ea147a33
diff --git a/...y/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php b/...y/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerRealRefPass.php
@@ -27,13 +27,21 @@ public function process(ContainerBuilder $container)
        }

        $testContainer = $container->getDefinition('test.service_container');
-        $privateContainer = $container->getDefinition((string) $testContainer->getArgument(2));
+        $privateContainer = $testContainer->getArgument(2);
+        if ($privateContainer instanceof Reference) {
+            $privateContainer = $container->getDefinition((string) $privateContainer);
+        }
        $definitions = $container->getDefinitions();
+        $privateServices = $privateContainer->getArgument(0);

-        foreach ($privateContainer->getArgument(0) as $id => $argument) {
+        foreach ($privateServices as $id => $argument) {
            if (isset($definitions[$target = (string) $argument->getValues()[0]])) {
                $argument->setValues(array(new Reference($target)));
+            } else {
+                unset($privateServices[$id]);
            }
        }
+
+        $privateContainer->replaceArgument(0, $privateServices);
    }
 }
diff --git a/...y/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php b/...y/Bundle/FrameworkBundle/DependencyInjection/Compiler/TestServiceContainerWeakRefPass.php
@@ -31,15 +31,15 @@ public function process(ContainerBuilder $container)
        $definitions = $container->getDefinitions();

        foreach ($definitions as $id => $definition) {
-            if ((!$definition->isPublic() || $definition->isPrivate()) && !$definition->getErrors() && !$definition->isAbstract()) {
+            if ($id && '.' !== $id[0] && (!$definition->isPublic() || $definition->isPrivate()) && !$definition->getErrors() && !$definition->isAbstract()) {
                $privateServices[$id] = new ServiceClosureArgument(new Reference($id, ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE));
            }
        }

        $aliases = $container->getAliases();

        foreach ($aliases as $id => $alias) {
-            if (!$alias->isPublic() || $alias->isPrivate()) {
+            if ($id && '.' !== $id[0] && (!$alias->isPublic() || $alias->isPrivate())) {
                while (isset($aliases[$target = (string) $alias])) {
                    $alias = $aliases[$target];
                }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/TestServiceContainerTest.php
@@ -42,6 +42,6 @@ public function testThatPrivateServicesAreAvailableIfTestConfigIsEnabled()
        $this->assertTrue(static::$container->has(NonPublicService::class));
        $this->assertTrue(static::$container->has(PrivateService::class));
        $this->assertTrue(static::$container->has('private_service'));
-        $this->assertTrue(static::$container->has(UnusedPrivateService::class));
+        $this->assertFalse(static::$container->has(UnusedPrivateService::class));
    }
 }