[DI] reorder ExtensionCompilerPass

nicolas-grekas · nicolas-grekas · commit aa986d70a5c9 · 2017-09-20T09:10:53.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * moved the `ExtensionCompilerPass` to before-optimization passes with priority -1000
  * deprecated "public-by-default" definitions and aliases, the new default will be "private" in 4.0
  * added `EnvVarProcessorInterface` and corresponding "container.env_var_processor" tag for processing env vars
  * added support for ignore-on-uninitialized references
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
@@ -33,9 +33,5 @@ public function process(ContainerBuilder $container)
 
             $extension->process($container);
         }
-
-        if ($container->getKernelPass()) {
-            $container->getKernelPass()->process($container);
-        }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -45,10 +45,10 @@ public function __construct()
                 new ResolveInstanceofConditionalsPass(),
                 new RegisterEnvVarProcessorsPass(),
             ),
+            -1000 => array(new ExtensionCompilerPass()),
         );
 
         $this->optimizationPasses = array(array(
-            new ExtensionCompilerPass(),
             new ResolveChildDefinitionsPass(),
             new ServiceLocatorTagPass(),
             new DecoratorServicePass(),
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -121,8 +121,6 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
     private $autoconfiguredInstanceof = array();
 
-    private $kernelPass;
-
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
         parent::__construct($parameterBag);
@@ -719,16 +717,6 @@ public function prependExtensionConfig($name, array $config)
         array_unshift($this->extensionConfigs[$name], $config);
     }
 
-    public function setKernelPass(CompilerPassInterface $kernelPass)
-    {
-        $this->kernelPass = $kernelPass;
-    }
-
-    public function getKernelPass()
-    {
-        return $this->kernelPass;
-    }
-
     /**
      * Compiles the container.
      *
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 3.4.0
 -----
 
+ * made kernels implementing `CompilerPassInterface` able to process the container
  * deprecated bundle inheritance
  * added `RebootableInterface` and implemented it in `Kernel`
  * deprecated commands auto registration
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -769,7 +769,7 @@ protected function getContainerBuilder()
         $container->getParameterBag()->add($this->getKernelParameters());
 
         if ($this instanceof CompilerPassInterface) {
-            $container->setKernelPass($this);
+            $container->addCompilerPass($this, PassConfig::TYPE_BEFORE_OPTIMIZATION, -10000);
         }
         if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {
             $container->setProxyInstantiator(new RuntimeInstantiator());

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,5 @@ public function process(ContainerBuilder $container)`
`33`	`33`
`34`	`34`	`$extension->process($container);`
`35`	`35`	`}`
`36`		`-`
`37`		`- if ($container->getKernelPass()) {`
`38`		`- $container->getKernelPass()->process($container);`
`39`		`- }`
`40`	`36`	`}`
`41`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ protected function getContainerBuilder()`
`769`	`769`	`$container->getParameterBag()->add($this->getKernelParameters());`
`770`	`770`
`771`	`771`	`if ($this instanceof CompilerPassInterface) {`
`772`		`- $container->setKernelPass($this);`
	`772`	`+ $container->addCompilerPass($this, PassConfig::TYPE_BEFORE_OPTIMIZATION, -10000);`
`773`	`773`	`}`
`774`	`774`	`if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {`
`775`	`775`	`$container->setProxyInstantiator(new RuntimeInstantiator());`