Skip to content

Commit 8f91965

Browse files
authored
Use mixed return type on controller stubs (#46166)
* use mixed return type on controllers * remove types on controllers
1 parent 15f419f commit 8f91965

11 files changed

+47
-63
lines changed

src/Illuminate/Routing/Console/stubs/controller.api.stub

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,45 @@ namespace {{ namespace }};
44

55
use {{ rootNamespace }}Http\Controllers\Controller;
66
use Illuminate\Http\Request;
7-
use Illuminate\Http\Response;
87

98
class {{ class }} extends Controller
109
{
1110
/**
1211
* Display a listing of the resource.
1312
*/
14-
public function index(): Response
13+
public function index()
1514
{
1615
//
1716
}
1817

1918
/**
2019
* Store a newly created resource in storage.
2120
*/
22-
public function store(Request $request): Response
21+
public function store(Request $request)
2322
{
2423
//
2524
}
2625

2726
/**
2827
* Display the specified resource.
2928
*/
30-
public function show(string $id): Response
29+
public function show(string $id)
3130
{
3231
//
3332
}
3433

3534
/**
3635
* Update the specified resource in storage.
3736
*/
38-
public function update(Request $request, string $id): Response
37+
public function update(Request $request, string $id)
3938
{
4039
//
4140
}
4241

4342
/**
4443
* Remove the specified resource from storage.
4544
*/
46-
public function destroy(string $id): Response
45+
public function destroy(string $id)
4746
{
4847
//
4948
}

src/Illuminate/Routing/Console/stubs/controller.invokable.stub

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@ namespace {{ namespace }};
44

55
use {{ rootNamespace }}Http\Controllers\Controller;
66
use Illuminate\Http\Request;
7-
use Illuminate\Http\Response;
87

98
class {{ class }} extends Controller
109
{
1110
/**
1211
* Handle the incoming request.
1312
*/
14-
public function __invoke(Request $request): Response
13+
public function __invoke(Request $request)
1514
{
1615
//
1716
}

src/Illuminate/Routing/Console/stubs/controller.model.api.stub

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,45 @@ namespace {{ namespace }};
55
use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
77
use {{ namespacedRequests }}
8-
use Illuminate\Http\Response;
98

109
class {{ class }} extends Controller
1110
{
1211
/**
1312
* Display a listing of the resource.
1413
*/
15-
public function index(): Response
14+
public function index()
1615
{
1716
//
1817
}
1918

2019
/**
2120
* Store a newly created resource in storage.
2221
*/
23-
public function store({{ storeRequest }} $request): Response
22+
public function store({{ storeRequest }} $request)
2423
{
2524
//
2625
}
2726

2827
/**
2928
* Display the specified resource.
3029
*/
31-
public function show({{ model }} ${{ modelVariable }}): Response
30+
public function show({{ model }} ${{ modelVariable }})
3231
{
3332
//
3433
}
3534

3635
/**
3736
* Update the specified resource in storage.
3837
*/
39-
public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }}): Response
38+
public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
4039
{
4140
//
4241
}
4342

4443
/**
4544
* Remove the specified resource from storage.
4645
*/
47-
public function destroy({{ model }} ${{ modelVariable }}): Response
46+
public function destroy({{ model }} ${{ modelVariable }})
4847
{
4948
//
5049
}

src/Illuminate/Routing/Console/stubs/controller.model.stub

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,61 @@ namespace {{ namespace }};
55
use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
77
use {{ namespacedRequests }}
8-
use Illuminate\Http\RedirectResponse;
9-
use Illuminate\Http\Response;
108

119
class {{ class }} extends Controller
1210
{
1311
/**
1412
* Display a listing of the resource.
1513
*/
16-
public function index(): Response
14+
public function index()
1715
{
1816
//
1917
}
2018

2119
/**
2220
* Show the form for creating a new resource.
2321
*/
24-
public function create(): Response
22+
public function create()
2523
{
2624
//
2725
}
2826

2927
/**
3028
* Store a newly created resource in storage.
3129
*/
32-
public function store({{ storeRequest }} $request): RedirectResponse
30+
public function store({{ storeRequest }} $request)
3331
{
3432
//
3533
}
3634

3735
/**
3836
* Display the specified resource.
3937
*/
40-
public function show({{ model }} ${{ modelVariable }}): Response
38+
public function show({{ model }} ${{ modelVariable }})
4139
{
4240
//
4341
}
4442

4543
/**
4644
* Show the form for editing the specified resource.
4745
*/
48-
public function edit({{ model }} ${{ modelVariable }}): Response
46+
public function edit({{ model }} ${{ modelVariable }})
4947
{
5048
//
5149
}
5250

5351
/**
5452
* Update the specified resource in storage.
5553
*/
56-
public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }}): RedirectResponse
54+
public function update({{ updateRequest }} $request, {{ model }} ${{ modelVariable }})
5755
{
5856
//
5957
}
6058

6159
/**
6260
* Remove the specified resource from storage.
6361
*/
64-
public function destroy({{ model }} ${{ modelVariable }}): RedirectResponse
62+
public function destroy({{ model }} ${{ modelVariable }})
6563
{
6664
//
6765
}

