Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 90164c148e5f · 2022-05-23T13:44:28.000+02:00
* 6.0:
  Fix merge
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -92,7 +92,7 @@ protected function findExtension(string $name): ExtensionInterface
             }
         }
 
-        $container = $this->getContainerBuilder();
+        $container = $this->getContainerBuilder($kernel);
 
         if ($container->hasExtension($name)) {
             return $container->getExtension($name);

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function findExtension(string $name): ExtensionInterface`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`95`		`- $container = $this->getContainerBuilder();`
	`95`	`+ $container = $this->getContainerBuilder($kernel);`
`96`	`96`
`97`	`97`	`if ($container->hasExtension($name)) {`
`98`	`98`	`return $container->getExtension($name);`