Fix debug:config completion

Adrien Jourdier · Adrien Jourdier · commit 0af9d954c2af · 2021-11-04T15:35:31.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -52,16 +52,11 @@ protected function configure()
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command dumps the current configuration for an
 extension/bundle.
-
 Either the extension alias or bundle name can be used:
-
   <info>php %command.full_name% framework</info>
   <info>php %command.full_name% FrameworkBundle</info>
-
 For dumping a specific option, add its path as second argument:
-
   <info>php %command.full_name% framework serializer.enabled</info>
-
 EOF
             )
         ;
@@ -190,36 +185,26 @@ private function getConfigForExtension(ExtensionInterface $extension, ContainerB
     public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
     {
         if ($input->mustSuggestArgumentValuesFor('name')) {
-            $suggestions->suggestValues($this->getAvailableBundles());
+            $suggestions->suggestValues($this->getAvailableBundles(!preg_match('/[A-Z]/', $input->getCompletionValue()[0] ?? '')));
 
             return;
         }
 
         if ($input->mustSuggestArgumentValuesFor('path') && null !== $name = $input->getArgument('name')) {
-            $path = $input->getArgument('path');
-            $extension = $this->findExtension($name);
-            $extensionAlias = $extension->getAlias();
-            $container = $this->compileContainer();
-
             try {
-                $config = $this->getConfigForPath($this->getConfig($extension, $container), $path, $extensionAlias);
+                $config = $this->getConfig($this->findExtension($name), $this->compileContainer());
+                $paths = array_keys(self::buildPathsCompletion($config));
+                $suggestions->suggestValues($paths);
             } catch (LogicException $e) {
-                $config = [];
             }
-
-            $suggestions->suggestValues(array_keys($config));
         }
     }
 
-    private function getAvailableBundles(): array
+    private function getAvailableBundles(bool $alias): array
     {
         $availableBundles = [];
         foreach ($this->getApplication()->getKernel()->getBundles() as $bundle) {
-            $availableBundles[] = $bundle->getName();
-
-            if ($extension = $bundle->getContainerExtension()) {
-                $availableBundles[] = $extension->getAlias();
-            }
+            $availableBundles[] = $alias ? $bundle->getContainerExtension()->getAlias() : $bundle->getName();
         }
 
         return $availableBundles;
@@ -233,4 +218,18 @@ private function getConfig(ExtensionInterface $extension, ContainerBuilder $cont
             )
         );
     }
+
+    private static function buildPathsCompletion(array $paths, string $prefix = ''): array
+    {
+        $completionPaths = [];
+        foreach ($paths as $key => $values) {
+            if (\is_array($values)) {
+                $completionPaths = $completionPaths + self::buildPathsCompletion($values, $prefix . $key . '.');
+            } else {
+                $completionPaths[$prefix.$key] = null;
+            }
+        }
+
+        return $completionPaths;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ConfigDebugCommandTest.php
@@ -122,41 +122,36 @@ public function testComplete(array $input, array $expectedSuggestions)
 
         $tester = new CommandCompletionTester($this->application->get('debug:config'));
 
-        $suggestions = $tester->complete($input, 2);
+        $suggestions = $tester->complete($input);
 
-        $this->assertSame($expectedSuggestions, $suggestions);
+        foreach ($expectedSuggestions as $expectedSuggestion) {
+            $this->assertContains($expectedSuggestion, $suggestions);
+        }
     }
 
     public function provideCompletionSuggestions(): \Generator
     {
         yield 'name' => [
             [''],
             [
-                'DefaultConfigTestBundle',
                 'default_config_test',
-                'ExtensionWithoutConfigTestBundle',
                 'extension_without_config_test',
-                'FrameworkBundle',
                 'framework',
-                'TestBundle',
                 'test',
             ],
         ];
 
         yield 'name with existing path' => [
-            ['framework', 'uid'],
+            ['framework', ''],
             [
-                'enabled',
-                'default_uuid_version',
-                'name_based_uuid_version',
-                'time_based_uuid_version',
+                'secret',
+                'router.resource',
+                'router.utf8',
+                'router.enabled',
+                'validation.enabled',
+                'default_locale',
             ],
         ];
-
-        yield 'name with unknown path' => [
-            ['default_config_test', 'uid'],
-            [],
-        ];
     }
 
     private function createCommandTester(): CommandTester
