refactor: enhance path and namespace handling in GeneratorPath class

Author: solomon-ochepa

src/Support/Config/GeneratorPath.php

@@ -6,7 +6,10 @@
 
 class GeneratorPath
 {
-    use PathNamespace;
+    use PathNamespace {
+        path as __path;
+        namespace as __namespace;
+    }
 
     private $path;
 
@@ -17,30 +20,52 @@ class GeneratorPath
     public function __construct($config)
     {
         if (is_array($config)) {
-            $this->path = $this->path($config['path']);
-            $this->namespace = $config['namespace'] ?? $this->namespace($config['path']);
+            $this->path = $this->__path($config['path']);
+            $this->namespace = $config['namespace'] ?? $this->__namespace($config['path']);
             $this->generate = $config['generate'];
 
             return;
         }
 
-        $this->path = $this->path($config ?? '');
-        $this->namespace = $this->namespace($config ?? '');
+        $this->path = $this->__path($config ?? '');
+        $this->namespace = $this->__namespace($config ?? '');
         $this->generate = (bool) $config;
     }
 
+    /**
+     * @deprecated use path() instead
+     */
     public function getPath()
     {
         return $this->path;
     }
 
-    public function generate(): bool
+    /**
+     * Get the generator path.
+     */
+    public function path(string $path = ''): string
     {
-        return $this->generate;
+        return $this->__path($this->path.DIRECTORY_SEPARATOR.$path);
     }
 
+    /**
+     * @deprecated use namespace() instead
+     */
     public function getNamespace()
     {
-        return $this->namespace;
+        return $this->__namespace($this->namespace);
+    }
+
+    /**
+     * Get the generator namespace.
+     */
+    public function namespace(string $namespace = ''): string
+    {
+        return $this->__namespace($this->namespace.'\\'.$namespace);
+    }
+
+    public function generate(): bool
+    {
+        return $this->generate;
     }
 }

tests/Support/Config/GenerateConfigReaderTest.php

@@ -13,29 +13,29 @@ public function test_it_can_read_a_configuration_value_with_new_format()
         $seedConfig = GenerateConfigReader::read('seeder');
 
         $this->assertInstanceOf(GeneratorPath::class, $seedConfig);
-        $this->assertEquals('database/seeders', $seedConfig->getPath());
+        $this->assertEquals('database/seeders', $seedConfig->path());
         $this->assertTrue($seedConfig->generate());
     }
 
     public function test_it_can_read_a_configuration_value_with_new_format_set_to_false()
     {
-        $this->app['config']->set('modules.paths.generator.seeder', ['path' => 'Database/Seeders', 'generate' => false]);
+        $this->app['config']->set('modules.paths.generator.seeder', ['path' => 'database/seeders', 'generate' => false]);
 
         $seedConfig = GenerateConfigReader::read('seeder');
 
         $this->assertInstanceOf(GeneratorPath::class, $seedConfig);
-        $this->assertEquals('Database/Seeders', $seedConfig->getPath());
+        $this->assertEquals('database/seeders', $seedConfig->path());
         $this->assertFalse($seedConfig->generate());
     }
 
     public function test_it_can_read_a_configuration_value_with_old_format()
     {
-        $this->app['config']->set('modules.paths.generator.seeder', 'Database/Seeders');
+        $this->app['config']->set('modules.paths.generator.seeder', 'database/seeders');
 
         $seedConfig = GenerateConfigReader::read('seeder');
 
         $this->assertInstanceOf(GeneratorPath::class, $seedConfig);
-        $this->assertEquals('Database/Seeders', $seedConfig->getPath());
+        $this->assertEquals('database/seeders', $seedConfig->path());
         $this->assertTrue($seedConfig->generate());
     }
 
@@ -46,7 +46,7 @@ public function test_it_can_read_a_configuration_value_with_old_format_set_to_fa
         $seedConfig = GenerateConfigReader::read('seeder');
 
         $this->assertInstanceOf(GeneratorPath::class, $seedConfig);
-        $this->assertFalse($seedConfig->getPath());
+        $this->assertEmpty($seedConfig->path());
         $this->assertFalse($seedConfig->generate());
     }
 
@@ -56,7 +56,7 @@ public function test_it_can_guess_namespace_from_path()
 
         $config = GenerateConfigReader::read('provider');
 
-        $this->assertEquals('Base/Providers', $config->getPath());
-        $this->assertEquals('Base\Providers', $config->getNamespace());
+        $this->assertEquals('Base/Providers', $config->path());
+        $this->assertEquals('Base\Providers', $config->namespace());
     }
 }