[DI] fixed incorrect report for private services if required service does not exist

fu22ybear · fu22ybear · commit c86c6e14c59e · 2020-11-23T20:57:08.000+03:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -74,6 +74,7 @@ public function __construct()
         $this->beforeRemovingPasses = [
             -100 => [
                 new ResolvePrivatesPass(),
+                new CheckExceptionOnInvalidReferenceBehaviorPass(),
             ],
         ];
 
@@ -88,7 +89,6 @@ public function __construct()
         ]];
 
         $this->afterRemovingPasses = [[
-            new CheckExceptionOnInvalidReferenceBehaviorPass(),
             new ResolveHotPathPass(),
         ]];
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1316,6 +1316,28 @@ public function testNoClassFromNsSeparatorId()
         $container->compile();
     }
 
+    public function testGetThrownServiceNotFoundExceptionWithCorrectServiceId()
+    {
+        $this->expectException(ServiceNotFoundException::class);
+        $this->expectExceptionMessage('The service "child_service" has a dependency on a non-existent service "non_existent_service".');
+
+        $container = new ContainerBuilder();
+        $container->register('child_service', \stdClass::class)
+            ->setPublic(false)
+            ->addArgument([
+                'non_existent' => new Reference('non_existent_service'),
+            ])
+        ;
+        $container->register('parent_service', \stdClass::class)
+            ->setPublic(true)
+            ->addArgument([
+                'child_service' => new Reference('child_service'),
+            ])
+        ;
+
+        $container->compile();
+    }
+
     public function testServiceLocator()
     {
         $container = new ContainerBuilder();
