Merge branch '5.4' into 6.0

* 5.4:
  Fix merge
  [Mime] Throw exception when body in Email attach method is not ok
  [VarDumper][VarExporter] Deal with DatePeriod->include_end_date on PHP 8.2
  [Cache] Throw when "redis_sentinel" is used with a non-Predis "class" option
  fix merge
  Bootstrap 4 fieldset for row errors
  [Form] Fix same choice loader with different choice values
  [Filesystem] Safeguard (sym)link calls
  Fix dumping extension config without bundle
  [HttpClient] Honor "max_duration" when replacing requests with async decorators
  [HttpClient] Add missing HttpOptions::setMaxDuration()
  [HttpFoundation] [Session] Overwrite invalid session id

Author: nicolas-grekas

Command/AbstractConfigCommand.php

@@ -16,6 +16,7 @@
 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\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
@@ -54,7 +55,7 @@ protected function listBundles(OutputInterface|StyleInterface $output)
         }
     }
 
-    protected function findExtension(string $name): ExtensionInterface
+    protected function findExtension(string $name, ContainerBuilder $container): ExtensionInterface
     {
         $bundles = $this->initializeBundles();
         $minScore = \INF;
@@ -90,20 +91,18 @@ protected function findExtension(string $name): ExtensionInterface
                 $guess = $bundle->getName();
                 $minScore = $distance;
             }
+        }
 
-            $extension = $bundle->getContainerExtension();
-
-            if ($extension) {
-                if ($name === $extension->getAlias()) {
-                    return $extension;
-                }
+        if ($container->hasExtension($name)) {
+            return $container->getExtension($name);
+        }
 
-                $distance = levenshtein($name, $extension->getAlias());
+        foreach ($container->getExtensions() as $extension) {
+            $distance = levenshtein($name, $extension->getAlias());
 
-                if ($distance < $minScore) {
-                    $guess = $extension->getAlias();
-                    $minScore = $distance;
-                }
+            if ($distance < $minScore) {
+                $guess = $extension->getAlias();
+                $minScore = $distance;
             }
         }
 

Command/ConfigDebugCommand.php

@@ -90,9 +90,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $extension = $this->findExtension($name);
-        $extensionAlias = $extension->getAlias();
         $container = $this->compileContainer();
+        $extension = $this->findExtension($name, $container);
+        $extensionAlias = $extension->getAlias();
 
         $config = $this->getConfig($extension, $container);
 
@@ -193,7 +193,8 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
 
         if ($input->mustSuggestArgumentValuesFor('path') && null !== $name = $input->getArgument('name')) {
             try {
-                $config = $this->getConfig($this->findExtension($name), $this->compileContainer());
+                $container = $this->compileContainer();
+                $config = $this->getConfig($this->findExtension($name, $container), $container);
                 $paths = array_keys(self::buildPathsCompletion($config));
                 $suggestions->suggestValues($paths);
             } catch (LogicException $e) {

Command/ConfigDumpReferenceCommand.php

@@ -103,12 +103,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $extension = $this->findExtension($name);
+        $container = $this->getContainerBuilder($this->getApplication()->getKernel());
+        $extension = $this->findExtension($name, $container);
 
         if ($extension instanceof ConfigurationInterface) {
             $configuration = $extension;
         } else {
-            $configuration = $extension->getConfiguration([], $this->getContainerBuilder($this->getApplication()->getKernel()));
+            $configuration = $extension->getConfiguration([], $container);
         }
 
         $this->validateConfiguration($extension, $configuration);

Tests/Functional/ConfigDebugCommandTest.php

@@ -70,6 +70,15 @@ public function testDefaultParameterValueIsResolvedIfConfigIsExisting()
         $this->assertStringContainsString(sprintf("dsn: 'file:%s/profiler'", $kernelCacheDir), $tester->getDisplay());
     }
 
+    public function testDumpExtensionConfigWithoutBundle()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'test_dump']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('enabled: true', $tester->getDisplay());
+    }
+
     public function testDumpUndefinedBundleOption()
     {
         $tester = $this->createCommandTester();

Tests/Functional/ConfigDumpReferenceCommandTest.php

@@ -50,6 +50,15 @@ public function testDumpBundleName()
         $this->assertStringContainsString('    custom:', $tester->getDisplay());
     }
 
+    public function testDumpExtensionConfigWithoutBundle()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(['name' => 'test_dump']);
+
+        $this->assertSame(0, $ret, 'Returns 0 in case of success');
+        $this->assertStringContainsString('enabled:              true', $tester->getDisplay());
+    }
+
     public function testDumpAtPath()
     {
         $tester = $this->createCommandTester();

Tests/Functional/Extension/TestDumpExtension.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Extension;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+class TestDumpExtension extends Extension implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder('test_dump');
+        $treeBuilder->getRootNode()
+            ->children()
+                ->booleanNode('enabled')->defaultTrue()->end()
+            ->end()
+        ;
+
+        return $treeBuilder;
+    }
+
+    public function load(array $configs, ContainerBuilder $container)
+    {
+    }
+
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return $this;
+    }
+}

Tests/Functional/app/AppKernel.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\app;
 
 use Psr\Log\NullLogger;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Extension\TestDumpExtension;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Loader\LoaderInterface;
@@ -80,6 +81,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
     protected function build(ContainerBuilder $container)
     {
         $container->register('logger', NullLogger::class);
+        $container->registerExtension(new TestDumpExtension());
     }
 
     public function __sleep(): array