diff --git a/src/stubs/controller.api.stub b/src/stubs/controller.api.stub index c532bae..4aac96c 100644 --- a/src/stubs/controller.api.stub +++ b/src/stubs/controller.api.stub @@ -11,7 +11,7 @@ class MastersController extends Controller /** * Get a listing of the singleMstr. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function index() { @@ -25,16 +25,15 @@ class MastersController extends Controller /** * Store a newly created singleMstr in storage. * - * @param \Illuminate\Http\Request $request - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\JsonResponse */ public function store(Request $request) { $this->authorize('create', new Master); - $this->validate($request, [ - 'name' => 'required|max:60', + $request->validate([ + 'name' => 'required|max:60', 'description' => 'nullable|max:255', ]); @@ -52,9 +51,8 @@ class MastersController extends Controller /** * Get the specified singleMstr. * - * @param \App\Master $singleMstr - * - * @return \Illuminate\Http\Response + * @param \fullMstr $singleMstr + * @return \Illuminate\Http\JsonResponse */ public function show(Master $singleMstr) { @@ -64,17 +62,16 @@ class MastersController extends Controller /** * Update the specified singleMstr in storage. * - * @param \Illuminate\Http\Request $request - * @param \fullMstr $singleMstr - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request $request + * @param \fullMstr $singleMstr + * @return \Illuminate\Http\JsonResponse */ public function update(Request $request, Master $singleMstr) { $this->authorize('update', $singleMstr); - $this->validate($request, [ - 'name' => 'required|max:60', + $request->validate([ + 'name' => 'required|max:60', 'description' => 'nullable|max:255', ]); @@ -89,15 +86,14 @@ class MastersController extends Controller /** * Remove the specified singleMstr from storage. * - * @param \fullMstr $singleMstr - * - * @return \Illuminate\Http\Response + * @param \fullMstr $singleMstr + * @return \Illuminate\Http\JsonResponse */ public function destroy(Master $singleMstr) { $this->authorize('delete', $singleMstr); - $this->validate(request(), [ + request()->validate([ 'master_id' => 'required', ]); diff --git a/tests/Generators/Api/ApiControllerGeneratorTest.php b/tests/Generators/Api/ApiControllerGeneratorTest.php index ccd87a9..c05c289 100644 --- a/tests/Generators/Api/ApiControllerGeneratorTest.php +++ b/tests/Generators/Api/ApiControllerGeneratorTest.php @@ -25,7 +25,7 @@ class {$this->plural_model_name}Controller extends Controller /** * Get a listing of the {$this->single_model_var_name}. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function index() { @@ -39,16 +39,15 @@ class {$this->plural_model_name}Controller extends Controller /** * Store a newly created {$this->single_model_var_name} in storage. * - * @param \Illuminate\Http\Request \$request - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request \$request + * @return \Illuminate\Http\JsonResponse */ public function store(Request \$request) { \$this->authorize('create', new {$this->model_name}); - \$this->validate(\$request, [ - 'name' => 'required|max:60', + \$request->validate([ + 'name' => 'required|max:60', 'description' => 'nullable|max:255', ]); @@ -66,9 +65,8 @@ class {$this->plural_model_name}Controller extends Controller /** * Get the specified {$this->single_model_var_name}. * - * @param \\{$this->full_model_name} \${$this->single_model_var_name} - * - * @return \Illuminate\Http\Response + * @param \\{$this->full_model_name} \${$this->single_model_var_name} + * @return \Illuminate\Http\JsonResponse */ public function show({$this->model_name} \${$this->single_model_var_name}) { @@ -78,17 +76,16 @@ class {$this->plural_model_name}Controller extends Controller /** * Update the specified {$this->single_model_var_name} in storage. * - * @param \Illuminate\Http\Request \$request - * @param \\{$this->full_model_name} \${$this->single_model_var_name} - * - * @return \Illuminate\Http\Response + * @param \Illuminate\Http\Request \$request + * @param \\{$this->full_model_name} \${$this->single_model_var_name} + * @return \Illuminate\Http\JsonResponse */ public function update(Request \$request, {$this->model_name} \${$this->single_model_var_name}) { \$this->authorize('update', \${$this->single_model_var_name}); - \$this->validate(\$request, [ - 'name' => 'required|max:60', + \$request->validate([ + 'name' => 'required|max:60', 'description' => 'nullable|max:255', ]); @@ -103,15 +100,14 @@ class {$this->plural_model_name}Controller extends Controller /** * Remove the specified {$this->single_model_var_name} from storage. * - * @param \\{$this->full_model_name} \${$this->single_model_var_name} - * - * @return \Illuminate\Http\Response + * @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}) { \$this->authorize('delete', \${$this->single_model_var_name}); - \$this->validate(request(), [ + request()->validate([ '{$this->lang_name}_id' => 'required', ]);