Update Simple Controller stub code

Using laravel 5.5 request object validation

src/stubs/controller.simple.stub

@@ -36,12 +36,10 @@ class MastersController extends Controller
     {
         $this->authorize('create', new Master);
 
-        $this->validate($request, [
-            'name' => 'required|max:60',
+        $newMaster = $request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        $newMaster = $request->only('name', 'description');
         $newMaster['creator_id'] = auth()->id();
 
         Master::create($newMaster);
@@ -60,15 +58,14 @@ class MastersController extends Controller
     {
         $this->authorize('update', $singleMstr);
 
-        $this->validate($request, [
-            'name' => 'required|max:60',
+        $singleMstrData = $request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
+        $singleMstr->update($singleMstrData);
 
         $routeParam = request()->only('page', 'q');
 
-        $singleMstr->update($request->only('name', 'description'));
-
         return redirect()->route('masters.index', $routeParam);
     }
 
@@ -82,13 +79,13 @@ class MastersController extends Controller
     {
         $this->authorize('delete', $singleMstr);
 
-        $this->validate(request(), [
+        request()->validate([
             'master_id' => 'required',
         ]);
 
-        $routeParam = request()->only('page', 'q');
-
         if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
+            $routeParam = request()->only('page', 'q');
+
             return redirect()->route('masters.index', $routeParam);
         }
 

tests/Generators/Simple/SimpleControllerGeneratorTest.php

@@ -50,12 +50,10 @@ class {$this->plural_model_name}Controller extends Controller
     {
         \$this->authorize('create', new {$this->model_name});
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \$new{$this->model_name} = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        \$new{$this->model_name} = \$request->only('name', 'description');
         \$new{$this->model_name}['creator_id'] = auth()->id();
 
         {$this->model_name}::create(\$new{$this->model_name});
@@ -74,15 +72,14 @@ class {$this->plural_model_name}Controller extends Controller
     {
         \$this->authorize('update', \${$this->single_model_var_name});
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \${$this->single_model_var_name}Data = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
+        \${$this->single_model_var_name}->update(\${$this->single_model_var_name}Data);
 
         \$routeParam = request()->only('page', 'q');
 
-        \${$this->single_model_var_name}->update(\$request->only('name', 'description'));
-
         return redirect()->route('{$this->table_name}.index', \$routeParam);
     }
 
@@ -96,13 +93,13 @@ class {$this->plural_model_name}Controller extends Controller
     {
         \$this->authorize('delete', \${$this->single_model_var_name});
 
-        \$this->validate(request(), [
+        request()->validate([
             '{$this->lang_name}_id' => 'required',
         ]);
 
-        \$routeParam = request()->only('page', 'q');
-
         if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
+            \$routeParam = request()->only('page', 'q');
+
             return redirect()->route('{$this->table_name}.index', \$routeParam);
         }
 
@@ -157,12 +154,10 @@ class CategoriesController extends Controller
     {
         \$this->authorize('create', new Category);
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \$newCategory = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        \$newCategory = \$request->only('name', 'description');
         \$newCategory['creator_id'] = auth()->id();
 
         Category::create(\$newCategory);
@@ -181,15 +176,14 @@ class CategoriesController extends Controller
     {
         \$this->authorize('update', \$category);
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \$categoryData = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
+        \$category->update(\$categoryData);
 
         \$routeParam = request()->only('page', 'q');
 
-        \$category->update(\$request->only('name', 'description'));
-
         return redirect()->route('categories.index', \$routeParam);
     }
 
@@ -203,13 +197,13 @@ class CategoriesController extends Controller
     {
         \$this->authorize('delete', \$category);
 
-        \$this->validate(request(), [
+        request()->validate([
             'category_id' => 'required',
         ]);
 
-        \$routeParam = request()->only('page', 'q');
-
         if (request('category_id') == \$category->id && \$category->delete()) {
+            \$routeParam = request()->only('page', 'q');
+
             return redirect()->route('categories.index', \$routeParam);
         }
 
@@ -265,12 +259,10 @@ class CategoriesController extends Controller
     {
         \$this->authorize('create', new Category);
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \$newCategory = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        \$newCategory = \$request->only('name', 'description');
         \$newCategory['creator_id'] = auth()->id();
 
         Category::create(\$newCategory);
@@ -289,15 +281,14 @@ class CategoriesController extends Controller
     {
         \$this->authorize('update', \$category);
 
-        \$this->validate(\$request, [
-            'name' => 'required|max:60',
+        \$categoryData = \$request->validate([
+            'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
+        \$category->update(\$categoryData);
 
         \$routeParam = request()->only('page', 'q');
 
-        \$category->update(\$request->only('name', 'description'));
-
         return redirect()->route('categories.index', \$routeParam);
     }
 
@@ -311,13 +302,13 @@ class CategoriesController extends Controller
     {
         \$this->authorize('delete', \$category);
 
-        \$this->validate(request(), [
+        request()->validate([
             'category_id' => 'required',
         ]);
 
-        \$routeParam = request()->only('page', 'q');
-
         if (request('category_id') == \$category->id && \$category->delete()) {
+            \$routeParam = request()->only('page', 'q');
+
             return redirect()->route('categories.index', \$routeParam);
         }