NamespacesHelper accepts array of namespaces.

MakeEntity is backwards compatible.

Author: natepage

src/DependencyInjection/MakerExtension.php

@@ -73,9 +73,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $this->processConfiguration($configuration, $configs);
 
         $namespacesHelperDefinition = $container->getDefinition('maker.namespaces_helper');
-        foreach (static::$namespaces as $index => $namespace) {
-            $namespacesHelperDefinition->replaceArgument($index, trim($config[$namespace], '\\'));
-        }
+        $namespacesHelperDefinition->replaceArgument(0, $config);
 
         $container->registerForAutoconfiguration(MakerInterface::class)
             ->addTag(MakeCommandRegistrationPass::MAKER_TAG);

src/Maker/MakeEntity.php

@@ -64,7 +64,7 @@ public function __construct(
 
         if (null === $generator) {
             @trigger_error(sprintf('Passing a "%s" instance as 4th argument is mandatory since version 1.5.', Generator::class), \E_USER_DEPRECATED);
-            $this->generator = new Generator($fileManager, new NamespacesHelper('App\\'));
+            $this->generator = new Generator($fileManager, new NamespacesHelper());
         } else {
             $this->generator = $generator;
         }

src/Resources/config/services.xml

@@ -41,20 +41,7 @@
             </service>
 
             <service id="maker.namespaces_helper" class="Symfony\Bundle\MakerBundle\Util\NamespacesHelper">
-                <argument /> <!-- root namespace -->
-                <argument /> <!-- command namespace -->
-                <argument /> <!-- controller namespace -->
-                <argument /> <!-- entity namespace -->
-                <argument /> <!-- fixtures namespace -->
-                <argument /> <!-- form namespace -->
-                <argument /> <!-- functional_test namespace -->
-                <argument /> <!-- repository namespace -->
-                <argument /> <!-- security namespace -->
-                <argument /> <!-- serializer namespace -->
-                <argument /> <!-- subscriber namespace -->
-                <argument /> <!-- twig namespace -->
-                <argument /> <!-- unit_test namespace -->
-                <argument /> <!-- validator namespace -->
+                <argument type="collection" /> <!-- namespaces -->
             </service>
 
             <service id="maker.auto_command.abstract" class="Symfony\Bundle\MakerBundle\Command\MakerCommand" abstract="true">

src/Util/NamespacesHelper.php

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

tests/Command/MakerCommandTest.php

@@ -40,7 +40,7 @@ public function testExceptionOnMissingDependencies(): void
 
         $fileManager = $this->createMock(FileManager::class);
 
-        $namespacesHelper = new NamespacesHelper('App');
+        $namespacesHelper = new NamespacesHelper(['root_namespace' => 'App']);
 
         $command = new MakerCommand($maker, $fileManager, new Generator($fileManager, $namespacesHelper));
         // needed because it's normally set by the Application
@@ -55,7 +55,7 @@ public function testExceptionOnUnknownRootNamespace(): void
 
         $fileManager = $this->createMock(FileManager::class);
 
-        $namespacesHelper = new NamespacesHelper('Unknown');
+        $namespacesHelper = new NamespacesHelper(['root_namespace' => 'Unknown']);
 
         $command = new MakerCommand($maker, $fileManager, new Generator($fileManager, $namespacesHelper));
         // needed because it's normally set by the Application

tests/Doctrine/EntityRegeneratorTest.php

@@ -97,7 +97,7 @@ private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $n
                 return $tmpDir.'/src/'.str_replace('\\', '/', $shortClassName).'.php';
             });
 
-        $namespacesHelper = new NamespacesHelper('App\\');
+        $namespacesHelper = new NamespacesHelper();
         $fileManager = new FileManager($fs, $autoloaderUtil, new MakerFileLinkFormatter(null), $tmpDir);
         $doctrineHelper = new DoctrineHelper($namespacesHelper, $container->get('doctrine'));
         $generator = new Generator($fileManager, $namespacesHelper);

tests/GeneratorTest.php

@@ -28,7 +28,7 @@ public function testCreateClassNameDetails(string $name, string $prefix, string
             ->method('getNamespacePrefixForClass')
             ->willReturn('Foo');
 
-        $generator = new Generator($fileManager, new NamespacesHelper('App\\'));
+        $generator = new Generator($fileManager, new NamespacesHelper());
         $classNameDetails = $generator->createClassNameDetails($name, $prefix, $suffix);
 
         $this->assertSame($expectedFullClassName, $classNameDetails->getFullName());