src/Illuminate/Routing/Console/stubs/controller.nested.api.stub

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,45 @@ use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
77
use {{ namespacedParentModel }};
88
use Illuminate\Http\Request;
9-
use Illuminate\Http\Response;
109

1110
class {{ class }} extends Controller
1211
{
1312
/**
1413
* Display a listing of the resource.
1514
*/
16-
public function index({{ parentModel }} ${{ parentModelVariable }}): Response
15+
public function index({{ parentModel }} ${{ parentModelVariable }})
1716
{
1817
//
1918
}
2019

2120
/**
2221
* Store a newly created resource in storage.
2322
*/
24-
public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }}): Response
23+
public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }})
2524
{
2625
//
2726
}
2827

2928
/**
3029
* Display the specified resource.
3130
*/
32-
public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
31+
public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
3332
{
3433
//
3534
}
3635

3736
/**
3837
* Update the specified resource in storage.
3938
*/
40-
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
39+
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
4140
{
4241
//
4342
}
4443

4544
/**
4645
* Remove the specified resource from storage.
4746
*/
48-
public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
47+
public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
4948
{
5049
//
5150
}

src/Illuminate/Routing/Console/stubs/controller.nested.singleton.api.stub

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ namespace {{ namespace }};
55
use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
77
use Illuminate\Http\Request;
8-
use Illuminate\Http\Response;
98
use {{ namespacedParentModel }};
109

1110
class {{ class }} extends Controller
@@ -21,15 +20,15 @@ class {{ class }} extends Controller
2120
/**
2221
* Display the resource.
2322
*/
24-
public function show({{ parentModel }} ${{ parentModelVariable }}): Response
23+
public function show({{ parentModel }} ${{ parentModelVariable }})
2524
{
2625
//
2726
}
2827

2928
/**
3029
* Update the resource in storage.
3130
*/
32-
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}): Response
31+
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }})
3332
{
3433
//
3534
}

src/Illuminate/Routing/Console/stubs/controller.nested.singleton.stub

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ namespace {{ namespace }};
44

55
use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
7-
use Illuminate\Http\RedirectResponse;
87
use Illuminate\Http\Request;
9-
use Illuminate\Http\Response;
108
use {{ namespacedParentModel }};
119

1210
class {{ class }} extends Controller
@@ -30,23 +28,23 @@ class {{ class }} extends Controller
3028
/**
3129
* Display the resource.
3230
*/
33-
public function show({{ parentModel }} ${{ parentModelVariable }}): Response
31+
public function show({{ parentModel }} ${{ parentModelVariable }})
3432
{
3533
//
3634
}
3735

3836
/**
3937
* Show the form for editing the resource.
4038
*/
41-
public function edit({{ parentModel }} ${{ parentModelVariable }}): Response
39+
public function edit({{ parentModel }} ${{ parentModelVariable }})
4240
{
4341
//
4442
}
4543

4644
/**
4745
* Update the resource in storage.
4846
*/
49-
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}): RedirectResponse
47+
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }})
5048
{
5149
//
5250
}

src/Illuminate/Routing/Console/stubs/controller.nested.stub

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,62 @@ namespace {{ namespace }};
55
use {{ namespacedModel }};
66
use {{ rootNamespace }}Http\Controllers\Controller;
77
use {{ namespacedParentModel }};
8-
use Illuminate\Http\RedirectResponse;
98
use Illuminate\Http\Request;
10-
use Illuminate\Http\Response;
119

1210
class {{ class }} extends Controller
1311
{
1412
/**
1513
* Display a listing of the resource.
1614
*/
17-
public function index({{ parentModel }} ${{ parentModelVariable }}): Response
15+
public function index({{ parentModel }} ${{ parentModelVariable }})
1816
{
1917
//
2018
}
2119

2220
/**
2321
* Show the form for creating a new resource.
2422
*/
25-
public function create({{ parentModel }} ${{ parentModelVariable }}): Response
23+
public function create({{ parentModel }} ${{ parentModelVariable }})
2624
{
2725
//
2826
}
2927

3028
/**
3129
* Store a newly created resource in storage.
3230
*/
33-
public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }}): RedirectResponse
31+
public function store(Request $request, {{ parentModel }} ${{ parentModelVariable }})
3432
{
3533
//
3634
}
3735

3836
/**
3937
* Display the specified resource.
4038
*/
41-
public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
39+
public function show({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
4240
{
4341
//
4442
}
4543

4644
/**
4745
* Show the form for editing the specified resource.
4846
*/
49-
public function edit({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): Response
47+
public function edit({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
5048
{
5149
//
5250
}
5351

5452
/**
5553
* Update the specified resource in storage.
5654
*/
57-
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): RedirectResponse
55+
public function update(Request $request, {{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
5856
{
5957
//
6058
}
6159

6260
/**
6361
* Remove the specified resource from storage.
6462
*/
65-
public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }}): RedirectResponse
63+
public function destroy({{ parentModel }} ${{ parentModelVariable }}, {{ model }} ${{ modelVariable }})
6664
{
6765
//
6866
}

0 commit comments

Comments
 (0)