Merge pull request #346 from Litiano/master

Correct path if slug contains "-"
caffeinated · Feb 5, 2018 · 5294525 · 5294525
2 parents e72edab + e64d51c
commit 5294525
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/Console/GeneratorCommand.php b/src/Console/GeneratorCommand.php
@@ -40,9 +40,10 @@ protected function qualifyClass($name)
     protected function getPath($name)
     {
         $slug = $this->argument('slug');
+        $module = Module::where('slug', $slug);
 
         // take everything after the module name in the given path (ignoring case)
-        $key = array_search(strtolower($slug), explode('\\', strtolower($name)));
+        $key = array_search(strtolower($module['basename']), explode('\\', strtolower($name)));
         if ($key === false) {
             $newPath = str_replace('\\', '/', $name);
         } else {

diff --git a/src/Console/Generators/stubs/controller.resource.stub b/src/Console/Generators/stubs/controller.resource.stub
@@ -4,7 +4,6 @@ namespace DummyNamespace;
 
 use Illuminate\Http\Request;
 
-use DummyRootNamespaceHttp\Requests;
 use DummyRootNamespaceHttp\Controllers\Controller;
 
 class DummyClass extends Controller

diff --git a/src/Console/Generators/stubs/controller.stub b/src/Console/Generators/stubs/controller.stub
@@ -4,7 +4,6 @@ namespace DummyNamespace;
 
 use Illuminate\Http\Request;
 
-use DummyRootNamespaceHttp\Requests;
 use DummyRootNamespaceHttp\Controllers\Controller;
 
 class DummyClass extends Controller