[FrameworkBundle] Add argument KernelInterface to BuildDebugContainerTrait::getContainerBuilder()

Nyholm · OskarStark · commit 0e9652a4bc4b · 2021-04-14T10:59:53.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -141,8 +141,9 @@ private function initializeBundles()
     {
         // Re-build bundle manually to initialize DI extensions that can be extended by other bundles in their build() method
         // as this method is not called when the container is loaded from the cache.
-        $container = $this->getContainerBuilder();
-        $bundles = $this->getApplication()->getKernel()->getBundles();
+        $kernel = $this->getApplication()->getKernel();
+        $container = $this->getContainerBuilder($kernel);
+        $bundles = $kernel->getBundles();
         foreach ($bundles as $bundle) {
             if ($extension = $bundle->getContainerExtension()) {
                 $container->registerExtension($extension);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php b/src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
  * @internal
@@ -32,14 +33,12 @@ trait BuildDebugContainerTrait
      *
      * @throws \LogicException
      */
-    protected function getContainerBuilder(): ContainerBuilder
+    protected function getContainerBuilder(KernelInterface $kernel): ContainerBuilder
     {
         if ($this->containerBuilder) {
             return $this->containerBuilder;
         }
 
-        $kernel = $this->getApplication()->getKernel();
-
         if (!$kernel->isDebug() || !(new ConfigCache($kernel->getContainer()->getParameter('debug.container.dump'), true))->isFresh()) {
             $buildContainer = \Closure::bind(function () { return $this->buildContainer(); }, $kernel, \get_class($kernel));
             $container = $buildContainer();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if ($extension instanceof ConfigurationInterface) {
             $configuration = $extension;
         } else {
-            $configuration = $extension->getConfiguration([], $this->getContainerBuilder());
+            $configuration = $extension->getConfiguration([], $this->getContainerBuilder($this->getApplication()->getKernel()));
         }
 
         $this->validateConfiguration($extension, $configuration);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -123,7 +123,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $errorIo = $io->getErrorStyle();
 
         $this->validateInput($input);
-        $object = $this->getContainerBuilder();
+        $kernel = $this->getApplication()->getKernel();
+        $object = $this->getContainerBuilder($kernel);
 
         if ($input->getOption('env-vars')) {
             $options = ['env-vars' => true];
@@ -160,12 +161,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $options['show_hidden'] = $input->getOption('show-hidden');
         $options['raw_text'] = $input->getOption('raw');
         $options['output'] = $io;
-        $options['is_debug'] = $this->getApplication()->getKernel()->isDebug();
+        $options['is_debug'] = $kernel->isDebug();
 
         try {
             $helper->describe($io, $object, $options);
 
-            if (isset($options['id']) && isset($this->getApplication()->getKernel()->getContainer()->getRemovedIds()[$options['id']])) {
+            if (isset($options['id']) && isset($kernel->getContainer()->getRemovedIds()[$options['id']])) {
                 $errorIo->note(sprintf('The "%s" service or alias has been removed or inlined when the container was compiled.', $options['id']));
             }
         } catch (ServiceNotFoundException $e) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
         $errorIo = $io->getErrorStyle();
 
-        $builder = $this->getContainerBuilder();
+        $builder = $this->getContainerBuilder($this->getApplication()->getKernel());
         $serviceIds = $builder->getServiceIds();
         $serviceIds = array_filter($serviceIds, [$this, 'filterToServiceTypes']);
 
@@ -155,7 +155,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     private function getFileLink(string $class): string
     {
         if (null === $this->fileLinkFormatter
-            || (null === $r = $this->getContainerBuilder()->getReflectionClass($class, false))) {
+            || (null === $r = $this->getContainerBuilder($this->getApplication()->getKernel())->getReflectionClass($class, false))) {
             return '';
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -82,7 +82,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $name = $input->getArgument('name');
         $helper = new DescriptorHelper($this->fileLinkFormatter);
         $routes = $this->router->getRouteCollection();
-        $container = $this->fileLinkFormatter ? \Closure::fromCallable([$this, 'getContainerBuilder']) : null;
+        $container = null;
+        if ($this->fileLinkFormatter) {
+            $container = function () {
+                return $this->getContainerBuilder($this->getApplication()->getKernel());
+            };
+        }
 
         if ($name) {
             if (!($route = $routes->get($name)) && $matchingRoutes = $this->findRouteNameContaining($name, $routes)) {

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`108`	`108`	`if ($extension instanceof ConfigurationInterface) {`
`109`	`109`	`$configuration = $extension;`
`110`	`110`	`} else {`
`111`		`- $configuration = $extension->getConfiguration([], $this->getContainerBuilder());`
	`111`	`+ $configuration = $extension->getConfiguration([], $this->getContainerBuilder($this->getApplication()->getKernel()));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`$this->validateConfiguration($extension, $configuration);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`76`	`76`	`$io = new SymfonyStyle($input, $output);`
`77`	`77`	`$errorIo = $io->getErrorStyle();`
`78`	`78`
`79`		`- $builder = $this->getContainerBuilder();`
	`79`	`+ $builder = $this->getContainerBuilder($this->getApplication()->getKernel());`
`80`	`80`	`$serviceIds = $builder->getServiceIds();`
`81`	`81`	`$serviceIds = array_filter($serviceIds, [$this, 'filterToServiceTypes']);`
`82`	`82`
`@@ -155,7 +155,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`155`	`155`	`private function getFileLink(string $class): string`
`156`	`156`	`{`
`157`	`157`	`if (null === $this->fileLinkFormatter`
`158`		`- \|\| (null === $r = $this->getContainerBuilder()->getReflectionClass($class, false))) {`
	`158`	`+ \|\| (null === $r = $this->getContainerBuilder($this->getApplication()->getKernel())->getReflectionClass($class, false))) {`
`159`	`159`	`return '';`
`160`	`160`	`}`
`161`	`161`