[HttpKernel][DI] Enable Kernel to implement CompilerPassInterface

nicolas-grekas · nicolas-grekas · commit 2e1a0eaf257d · 2017-09-19T14:36:29.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ExtensionCompilerPass.php
@@ -33,5 +33,9 @@ public function process(ContainerBuilder $container)
 
             $extension->process($container);
         }
+
+        if ($container->getKernelPass()) {
+            $container->getKernelPass()->process($container);
+        }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -121,6 +121,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
 
     private $autoconfiguredInstanceof = array();
 
+    private $kernelPass;
+
     public function __construct(ParameterBagInterface $parameterBag = null)
     {
         parent::__construct($parameterBag);
@@ -701,6 +703,16 @@ 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/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -767,6 +768,9 @@ protected function getContainerBuilder()
         $container = new ContainerBuilder();
         $container->getParameterBag()->add($this->getKernelParameters());
 
+        if ($this instanceof CompilerPassInterface) {
+            $container->setKernelPass($this);
+        }
         if (class_exists('ProxyManager\Configuration') && class_exists('Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator')) {
             $container->setProxyInstantiator(new RuntimeInstantiator());
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -831,6 +832,14 @@ public function testKernelReset()
         $this->assertFileNotExists($containerFile);
     }
 
+    public function testKernelPass()
+    {
+        $kernel = new PassKernel();
+        $kernel->boot();
+
+        $this->assertTrue($kernel->getContainer()->getParameter('test.processed'));
+    }
+
     /**
      * Returns a mock for the BundleInterface.
      *
@@ -967,3 +976,17 @@ protected function build(ContainerBuilder $container)
         }
     }
 }
+
+class PassKernel extends CustomProjectDirKernel implements CompilerPassInterface
+{
+    public function __construct(\Closure $buildContainer = null)
+    {
+        parent::__construct();
+        Kernel::__construct('pass', true);
+    }
+
+    public function process(ContainerBuilder $container)
+    {
+        $container->setParameter('test.processed', true);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,9 @@ 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`	`+ }`
`36`	`40`	`}`
`37`	`41`	`}`