Merge pull request #207 from Laravel-Backpack/do-not-use-request-if-n…

…o-request-validation-set

Do not use request if no request validation set

src/Console/Commands/CrudBackpackCommand.php

@@ -73,7 +73,7 @@ public function handle()
  ]);
 
  // if the application uses cached routes, we should rebuild the cache so the previous added route will
- // be acessible without manually clearing the route cache.
+ // be accessible without manually clearing the route cache.
  if (app()->routesAreCached()) {
  $this->call('route:cache');
  }

src/Console/Commands/CrudControllerBackpackCommand.php

@@ -226,6 +226,13 @@ protected function replaceRequest(&$stub)
  $stub = str_replace(' CRUD::setValidation(DummyClassRequest::class);'.PHP_EOL, '', $stub);
  }
 
+ if ($validation !== 'request') {
+ $stub = str_replace('use App\Http\Requests\DummyModelClassRequest;', '', $stub);
+ } else {
+ // add a new line after the use statement
+ $stub = str_replace('use App\Http\Requests\DummyModelClassRequest;', "use App\Http\Requests\DummyModelClassRequest;\n", $stub);
+ }
+
  return $this;
  }
 

src/Console/stubs/crud-controller.stub

@@ -2,10 +2,9 @@
 
 namespace DummyNamespace;
 
-use App\Http\Requests\DummyModelClassRequest;
 use Backpack\CRUD\app\Http\Controllers\CrudController;
 use Backpack\CRUD\app\Library\CrudPanel\CrudPanelFacade as CRUD;
-
+use App\Http\Requests\DummyModelClassRequest;
 /**
  * Class DummyClassCrudController
  * @package App\Http\Controllers\Admin