Switch to a simple prefix. Fix and add tests.

Author: dunglas

src/TypesGenerator.php

@@ -827,21 +827,8 @@ private function generateClassUses(array $annotationGenerators, array $classes,
      */
     private function namespaceToDir(array $config, string $namespace): string
     {
-        if (!empty($config['namespaces']['alias'])) {
-            $prepend = '';
-            foreach ($config['namespaces']['alias'] as $a) {
-                if (!file_exists($a['resolvePath']) && !is_dir($a['resolvePath'])) {
-                    $this->logger->warning(sprintf('the path to resolve "%s" does not exists or is not a directory.', $a['resolvePath']));
-                } else {
-                    if (null !== $a['namespace']) {
-                        $namespace = str_replace($a['namespace'], $a['resolvePath'], $namespace);
-                    } else {
-                        // Keep the last resolvePath if there is multiple definition with empty namespace.
-                        $prepend = $a['resolvePath'];
-                    }
-                }
-            }
-            $namespace = $prepend . $namespace;
+        if (null !== ($prefix = $config['namespaces']['prefix'] ?? null) && 0 === strpos($namespace, $prefix)) {
+            $namespace = substr($namespace, strlen($prefix));
         }
 
         return sprintf('%s/%s/', $config['output'], strtr($namespace, '\\', '/'));

src/TypesGeneratorConfiguration.php

@@ -92,26 +92,10 @@ function ($rdfa) {
                     ->addDefaultsIfNotSet()
                     ->info('PHP namespaces')
                     ->children()
-                        ->arrayNode('alias')
-                            ->cannotBeOverwritten()
-                            ->prototype('array')
-                                ->children()
-                                    ->scalarNode('namespace')
-                                        ->defaultNull()
-                                        ->info('Namespace to alias')
-                                        ->example('App\\')
-                                    ->end()
-                                    ->scalarNode('resolvePath')
-                                        ->defaultNull()
-                                        ->info('Path to resolve')
-                                        ->example('src/')
-                                    ->end()
-                                ->end()
-                            ->end()
-                        ->end()
-                        ->scalarNode('entity')->defaultValue('AppBundle\Entity')->info('The namespace of the generated entities')->example('Acme\Entity')->end()
-                        ->scalarNode('enum')->defaultValue('AppBundle\Enum')->info('The namespace of the generated enumerations')->example('Acme\Enum')->end()
-                        ->scalarNode('interface')->defaultValue('AppBundle\Model')->info('The namespace of the generated interfaces')->example('Acme\Model')->end()
+                        ->scalarNode('prefix')->defaultNull()->info('The global namespace\'s prefix')->example('App\\')->end()
+                        ->scalarNode('entity')->defaultValue('AppBundle\Entity')->info('The namespace of the generated entities')->example('App\Entity')->end()
+                        ->scalarNode('enum')->defaultValue('AppBundle\Enum')->info('The namespace of the generated enumerations')->example('App\Enum')->end()
+                        ->scalarNode('interface')->defaultValue('AppBundle\Model')->info('The namespace of the generated interfaces')->example('App\Model')->end()
                     ->end()
                 ->end()
                 ->arrayNode('doctrine')

tests/Command/DumpConfigurationTest.php

@@ -76,14 +76,17 @@ public function testDumpConfiguration()
     # PHP namespaces
     namespaces:
 
+        # The global namespace's prefix
+        prefix:               null # Example: App\
+
         # The namespace of the generated entities
-        entity:               AppBundle\Entity # Example: Acme\Entity
+        entity:               AppBundle\Entity # Example: App\Entity
 
         # The namespace of the generated enumerations
-        enum:                 AppBundle\Enum # Example: Acme\Enum
+        enum:                 AppBundle\Enum # Example: App\Enum
 
         # The namespace of the generated interfaces
-        interface:            AppBundle\Model # Example: Acme\Model
+        interface:            AppBundle\Model # Example: App\Model
 
     # Doctrine
     doctrine:

tests/Command/GenerateTypesCommandTest.php

@@ -308,4 +308,19 @@ public function testDoNotGenerateId()
         $this->assertNotContains('function getId', $person);
         $this->assertNotContains('function setId', $person);
     }
+
+    public function testNamespacesPrefix()
+    {
+        $outputDir = __DIR__.'/../../build/namespaces-prefix';
+        $config = __DIR__.'/../config/namespaces-prefix.yaml';
+
+        $this->fs->mkdir($outputDir);
+
+        $commandTester = new CommandTester(new GenerateTypesCommand());
+        $this->assertEquals(0, $commandTester->execute(['output' => $outputDir, 'config' => $config]));
+
+        $person = file_get_contents("$outputDir/Entity/Person.php");
+
+        $this->assertContains('namespace App\Entity;', $person);
+    }
 }

tests/TypesGeneratorTest.php

@@ -392,17 +392,16 @@ private function getClasses(): array
     private function getContextMatcher(array $class)
     {
         $config = $this->getConfig();
-        $classes = $this->getClasses();
 
-        return function ($context) use ($config, $classes, $class) {
+        return function ($context) use ($config, $class) {
             if (!isset($context['config']) || $config !== $context['config']) {
                 return false;
             }
 
             $baseClass = $class;
             unset($baseClass['fields']);
 
-            if (!isset($context['class']) || !is_array($context['class']) || $this->arrayEqual($baseClass, array_intersect_key($context['class'], $baseClass))) {
+            if (!isset($context['class']) || !\is_array($context['class']) || $this->arrayEqual($baseClass, array_intersect_key($context['class'], $baseClass))) {
                 return false;
             }
 
@@ -416,6 +415,6 @@ private function getContextMatcher(array $class)
 
     private function arrayEqual(array $a, array $b): bool
     {
-        return count($a) === count($b) && !array_diff($a, $b);
+        return \count($a) === \count($b) && !array_diff($a, $b);
     }
 }

tests/config/namespaces-prefix.yaml

@@ -0,0 +1,7 @@
+namespaces:
+  prefix: App\
+  entity: App\Entity
+types:
+  Person:
+    properties:
+      name: ~