Fix BC break

yceruto · yceruto · commit 5be61fa8b6c0 · 2022-05-21T15:38:22.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\StyleInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
@@ -60,7 +59,7 @@ protected function listBundles($output)
     /**
      * @return ExtensionInterface
      */
-    protected function findExtension($name, ContainerBuilder $container)
+    protected function findExtension($name)
     {
         $bundles = $this->initializeBundles();
         $minScore = \INF;
@@ -82,6 +81,8 @@ protected function findExtension($name, ContainerBuilder $container)
             }
         }
 
+        $container = $this->getContainerBuilder();
+
         if ($container->hasExtension($name)) {
             return $container->getExtension($name);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -79,9 +79,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $container = $this->compileContainer();
-        $extension = $this->findExtension($name, $container);
+        $extension = $this->findExtension($name);
         $extensionAlias = $extension->getAlias();
+        $container = $this->compileContainer();
 
         $config = $container->resolveEnvPlaceholders(
             $container->getParameterBag()->resolveValue(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -89,10 +89,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $container = $this->getContainerBuilder();
-        $extension = $this->findExtension($name, $container);
+        $extension = $this->findExtension($name);
 
-        $configuration = $extension->getConfiguration([], $container);
+        $configuration = $extension->getConfiguration([], $this->getContainerBuilder());
 
         $this->validateConfiguration($extension, $configuration);
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`use Symfony\Component\Console\Helper\Table;`
`17`	`17`	`use Symfony\Component\Console\Output\OutputInterface;`
`18`	`18`	`use Symfony\Component\Console\Style\StyleInterface;`
`19`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
`20`	`19`	`use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;`
`21`	`20`
`22`	`21`	`/**`
`@@ -60,7 +59,7 @@ protected function listBundles($output)`
`60`	`59`	`/**`
`61`	`60`	`* @return ExtensionInterface`
`62`	`61`	`*/`
`63`		`- protected function findExtension($name, ContainerBuilder $container)`
	`62`	`+ protected function findExtension($name)`
`64`	`63`	`{`
`65`	`64`	`$bundles = $this->initializeBundles();`
`66`	`65`	`$minScore = \INF;`
`@@ -82,6 +81,8 @@ protected function findExtension($name, ContainerBuilder $container)`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`
	`84`	`+ $container = $this->getContainerBuilder();`
	`85`	`+`
`85`	`86`	`if ($container->hasExtension($name)) {`
`86`	`87`	`return $container->getExtension($name);`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`89`	`89`	`return 0;`
`90`	`90`	`}`
`91`	`91`
`92`		`- $container = $this->getContainerBuilder();`
`93`		`- $extension = $this->findExtension($name, $container);`
	`92`	`+ $extension = $this->findExtension($name);`
`94`	`93`
`95`		`- $configuration = $extension->getConfiguration([], $container);`
	`94`	`+ $configuration = $extension->getConfiguration([], $this->getContainerBuilder());`
`96`	`95`
`97`	`96`	`$this->validateConfiguration($extension, $configuration);`
`98`	`97`