Refacto

Author: 15g-lucas

src/Console/Commands/ActionCommand.php

@@ -44,7 +44,7 @@ public function handle()
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-action.stub');
+        return $this->resolveStubPath('/stubs/rest-action.stub');
     }
 
     /**

src/Console/Commands/BaseControllerCommand.php

@@ -56,7 +56,7 @@ public function handle()
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-base-controller.stub');
+        return $this->resolveStubPath('/stubs/rest-base-controller.stub');
     }
 
     /**

src/Console/Commands/BaseResourceCommand.php

@@ -46,7 +46,7 @@ class BaseResourceCommand extends GeneratorCommand implements PromptsForMissingI
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-base-resource.stub');
+        return $this->resolveStubPath('/stubs/rest-base-resource.stub');
     }
 
     /**

src/Console/Commands/ControllerCommand.php

@@ -91,7 +91,7 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-controller.stub');
+        return $this->resolveStubPath('/stubs/rest-controller.stub');
     }
 
     /**

src/Console/Commands/DocumentationProviderCommand.php

@@ -39,7 +39,7 @@ class DocumentationProviderCommand extends GeneratorCommand implements PromptsFo
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-documentation-service-provider.stub');
+        return $this->resolveStubPath('/stubs/rest-documentation-service-provider.stub');
     }
 
     /**

src/Console/Commands/InstructionCommand.php

@@ -61,7 +61,7 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-instruction.stub');
+        return $this->resolveStubPath('/stubs/rest-instruction.stub');
     }
 
     /**

src/Console/Commands/ResourceCommand.php

@@ -102,7 +102,7 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-resource.stub');
+        return $this->resolveStubPath('/stubs/rest-resource.stub');
     }
 
     /**

src/Console/Commands/ResponseCommand.php

@@ -62,7 +62,7 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        return $this->resolveStubPath('/stubs/rest/rest-response.stub');
+        return $this->resolveStubPath('/stubs/rest-response.stub');
     }
 
     /**

src/Console/ResolvesStubPath.php

@@ -13,19 +13,8 @@ trait ResolvesStubPath
      */
     protected function resolveStubPath(string $stub): string
     {
-        $customPath = str_replace('rest/', '', $stub);
-        $relativePath = ltrim($customPath, '/');
-
-        $publishedPath = base_path($relativePath);
-        if (file_exists($publishedPath)) {
-            return $publishedPath;
-        }
-
-        $baseStubPath = $this->laravel->basePath(trim($stub, '/'));
-        if (file_exists($baseStubPath)) {
-            return $baseStubPath;
-        }
-
-        return __DIR__ . '/../Console/stubs/' . basename($customPath);
+        return file_exists($customPath = $this->laravel->basePath(trim($stub, '/')))
+            ? $customPath
+            : __DIR__.$stub;
     }
 }