Use mixed return type on controller stubs (#46166)

* use mixed return type on controllers * remove types on controllers
laravel · Feb 19, 2023 · 8f91965 · 8f91965
1 parent 15f419f
commit 8f91965
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 63 deletions.
diff --git a/src/Illuminate/Routing/Console/stubs/controller.api.stub b/src/Illuminate/Routing/Console/stubs/controller.api.stub
@@ -4,46 +4,45 @@ namespace {{ namespace }};
 
 use {{ rootNamespace }}Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index()
     {
         //
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store(Request $request): Response
+    public function store(Request $request)
     {
         //
     }
 
     /**
      * Display the specified resource.
      */
-    public function show(string $id): Response
+    public function show(string $id)
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, string $id): Response
+    public function update(Request $request, string $id)
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(string $id): Response
+    public function destroy(string $id)
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.invokable.stub b/src/Illuminate/Routing/Console/stubs/controller.invokable.stub
@@ -4,14 +4,13 @@ namespace {{ namespace }};
 
 use {{ rootNamespace }}Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Handle the incoming request.
      */
-    public function __invoke(Request $request): Response
+    public function __invoke(Request $request)
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.model.api.stub b/src/Illuminate/Routing/Console/stubs/controller.model.api.stub
@@ -5,46 +5,45 @@ namespace {{ namespace }};
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
 use {{ namespacedRequests }}
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index()
     {
         //
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store({{ storeRequest }} $request): Response
+    public function store({{ storeRequest }} $request)
     {
         //
     }
 
     /**
      * Display the specified resource.
      */
-    public function show({{ model }} ${{ modelVariable }}): Response
+    public function show({{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }}): Response
+    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy({{ model }} ${{ modelVariable }}): Response
+    public function destroy({{ model }} ${{ modelVariable }})
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.model.stub b/src/Illuminate/Routing/Console/stubs/controller.model.stub
@@ -5,63 +5,61 @@ namespace {{ namespace }};
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
 use {{ namespacedRequests }}
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index(): Response
+    public function index()
     {
         //
     }
 
     /**
      * Show the form for creating a new resource.
      */
-    public function create(): Response
+    public function create()
     {
         //
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store({{ storeRequest }} $request): RedirectResponse
+    public function store({{ storeRequest }} $request)
     {
         //
     }
 
     /**
      * Display the specified resource.
      */
-    public function show({{ model }} ${{ modelVariable }}): Response
+    public function show({{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit({{ model }} ${{ modelVariable }}): Response
+    public function edit({{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }}): RedirectResponse
+    public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy({{ model }} ${{ modelVariable }}): RedirectResponse
+    public function destroy({{ model }} ${{ modelVariable }})
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub b/src/Illuminate/Routing/Console/stubs/controller.nested.api.stub
@@ -6,46 +6,45 @@ use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
 use {{ namespacedParentModel }};
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function index({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }}): Response
+    public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Display the specified resource.
      */
-    public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
+    public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
+    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
+    public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.nested.singleton.api.stub b/src/Illuminate/Routing/Console/stubs/controller.nested.singleton.api.stub
@@ -5,7 +5,6 @@ namespace {{ namespace }};
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use {{ namespacedParentModel }};
 
 class {{ class }} extends Controller
@@ -21,15 +20,15 @@ class {{ class }} extends Controller
     /**
      * Display the resource.
      */
-    public function show({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function show({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Update the resource in storage.
      */
-    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}): Response
+    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.nested.singleton.stub b/src/Illuminate/Routing/Console/stubs/controller.nested.singleton.stub
@@ -4,9 +4,7 @@ namespace {{ namespace }};
 
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use {{ namespacedParentModel }};
 
 class {{ class }} extends Controller
@@ -30,23 +28,23 @@ class {{ class }} extends Controller
     /**
      * Display the resource.
      */
-    public function show({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function show({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Show the form for editing the resource.
      */
-    public function edit({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function edit({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Update the resource in storage.
      */
-    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}): RedirectResponse
+    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }

diff --git a/src/Illuminate/Routing/Console/stubs/controller.nested.stub b/src/Illuminate/Routing/Console/stubs/controller.nested.stub
@@ -5,64 +5,62 @@ namespace {{ namespace }};
 use {{ namespacedModel }};
 use {{ rootNamespace }}Http\Controllers\Controller;
 use {{ namespacedParentModel }};
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class {{ class }} extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-    public function index({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function index({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Show the form for creating a new resource.
      */
-    public function create({{ parentModel }} ${{ parentModelVariable }}): Response
+    public function create({{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }}): RedirectResponse
+    public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }})
     {
         //
     }
 
     /**
      * Display the specified resource.
      */
-    public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
+    public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
+    public function edit({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): RedirectResponse
+    public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }
 
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): RedirectResponse
+    public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
     {
         //
     }