Make namespaces configurable

yceruto · yceruto · commit 1871684a5144 · 2017-07-30T17:28:02.000-04:00
diff --git a/src/Symfony/Component/Form/Command/FormDebugCommand.php b/src/Symfony/Component/Form/Command/FormDebugCommand.php
@@ -33,17 +33,14 @@ class FormDebugCommand extends Command
     private $optionsResolver;
     private $parents = array();
     private $extensions = array();
-    private $namespaces = array(
-        'Symfony\\Bridge\\Doctrine\\Form\\Type',
-        'Symfony\\Component\\Form\\Extension\\Core\\Type',
-    );
+    private $namespaces;
 
-    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array())
+    public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array('Symfony\\Component\\Form\\Extension\\Core\\Type'))
     {
         parent::__construct();
 
         $this->formRegistry = $formRegistry;
-        $this->namespaces = array_unique(array_merge($this->namespaces, $namespaces));
+        $this->namespaces = $namespaces;
     }
 
     /**
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -34,13 +34,15 @@ class FormPass implements CompilerPassInterface
     private $formTypeTag;
     private $formTypeExtensionTag;
     private $formTypeGuesserTag;
+    private $formDebugCommandId;
 
-    public function __construct($formExtensionService = 'form.extension', $formTypeTag = 'form.type', $formTypeExtensionTag = 'form.type_extension', $formTypeGuesserTag = 'form.type_guesser')
+    public function __construct($formExtensionService = 'form.extension', $formTypeTag = 'form.type', $formTypeExtensionTag = 'form.type_extension', $formTypeGuesserTag = 'form.type_guesser', $formDebugCommandId = 'form.command.debug')
     {
         $this->formExtensionService = $formExtensionService;
         $this->formTypeTag = $formTypeTag;
         $this->formTypeExtensionTag = $formTypeExtensionTag;
         $this->formTypeGuesserTag = $formTypeGuesserTag;
+        $this->formDebugCommandId = $formDebugCommandId;
     }
 
     public function process(ContainerBuilder $container)
@@ -70,13 +72,13 @@ private function processFormTypes(ContainerBuilder $container, Definition $defin
             $servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);
         }
 
-        if ($container->hasDefinition('form.command.debug')) {
+        if ($container->hasDefinition($this->formDebugCommandId)) {
             // 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);
+            $commandDefinition = $container->getDefinition($this->formDebugCommandId);
+            $commandDefinition->setArgument(1, array_unique($namespaces));
         }
 
         return ServiceLocatorTagPass::register($container, $servicesMap);
