Choose the proper type class when it is ambiguous

yceruto · yceruto · commit 1437e8532b9a · 2017-07-28T17:10:39.000-04:00
diff --git a/src/Symfony/Component/Form/Command/FormDebugCommand.php b/src/Symfony/Component/Form/Command/FormDebugCommand.php
@@ -33,7 +33,6 @@ class FormDebugCommand extends Command
     private $optionsResolver;
     private $parents = array();
     private $extensions = array();
-    private $typesFound = array();
     private $namespaces = array(
         'Symfony\\Bridge\\Doctrine\\Form\\Type',
         'Symfony\\Component\\Form\\Extension\\Core\\Type',
@@ -66,15 +65,15 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $class = $input->getArgument('class');
-        if (!class_exists($class) && false === mb_strpos($class, '\\')) {
-            $class = $this->findFormTypeClass($class);
+        $io = new SymfonyStyle($input, $output);
+
+        if (!class_exists($class = $input->getArgument('class'))) {
+            $class = $this->findProperTypeClass($input, $io, $class);
         }
 
         $type = $this->formRegistry->getType($class);
 
-        $io = new SymfonyStyle($input, $output);
-        $io->section(sprintf('%s (Block prefix: "%s")', get_class($type->getInnerType()), $type->getInnerType()->getBlockPrefix()));
+        $io->title(sprintf('%s (Block prefix: "%s")', get_class($type->getInnerType()), $type->getInnerType()->getBlockPrefix()));
 
         list($headers, $rows) = $this->buildTableContent($this->getOptionsGroup($type));
         $io->table($headers, $rows);
@@ -88,13 +87,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $io->section('Type extensions');
             $io->listing(array_keys($this->extensions));
         }
-
-        if (count($this->typesFound) > 1) {
-            $io->block('Similar form types found:', null, 'info');
-            $io->listing(array_slice($this->typesFound, 1));
-            $io->comment('To search for a specific class, re-run this command with the fully-qualified class name.');
-            $io->comment(sprintf('e.g. <comment>debug:form \'%s\'</comment>', $this->typesFound[1]));
-        }
     }
 
     private function getOptionsGroup(ResolvedFormTypeInterface $type)
@@ -157,19 +149,26 @@ private function getParentOptionResolver(ResolvedFormTypeInterface $type)
         return $optionsResolver;
     }
 
-    private function findFormTypeClass($shortClassName)
+    private function findProperTypeClass(InputInterface $input, SymfonyStyle $io, $shortClassName)
     {
+        $classes = array();
         foreach ($this->namespaces as $namespace) {
             if (class_exists($fqcn = $namespace.'\\'.$shortClassName)) {
-                $this->typesFound[] = $fqcn;
+                $classes[] = $fqcn;
             }
         }
 
-        if (0 === count($this->typesFound)) {
-            throw new \InvalidArgumentException(sprintf('Could not find type "%s" into the following namespaces: %s.', $shortClassName, implode(', ', $this->namespaces)));
+        if (0 === $count = count($classes)) {
+            throw new \InvalidArgumentException(sprintf("Could not find type \"%s\" into the following namespaces:\n    %s", $shortClassName, implode("\n    ", $this->namespaces)));
+        }
+        if (1 === $count) {
+            return $classes[0];
+        }
+        if (!$input->isInteractive()) {
+            throw new \InvalidArgumentException(sprintf("The type \"%s\" is ambiguous.\nDid you mean one of these?\n    %s", $shortClassName, implode("\n    ", $classes)));
         }
 
-        return $this->typesFound[0];
+        return $io->choice(sprintf("The type \"%s\" is ambiguous.\n\n Select one of the following form types to display its information:", $shortClassName), $classes, $classes[0]);
     }
 
     private function buildTableContent($options)
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -70,12 +70,14 @@ private function processFormTypes(ContainerBuilder $container, Definition $defin
             $servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);
         }
 
-        // Builds an array of namespaces from registered form types
-        $namespaces = array_map(function ($class) {
-            return substr($class, 0, strrpos($class, '\\'));
-        }, array_keys($servicesMap));
-        $commandDefinition = $container->getDefinition('form.command.debug');
-        $commandDefinition->setArgument(1, $namespaces);
+        if ($container->hasDefinition('form.command.debug')) {
+            // Builds an array of namespaces from registered form types
+            $namespaces = array_map(function ($class) {
+                return substr($class, 0, strrpos($class, '\\'));
+            }, array_keys($servicesMap));
+            $commandDefinition = $container->getDefinition('form.command.debug');
+            $commandDefinition->setArgument(1, $namespaces);
+        }
 
         return ServiceLocatorTagPass::register($container, $servicesMap);
     }
