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);