From 05d9e6af2b8f63d4c1bf8815661927442c6a3cdb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 12 Jul 2018 10:58:06 +0800
Subject: [PATCH] Update API Controller stub code

Using laravel 5.5 request object validation
---
 src/stubs/controller.api.stub                       | 9 +++------
 tests/Generators/Api/ApiControllerGeneratorTest.php | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/stubs/controller.api.stub b/src/stubs/controller.api.stub
index 4aac96c..c5daf8a 100644
--- a/src/stubs/controller.api.stub
+++ b/src/stubs/controller.api.stub
@@ -32,12 +32,10 @@ class MastersController extends Controller
     {
         $this->authorize('create', new Master);
 
-        $request->validate([
+        $newMaster = $request->validate([
             'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        $newMaster = $request->only('name', 'description');
         $newMaster['creator_id'] = auth()->id();
 
         $singleMstr = Master::create($newMaster);
@@ -70,12 +68,11 @@ class MastersController extends Controller
     {
         $this->authorize('update', $singleMstr);
 
-        $request->validate([
+        $singleMstrData = $request->validate([
             'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        $singleMstr->update($request->only('name', 'description'));
+        $singleMstr->update($singleMstrData);
 
         return response()->json([
             'message' => __('master.updated'),
diff --git a/tests/Generators/Api/ApiControllerGeneratorTest.php b/tests/Generators/Api/ApiControllerGeneratorTest.php
index c05c289..f4c50e5 100644
--- a/tests/Generators/Api/ApiControllerGeneratorTest.php
+++ b/tests/Generators/Api/ApiControllerGeneratorTest.php
@@ -46,12 +46,10 @@ class {$this->plural_model_name}Controller extends Controller
     {
         \$this->authorize('create', new {$this->model_name});
 
-        \$request->validate([
+        \$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->single_model_var_name} = {$this->model_name}::create(\$new{$this->model_name});
@@ -84,12 +82,11 @@ class {$this->plural_model_name}Controller extends Controller
     {
         \$this->authorize('update', \${$this->single_model_var_name});
 
-        \$request->validate([
+        \${$this->single_model_var_name}Data = \$request->validate([
             'name'        => 'required|max:60',
             'description' => 'nullable|max:255',
         ]);
-
-        \${$this->single_model_var_name}->update(\$request->only('name', 'description'));
+        \${$this->single_model_var_name}->update(\${$this->single_model_var_name}Data);
 
         return response()->json([
             'message' => __('{$this->lang_name}.updated'),