AnalyzeServiceReferencesPass and CheckExceptionOnInvalidReferenceBehaviorPass just after RemoveUnusedDefinitionsPass

fu22ybear · fu22ybear · commit 0acbc9e820be · 2020-11-29T14:51:02.000+03:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -74,7 +74,6 @@ public function __construct()
         $this->beforeRemovingPasses = [
             -100 => [
                 new ResolvePrivatesPass(),
-                new CheckExceptionOnInvalidReferenceBehaviorPass(),
             ],
         ];
 
@@ -83,8 +82,9 @@ public function __construct()
             new ReplaceAliasByActualDefinitionPass(),
             new RemoveAbstractDefinitionsPass(),
             new RemoveUnusedDefinitionsPass(),
-            new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()),
             new AnalyzeServiceReferencesPass(),
+            new CheckExceptionOnInvalidReferenceBehaviorPass(),
+            new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()),
             new DefinitionErrorExceptionPass(),
         ]];
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1338,6 +1338,25 @@ public function testGetThrownServiceNotFoundExceptionWithCorrectServiceId()
         $container->compile();
     }
 
+    public function testUnusedServiceRemovedByPassAndServiceNotFoundExceptionWasNotThrown()
+    {
+        $container = new ContainerBuilder();
+        $container->register('service', \stdClass::class)
+            ->setPublic(false)
+            ->addArgument([
+                'non_existent_service' => new Reference('non_existent_service'),
+            ])
+        ;
+
+        try {
+            $container->compile();
+        } catch (ServiceNotFoundException $e) {
+            $this->fail('Should not be thrown');
+        }
+
+        $this->addToAssertionCount(1);
+    }
+
     public function testServiceLocator()
     {
         $container = new ContainerBuilder();
