From 0842a88f0f7d0478ed6de4d0df6fee0e2695f9ab Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 15 Nov 2018 15:28:15 +0800
Subject: [PATCH 1/2] Update stubs to inject request class on destroy action

---
 src/stubs/controllers/api.stub               | 9 ++++-----
 src/stubs/controllers/full-formrequests.stub | 9 ++++-----
 src/stubs/controllers/full.stub              | 9 ++++-----
 src/stubs/controllers/simple.stub            | 9 ++++-----
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/stubs/controllers/api.stub b/src/stubs/controllers/api.stub
index 39918f3..256d02f 100644
--- a/src/stubs/controllers/api.stub
+++ b/src/stubs/controllers/api.stub
@@ -83,18 +83,17 @@ class MasterController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  \fullMstr  $singleMstr
      * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy(Master $singleMstr)
+    public function destroy(Request $request, Master $singleMstr)
     {
         $this->authorize('delete', $singleMstr);
 
-        request()->validate([
-            'master_id' => 'required',
-        ]);
+        $request->validate(['master_id' => 'required']);
 
-        if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
+        if ($request->get('master_id') == $singleMstr->id && $singleMstr->delete()) {
             return response()->json(['message' => __('master.deleted')]);
         }
 
diff --git a/src/stubs/controllers/full-formrequests.stub b/src/stubs/controllers/full-formrequests.stub
index f6fba24..31ddce3 100644
--- a/src/stubs/controllers/full-formrequests.stub
+++ b/src/stubs/controllers/full-formrequests.stub
@@ -89,18 +89,17 @@ class MasterController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  \fullMstr  $singleMstr
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Master $singleMstr)
+    public function destroy(Request $request, Master $singleMstr)
     {
         $this->authorize('delete', $singleMstr);
 
-        request()->validate([
-            'master_id' => 'required',
-        ]);
+        $request->validate(['master_id' => 'required']);
 
-        if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
+        if ($request->get('master_id') == $singleMstr->id && $singleMstr->delete()) {
             return redirect()->route('masters.index');
         }
 
diff --git a/src/stubs/controllers/full.stub b/src/stubs/controllers/full.stub
index 03aaff6..37424b7 100644
--- a/src/stubs/controllers/full.stub
+++ b/src/stubs/controllers/full.stub
@@ -101,18 +101,17 @@ class MasterController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  \fullMstr  $singleMstr
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Master $singleMstr)
+    public function destroy(Request $request, Master $singleMstr)
     {
         $this->authorize('delete', $singleMstr);
 
-        request()->validate([
-            'master_id' => 'required',
-        ]);
+        $request->validate(['master_id' => 'required']);
 
-        if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
+        if ($request->get('master_id') == $singleMstr->id && $singleMstr->delete()) {
             return redirect()->route('masters.index');
         }
 
diff --git a/src/stubs/controllers/simple.stub b/src/stubs/controllers/simple.stub
index 8815a8c..ecb92e4 100644
--- a/src/stubs/controllers/simple.stub
+++ b/src/stubs/controllers/simple.stub
@@ -72,18 +72,17 @@ class MasterController extends Controller
     /**
      * Remove the specified singleMstr from storage.
      *
+     * @param  \Illuminate\Http\Request  $request
      * @param  \fullMstr  $singleMstr
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Master $singleMstr)
+    public function destroy(Request $request, Master $singleMstr)
     {
         $this->authorize('delete', $singleMstr);
 
-        request()->validate([
-            'master_id' => 'required',
-        ]);
+        $request->validate(['master_id' => 'required']);
 
-        if (request('master_id') == $singleMstr->id && $singleMstr->delete()) {
+        if ($request->get('master_id') == $singleMstr->id && $singleMstr->delete()) {
             $routeParam = request()->only('page', 'q');
 
             return redirect()->route('masters.index', $routeParam);

From 064b97ef663fa18f18dc75b10fba9fad08cbd9bb Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Thu, 15 Nov 2018 17:31:55 +0800
Subject: [PATCH 2/2] Update tests for new controller stubs update

---
 .../FullCrudFormRequestOptionsTest.php             |  9 ++++----
 .../Generators/Api/ApiControllerGeneratorTest.php  |  9 ++++----
 tests/Generators/FullControllerGeneratorTest.php   | 27 ++++++++++------------
 .../Simple/SimpleControllerGeneratorTest.php       | 27 ++++++++++------------
 4 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/tests/CommandOptions/FullCrudFormRequestOptionsTest.php b/tests/CommandOptions/FullCrudFormRequestOptionsTest.php
index 905ab6e..4cac918 100644
--- a/tests/CommandOptions/FullCrudFormRequestOptionsTest.php
+++ b/tests/CommandOptions/FullCrudFormRequestOptionsTest.php
@@ -134,18 +134,17 @@ class {$this->model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy({$this->model_name} \${$this->single_model_var_name})
+    public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
     {
         \$this->authorize('delete', \${$this->single_model_var_name});
 
-        request()->validate([
-            '{$this->lang_name}_id' => 'required',
-        ]);
+        \$request->validate(['{$this->lang_name}_id' => 'required']);
 
-        if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
+        if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
             return redirect()->route('{$this->table_name}.index');
         }
 
diff --git a/tests/Generators/Api/ApiControllerGeneratorTest.php b/tests/Generators/Api/ApiControllerGeneratorTest.php
index bb0a17f..a55e5d8 100644
--- a/tests/Generators/Api/ApiControllerGeneratorTest.php
+++ b/tests/Generators/Api/ApiControllerGeneratorTest.php
@@ -97,18 +97,17 @@ class {$this->model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
      * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy({$this->model_name} \${$this->single_model_var_name})
+    public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
     {
         \$this->authorize('delete', \${$this->single_model_var_name});
 
-        request()->validate([
-            '{$this->lang_name}_id' => 'required',
-        ]);
+        \$request->validate(['{$this->lang_name}_id' => 'required']);
 
-        if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
+        if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
             return response()->json(['message' => __('{$this->lang_name}.deleted')]);
         }
 
diff --git a/tests/Generators/FullControllerGeneratorTest.php b/tests/Generators/FullControllerGeneratorTest.php
index 2e25af5..0d807dc 100644
--- a/tests/Generators/FullControllerGeneratorTest.php
+++ b/tests/Generators/FullControllerGeneratorTest.php
@@ -115,18 +115,17 @@ class {$this->model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy({$this->model_name} \${$this->single_model_var_name})
+    public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
     {
         \$this->authorize('delete', \${$this->single_model_var_name});
 
-        request()->validate([
-            '{$this->lang_name}_id' => 'required',
-        ]);
+        \$request->validate(['{$this->lang_name}_id' => 'required']);
 
-        if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
+        if (\$request->get('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
             return redirect()->route('{$this->table_name}.index');
         }
 
@@ -246,18 +245,17 @@ class CategoryController extends Controller
     /**
      * Remove the specified category from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \App\Entities\References\Category  \$category
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Category \$category)
+    public function destroy(Request \$request, Category \$category)
     {
         \$this->authorize('delete', \$category);
 
-        request()->validate([
-            'category_id' => 'required',
-        ]);
+        \$request->validate(['category_id' => 'required']);
 
-        if (request('category_id') == \$category->id && \$category->delete()) {
+        if (\$request->get('category_id') == \$category->id && \$category->delete()) {
             return redirect()->route('categories.index');
         }
 
@@ -378,18 +376,17 @@ class CategoryController extends Controller
     /**
      * Remove the specified category from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \App\Entities\References\Category  \$category
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Category \$category)
+    public function destroy(Request \$request, Category \$category)
     {
         \$this->authorize('delete', \$category);
 
-        request()->validate([
-            'category_id' => 'required',
-        ]);
+        \$request->validate(['category_id' => 'required']);
 
-        if (request('category_id') == \$category->id && \$category->delete()) {
+        if (\$request->get('category_id') == \$category->id && \$category->delete()) {
             return redirect()->route('categories.index');
         }
 
diff --git a/tests/Generators/Simple/SimpleControllerGeneratorTest.php b/tests/Generators/Simple/SimpleControllerGeneratorTest.php
index 7719b74..677ce4f 100644
--- a/tests/Generators/Simple/SimpleControllerGeneratorTest.php
+++ b/tests/Generators/Simple/SimpleControllerGeneratorTest.php
@@ -86,18 +86,17 @@ class {$this->model_name}Controller extends Controller
     /**
      * Remove the specified {$this->single_model_var_name} from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \\{$this->full_model_name}  \${$this->single_model_var_name}
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy({$this->model_name} \${$this->single_model_var_name})
+    public function destroy(Request \$request, {$this->model_name} \${$this->single_model_var_name})
     {
         \$this->authorize('delete', \${$this->single_model_var_name});
 
-        request()->validate([
-            '{$this->lang_name}_id' => 'required',
-        ]);
+        \$request->validate(['{$this->lang_name}_id' => 'required']);
 
-        if (request('{$this->lang_name}_id') == \${$this->single_model_var_name}->id && \${$this->single_model_var_name}->delete()) {
+        if (\$request->get('{$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);
@@ -190,18 +189,17 @@ class CategoryController extends Controller
     /**
      * Remove the specified category from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \App\Entities\References\Category  \$category
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Category \$category)
+    public function destroy(Request \$request, Category \$category)
     {
         \$this->authorize('delete', \$category);
 
-        request()->validate([
-            'category_id' => 'required',
-        ]);
+        \$request->validate(['category_id' => 'required']);
 
-        if (request('category_id') == \$category->id && \$category->delete()) {
+        if (\$request->get('category_id') == \$category->id && \$category->delete()) {
             \$routeParam = request()->only('page', 'q');
 
             return redirect()->route('categories.index', \$routeParam);
@@ -295,18 +293,17 @@ class CategoryController extends Controller
     /**
      * Remove the specified category from storage.
      *
+     * @param  \Illuminate\Http\Request  \$request
      * @param  \App\Entities\References\Category  \$category
      * @return \Illuminate\Routing\Redirector
      */
-    public function destroy(Category \$category)
+    public function destroy(Request \$request, Category \$category)
     {
         \$this->authorize('delete', \$category);
 
-        request()->validate([
-            'category_id' => 'required',
-        ]);
+        \$request->validate(['category_id' => 'required']);
 
-        if (request('category_id') == \$category->id && \$category->delete()) {
+        if (\$request->get('category_id') == \$category->id && \$category->delete()) {
             \$routeParam = request()->only('page', 'q');
 
             return redirect()->route('categories.index', \$routeParam);