Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use mixed return type on controller stubs #46166

Merged
merged 2 commits into from
Feb 19, 2023
Merged

Use mixed return type on controller stubs #46166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4c1b9
use mixed return type on controllers
taylorotwell Feb 18, 2023
bd14c5a
remove types on controllers
taylorotwell Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/Illuminate/Routing/Console/stubs/controller.api.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
//
}
Expand Down
3 changes: 1 addition & 2 deletions src/Illuminate/Routing/Console/stubs/controller.invokable.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
//
}
Expand Down
11 changes: 5 additions & 6 deletions src/Illuminate/Routing/Console/stubs/controller.model.api.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
{
//
}
Expand Down
16 changes: 7 additions & 9 deletions src/Illuminate/Routing/Console/stubs/controller.model.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
{
//
}
Expand Down
11 changes: 5 additions & 6 deletions src/Illuminate/Routing/Console/stubs/controller.nested.api.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
{
//
}
Expand Down
5 changes: 2 additions & 3 deletions src/Illuminate/Routing/Console/stubs/controller.nested.singleton.api.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }})
{
//
}
Expand Down
8 changes: 3 additions & 5 deletions src/Illuminate/Routing/Console/stubs/controller.nested.singleton.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }})
{
//
}
Expand Down
16 changes: 7 additions & 9 deletions src/Illuminate/Routing/Console/stubs/controller.nested.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
{
//
}
Expand Down