8000 Make namespaces configurable · symfony/symfony@1871684 · GitHub
[go: up one dir, main page]

Skip to content

Commit 1871684

Browse files
committed
Make namespaces configurable
1 parent 1437e85 commit 1871684

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/Symfony/Component/Form/Command/FormDebugCommand.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,14 @@ class FormDebugCommand extends Command
3333
private $optionsResolver;
3434
private $parents = array();
3535
private $extensions = array();
36-
private $namespaces = array(
37-
'Symfony\\Bridge\\Doctrine\\Form\\Type',
38-
'Symfony\\Component\\Form\\Extension\\Core\\Type',
39-
);
36+
private $namespaces;
4037

41-
public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array())
38+
public function __construct(FormRegistryInterface $formRegistry, array $namespaces = array('Symfony\\Component\\Form\\Extension\\Core\\Type'))
4239
{
4340
parent::__construct();
4441

4542
$this->formRegistry = $formRegistry;
46-
$this->namespaces = array_unique(array_merge($this->namespaces, $namespaces));
43+
$this->namespaces = $namespaces;
4744
}
4845

4946
/**

src/Symfony/Component/Form/DependencyInjection/FormPass.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ class FormPass implements CompilerPassInterface
3434
private $formTypeTag;
3535
private $formTypeExtensionTag;
3636
private $formTypeGuesserTag;
37+
private $formDebugCommandId;
3738

38-
public function __construct($formExtensionService = 'form.extension', $formTypeTag = 'form.type', $formTypeExtensionTag = 'form.type_extension', $formTypeGuesserTag = 'form.type_guesser')
39+
public function __construct($formExtensionService = 'form.extension', $formTypeTag = 'form.type', $formTypeExtensionTag = 'form.type_extension', $formTypeGuesserTag = 'form.type_guesser', $formDebugCommandId = 'form.command.debug')
3940
{
4041
$this->formExtensionService = $formExtensionService;
4142
$this->formTypeTag = $formTypeTag;
4243
$this->formTypeExtensionTag = $formTypeExtensionTag;
4344
$this->formTypeGuesserTag = $formTypeGuesserTag;
45+
$this->formDebugCommandId = $formDebugCommandId;
4446
}
4547

4648
public function process(ContainerBuilder $container)
@@ -70,13 +72,13 @@ private function processFormTypes(ContainerBuilder $container, Definition $defin
7072
$servicesMap[$serviceDefinition->getClass()] = new Reference($serviceId);
7173
}
7274

73-
if ($container->hasDefinition('form.command.debug')) {
75+
if ($container->hasDefinition($this->formDebugCommandId)) {
7476
// Builds an array of namespaces from registered form types
7577
$namespaces = array_map(function ($class) {
7678
return substr($class, 0, strrpos($class, '\\'));
7779
}, array_keys($servicesMap));
78-
$commandDefinition = $container->getDefinition('form.command.debug');
79-
$commandDefinition->setArgument(1, $namespaces);
80+
$commandDefinition = $container->getDefinition($this->formDebugCommandId);
81+
$commandDefinition->setArgument(1, array_unique($namespaces));
8082
}
8183

8284
return ServiceLocatorTagPass::register($container, $servicesMap);

0 commit comments

Comments
 (0)
0