From 0842a88f0f7d0478ed6de4d0df6fee0e2695f9ab Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 15 Nov 2018 15:28:15 +0800 Subject: [PATCH] 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);