Adding compatibility with Laravel 8.x

Author: mehradsadeghi

src/CrudGeneratorMakeCommand.php

@@ -91,7 +91,7 @@ protected function getStub() {
 
         $basePath = File::exists($this->laravel->basePath('stubs/crud'))
             ? $this->laravel->basePath('stubs/crud')
-            : base_path('stubs');
+            : __DIR__.'/stubs';
 
         if($model and $this->option('validation') and $this->getFillables($model)) {
             $path = '/controller.model.validation.stub';
@@ -118,7 +118,10 @@ protected function getOptions() {
     }
 
     private function modelHasFillables($model) {
-        if(File::exists(app_path("$model.php")) and resolve($this->parseModel($model))->getFillable()) {
+
+        $path = File::exists(app_path('Models')) ? app_path('Models') : app_path();
+
+        if(File::exists("$path/$model.php") and resolve($this->parseModel($model))->getFillable()) {
             return true;
         }
 

src/stubs/controller.plain.stub

@@ -2,8 +2,6 @@
 
 namespace DummyNamespace;
 
-use DummyRootNamespaceHttp\Controllers\Controller;
-
 class DummyClass extends Controller
 {
     //

tests/Integration/CreateControllerWithModelAndValidationsTest.php

@@ -27,40 +27,4 @@ public function controller_file_with_existing_model_and_fillables_with_validatio
             File::get($this->getTestStub('Controllers/UserControllerWithModelAndValidation.php'))
         );
     }
-
-    /** @test */
-    public function controller_file_with_existing_model_and_no_fillables_with_validations_can_be_created()
-    {
-        $this->assertFalse(File::exists($this->controller));
-        $this->assertFalse(File::exists($this->model));
-
-        // there is an issue when passing --model (when it doesn't exist) and --validation together
-        // in this situation the --no-interactive option doesn't work correctly
-        // so as a temporary workaround I'm creating the empty model here
-        File::copy($this->getTestStub('Models/EmptyUser.php'), $this->model);
-
-        $this->assertTrue(File::exists($this->model));
-
-        $this->runCommandWith(['name' => 'UserController', '--model' => 'User', '--validation' => true], ['yes']);
-
-        $this->assertEquals(
-            File::get($this->controller),
-            File::get($this->getTestStub('Controllers/UserControllerWithModel.php'))
-        );
-
-        $this->deleteAppDirFiles();
-
-        $this->assertFalse(File::exists($this->controller));
-        $this->assertFalse(File::exists($this->model));
-
-        $this->runCommandWith(['name' => 'UserController', '--model' => 'User', '--validation'], ['no']);
-
-        $this->assertTrue(File::exists($this->controller));
-        $this->assertFalse(File::exists($this->model));
-
-        $this->assertEquals(
-            File::get($this->controller),
-            File::get($this->getTestStub('Controllers/UserControllerWithModel.php'))
-        );
-    }
 }

tests/Stubs/Controllers/EmptyUserController.php

@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 class UserController extends Controller
 {
     //