fix: wrong namespace

AkrilliA · Jul 10, 2024 · 38ec100 · 38ec100
1 parent f4b912d
commit 38ec100
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/.github/FUNDING.yaml b/.github/FUNDING.yaml
@@ -0,0 +1 @@
+github: [akrillia]
diff --git a/src/NameResolver.php b/src/NameResolver.php
@@ -89,7 +89,7 @@ private function setNamespace(): void
     {
         if ($this->isGlobal()) {
             $this->namespace = sprintf(
-                'Support\\%s\\%s',
+                'Support\\%s%s',
                 $this->command->getType()->getNamespace(),
                 $this->directory ? '\\'.$this->directory : '',
             );

diff --git a/tests/Commands/MakeCastCommandTest.php b/tests/Commands/MakeCastCommandTest.php
@@ -14,8 +14,8 @@ public function testCanMakeCast(): void
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Support\\Casts', $contents);
+        $this->assertClassName('TimezoneCast', $contents);
     }
 
     public function testCanMakeCastUsingForce(): void
@@ -26,8 +26,8 @@ public function testCanMakeCastUsingForce(): void
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Support\\Casts', $contents);
+        $this->assertClassName('TimezoneCast', $contents);
 
         $code = $this->artisan('beyond:make:cast TimezoneCast --force');
 

diff --git a/tests/Commands/MakeRuleCommandTest.php b/tests/Commands/MakeRuleCommandTest.php
@@ -8,26 +8,26 @@ class MakeRuleCommandTest extends TestCase
 {
     public function testCanMakeRule(): void
     {
-        $this->artisan('beyond:make:rule User.UniqueUser');
+        $this->artisan('beyond:make:rule UniqueUser');
 
         $file = beyond_support_path('Rules/UniqueUser.php');
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Support\\Rules', $contents);
+        $this->assertClassName('UniqueUser', $contents);
     }
 
     public function testCanMakeRuleUsingForce(): void
     {
-        $this->artisan('beyond:make:rule User.User/UniqueUser');
+        $this->artisan('beyond:make:rule User/UniqueUser');
 
         $file = beyond_support_path('Rules/User/UniqueUser.php');
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Support\\Rules\\User', $contents);
+        $this->assertClassName('UniqueUser', $contents);
 
         $code = $this->artisan('beyond:make:rule User/UniqueUser --force');
 

diff --git a/tests/Commands/MakeScopeCommandTest.php b/tests/Commands/MakeScopeCommandTest.php
@@ -14,8 +14,8 @@ public function testCanMakeScope(): void
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Domain\\User\\Scopes', $contents);
+        $this->assertClassName('ActiveScope', $contents);
     }
 
     public function testCanMakeScopeUsingForce(): void
@@ -26,8 +26,8 @@ public function testCanMakeScopeUsingForce(): void
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ namespace }}', $contents);
-        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertNamespace('Domain\\User\\Scopes', $contents);
+        $this->assertClassName('ActiveScope', $contents);
 
         $code = $this->artisan('beyond:make:scope User.ActiveScope --force');
 

diff --git a/tests/Commands/MakeServiceProviderCommandTest.php b/tests/Commands/MakeServiceProviderCommandTest.php
@@ -14,7 +14,8 @@ public function testCanMakeProvider(): void
         $contents = file_get_contents($file);
 
         $this->assertFileExists($file);
-        $this->assertStringNotContainsString('{{ module }}', $contents);
+        $this->assertNamespace('Support\\Providers', $contents);
+        $this->assertClassName('UserServiceProvider', $contents);
     }
 
     public function testCanMakeProviderUsingForce(): void

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -46,4 +46,16 @@ private function removeDirectory(string $directory): void
         closedir($handle);
         rmdir($directory);
     }
+
+    protected function assertNamespace(string $namespace, string $contents): void
+    {
+        $this->assertStringNotContainsString('{{ namespace }}', $contents);
+        $this->assertStringContainsString("namespace {$namespace};", $contents);
+    }
+
+    protected function assertClassName(string $className, string $contents): void
+    {
+        $this->assertStringNotContainsString('{{ className }}', $contents);
+        $this->assertStringContainsString("class {$className}", $contents);
+    }
 }