[DI] Move non removing compiler passes to after removing passes

alexpott · nicolas-grekas · commit 88196ef4afe3 · 2019-07-18T19:01:22.000+02:00
diff --git a/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php b/src/Symfony/Bundle/DebugBundle/Tests/DependencyInjection/DebugExtensionTest.php
@@ -86,6 +86,7 @@ private function compileContainer(ContainerBuilder $container)
     {
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -229,6 +229,7 @@ protected function getContainerBuilder()
             $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
             $container = $buildContainer();
             $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
             $container->compile();
         } else {
             (new XmlFileLoader($container = new ContainerBuilder(), new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1625,6 +1625,7 @@ protected function createContainerFromFile($file, $data = [], $resetCompilerPass
         if ($resetCompilerPasses) {
             $container->getCompilerPassConfig()->setOptimizationPasses([]);
             $container->getCompilerPassConfig()->setRemovingPasses([]);
+            $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         }
         $container->getCompilerPassConfig()->setBeforeOptimizationPasses([new LoggerPass()]);
         $container->getCompilerPassConfig()->setBeforeRemovingPasses([new AddConstraintValidatorsPass(), new TranslatorPass('translator.default', 'translation.reader')]);
@@ -1647,6 +1648,7 @@ protected function createContainerFromClosure($closure, $data = [])
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         return $container;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php
@@ -659,6 +659,7 @@ protected function getContainer($file)
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         return $container;
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -410,6 +410,7 @@ protected function getRawContainer()
 
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
 
         return $container;
     }
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
@@ -299,6 +299,7 @@ public function testRuntimeLoader()
         $container->register('foo', '%foo%')->addTag('twig.runtime');
         $container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
 
         $loader = $container->getDefinition('twig.runtime_loader');
@@ -335,6 +336,7 @@ private function compileContainer(ContainerBuilder $container)
     {
         $container->getCompilerPassConfig()->setOptimizationPasses([]);
         $container->getCompilerPassConfig()->setRemovingPasses([]);
+        $container->getCompilerPassConfig()->setAfterRemovingPasses([]);
         $container->compile();
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -85,6 +85,9 @@ public function __construct()
             new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()),
             new AnalyzeServiceReferencesPass(),
             new DefinitionErrorExceptionPass(),
+        ]];
+
+        $this->afterRemovingPasses = [[
             new CheckExceptionOnInvalidReferenceBehaviorPass(),
             new ResolveHotPathPass(),
         ]];
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckCircularReferencesPassTest.php
@@ -152,6 +152,7 @@ protected function process(ContainerBuilder $container)
             new CheckCircularReferencesPass(),
         ]);
         $passConfig->setRemovingPasses([]);
+        $passConfig->setAfterRemovingPasses([]);
 
         $compiler->compile($container);
     }

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ private function compileContainer(ContainerBuilder $container)`
`86`	`86`	`{`
`87`	`87`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`88`	`88`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`89`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`89`	`90`	`$container->compile();`
`90`	`91`	`}`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ protected function getRawContainer()`
`410`	`410`
`411`	`411`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`412`	`412`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`413`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`413`	`414`
`414`	`415`	`return $container;`
`415`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ public function testRuntimeLoader()`
`299`	`299`	`$container->register('foo', '%foo%')->addTag('twig.runtime');`
`300`	`300`	`$container->addCompilerPass(new RuntimeLoaderPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`301`	`301`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`302`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`302`	`303`	`$container->compile();`
`303`	`304`
`304`	`305`	`$loader = $container->getDefinition('twig.runtime_loader');`
`@@ -335,6 +336,7 @@ private function compileContainer(ContainerBuilder $container)`
`335`	`336`	`{`
`336`	`337`	`$container->getCompilerPassConfig()->setOptimizationPasses([]);`
`337`	`338`	`$container->getCompilerPassConfig()->setRemovingPasses([]);`
	`339`	`+ $container->getCompilerPassConfig()->setAfterRemovingPasses([]);`
`338`	`340`	`$container->compile();`
`339`	`341`	`}`
`340`	`342`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ protected function process(ContainerBuilder $container)`
`152`	`152`	`new CheckCircularReferencesPass(),`
`153`	`153`	`]);`
`154`	`154`	`$passConfig->setRemovingPasses([]);`
	`155`	`+ $passConfig->setAfterRemovingPasses([]);`
`155`	`156`
`156`	`157`	`$compiler->compile($container);`
`157`	`158`	`}`