Merge pull request #43 from jdrieghe/main

Always use default ViewModels namespace as a prefix

Author: freekmurze

src/Console/ViewModelMakeCommand.php

@@ -30,10 +30,6 @@ protected function getStub()
 
     protected function getDefaultNamespace($rootNamespace)
     {
-        if ($this->isCustomNamespace()) {
-            return $rootNamespace;
-        }
-
         return $rootNamespace.'\ViewModels';
     }
 
@@ -43,9 +39,4 @@ protected function getOptions(): array
             ['force', null, InputOption::VALUE_NONE, 'Create the class even if the view-model already exists'],
         ];
     }
-
-    protected function isCustomNamespace(): bool
-    {
-        return Str::contains($this->argument('name'), '/');
-    }
 }

tests/ViewModelMakeCommandTest.php

@@ -42,13 +42,13 @@ public function it_can_create_a_view_model_with_a_custom_namespace()
 
         $this->assertStringContainsString('ViewModel created successfully.', Artisan::output());
 
-        $shouldOutputFilePath = $this->app['path'].'/Blog/PostsViewModel.php';
+        $shouldOutputFilePath = $this->app['path'].'/ViewModels/Blog/PostsViewModel.php';
 
         $this->assertTrue(File::exists($shouldOutputFilePath), 'File exists in custom app/Blog folder');
 
         $contents = File::get($shouldOutputFilePath);
 
-        $this->assertStringContainsString('namespace App\Blog;', $contents);
+        $this->assertStringContainsString('namespace App\ViewModels\Blog;', $contents);
 
         $this->assertStringContainsString('class PostsViewModel extends ViewModel', $contents);
     }