Move all namespaces under namespaces config node

Author: natepage

src/DependencyInjection/Configuration.php

@@ -30,21 +30,40 @@ public function getConfigTreeBuilder()
         }
 
         $rootNode
+            ->beforeNormalization()
+                ->ifTrue(function ($v) { return isset($v['root_namespace']) && !isset($v['namespaces']['root']); })
+                ->then(function ($v) {
+                    $v['namespaces']['root'] = $v['root_namespace'];
+
+                    return $v;
+                })
+            ->end()
+
             ->children()
-                ->scalarNode('root_namespace')->defaultValue('App\\')->end()
-                ->scalarNode('command_namespace')->defaultValue('Command\\')->end()
-                ->scalarNode('controller_namespace')->defaultValue('Controller\\')->end()
-                ->scalarNode('entity_namespace')->defaultValue('Entity\\')->end()
-                ->scalarNode('fixtures_namespace')->defaultValue('DataFixtures\\')->end()
-                ->scalarNode('form_namespace')->defaultValue('Form\\')->end()
-                ->scalarNode('functional_test_namespace')->defaultValue('Tests\\')->end()
-                ->scalarNode('repository_namespace')->defaultValue('Repository\\')->end()
-                ->scalarNode('security_namespace')->defaultValue('Security\\')->end()
-                ->scalarNode('serializer_namespace')->defaultValue('Serializer\\')->end()
-                ->scalarNode('subscriber_namespace')->defaultValue('EventSubscriber\\')->end()
-                ->scalarNode('twig_namespace')->defaultValue('Twig\\')->end()
-                ->scalarNode('unit_test_namespace')->defaultValue('Tests\\')->end()
-                ->scalarNode('validator_namespace')->defaultValue('Validator\\')->end()
+                ->scalarNode('root_namespace')
+                    ->setDeprecated('The child node "%node%" at path "%path%" is deprecated. Please use namespaces.root instead.')
+                    ->defaultNull()
+                ->end()
+
+                ->arrayNode('namespaces')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('root')->defaultNull()->end()
+                        ->scalarNode('command')->defaultValue('Command\\')->end()
+                        ->scalarNode('controller')->defaultValue('Controller\\')->end()
+                        ->scalarNode('entity')->defaultValue('Entity\\')->end()
+                        ->scalarNode('fixtures')->defaultValue('DataFixtures\\')->end()
+                        ->scalarNode('form')->defaultValue('Form\\')->end()
+                        ->scalarNode('functional_test')->defaultValue('Tests\\')->end()
+                        ->scalarNode('repository')->defaultValue('Repository\\')->end()
+                        ->scalarNode('security')->defaultValue('Security\\')->end()
+                        ->scalarNode('serializer')->defaultValue('Serializer\\')->end()
+                        ->scalarNode('subscriber')->defaultValue('EventSubscriber\\')->end()
+                        ->scalarNode('twig')->defaultValue('Twig\\')->end()
+                        ->scalarNode('unit_test')->defaultValue('Tests\\')->end()
+                        ->scalarNode('validator')->defaultValue('Validator\\')->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 

src/DependencyInjection/MakerExtension.php

@@ -38,7 +38,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $namespacesHelperDefinition = $container->getDefinition('maker.namespaces_helper');
-        $namespacesHelperDefinition->replaceArgument(0, $config);
+        $namespacesHelperDefinition->replaceArgument(0, $config['namespaces']);
 
         $container->registerForAutoconfiguration(MakerInterface::class)
             ->addTag(MakeCommandRegistrationPass::MAKER_TAG);

src/Util/NamespacesHelper.php

@@ -23,72 +23,72 @@ public function __construct(array $namespaces = null)
 
     public function getCommandNamespace(): string
     {
-        return $this->trim($this->namespaces['command_namespace'] ?? 'Command\\');
+        return $this->trim($this->namespaces['command'] ?? 'Command\\');
     }
 
     public function getControllerNamespace(): string
     {
-        return $this->trim($this->namespaces['controller_namespace'] ?? 'Controller\\');
+        return $this->trim($this->namespaces['controller'] ?? 'Controller\\');
     }
 
     public function getEntityNamespace(): string
     {
-        return $this->trim($this->namespaces['entity_namespace'] ?? 'Entity\\');
+        return $this->trim($this->namespaces['entity'] ?? 'Entity\\');
     }
 
     public function getFixturesNamespace(): string
     {
-        return $this->trim($this->namespaces['fixtures_namespace'] ?? 'DataFixtures\\');
+        return $this->trim($this->namespaces['fixtures'] ?? 'DataFixtures\\');
     }
 
     public function getFormNamespace(): string
     {
-        return $this->trim($this->namespaces['form_namespace'] ?? 'Form\\');
+        return $this->trim($this->namespaces['form'] ?? 'Form\\');
     }
 
     public function getFunctionalTestNamespace(): string
     {
-        return $this->trim($this->namespaces['functional_test_namespace'] ?? 'Tests\\');
+        return $this->trim($this->namespaces['functional_test'] ?? 'Tests\\');
     }
 
     public function getRepositoryNamespace(): string
     {
-        return $this->trim($this->namespaces['repository_namespace'] ?? 'Repository\\');
+        return $this->trim($this->namespaces['repository'] ?? 'Repository\\');
     }
 
     public function getRootNamespace(): string
     {
-        return $this->trim($this->namespaces['root_namespace'] ?? 'App\\');
+        return $this->trim($this->namespaces['root'] ?? 'App\\');
     }
 
     public function getSecurityNamespace(): string
     {
-        return $this->trim($this->namespaces['security_namespace'] ?? 'Security\\');
+        return $this->trim($this->namespaces['security'] ?? 'Security\\');
     }
 
     public function getSerializerNamespace(): string
     {
-        return $this->trim($this->namespaces['serializer_namespace'] ?? 'Serializer\\');
+        return $this->trim($this->namespaces['serializer'] ?? 'Serializer\\');
     }
 
     public function getSubscriberNamespace(): string
     {
-        return $this->trim($this->namespaces['subscriber_namespace'] ?? 'EventSubscriber\\');
+        return $this->trim($this->namespaces['subscriber'] ?? 'EventSubscriber\\');
     }
 
     public function getTwigNamespace(): string
     {
-        return $this->trim($this->namespaces['twig_namespace'] ?? 'Twig\\');
+        return $this->trim($this->namespaces['twig'] ?? 'Twig\\');
     }
 
     public function getUnitTestNamespace(): string
     {
-        return $this->trim($this->namespaces['unit_test_namespace'] ?? 'Tests\\');
+        return $this->trim($this->namespaces['unit_test'] ?? 'Tests\\');
     }
 
     public function getValidatorNamespace(): string
     {
-        return $this->trim($this->namespaces['validator_namespace'] ?? 'Validator\\');
+        return $this->trim($this->namespaces['validator'] ?? 'Validator\\');
     }
 
     private function trim(string $namespace): string