From a3cf74bb2dd6eafe722915e03e1d11d7672a86bd Mon Sep 17 00:00:00 2001 From: paranarimasu <33796518+paranarimasu@users.noreply.github.com> Date: Wed, 5 Apr 2023 16:29:54 -0500 Subject: [PATCH] refactor(api): remove redundant statements that convert API resources to response (#567) * refactor(api): remove redundant statements that convert API resources to response * style: fix StyleCI findigns --- .../Api/Admin/AnnouncementController.php | 51 +++++++------------ .../Controllers/Api/Admin/DumpController.php | 51 +++++++------------ .../User/Me/List/MyPlaylistController.php | 9 ++-- .../Api/Auth/User/Me/MyController.php | 9 ++-- .../Api/Billing/BalanceController.php | 51 +++++++------------ .../Api/Billing/TransactionController.php | 51 +++++++------------ .../Api/Billing/TransparencyController.php | 9 ++-- .../Api/Config/FlagsController.php | 9 ++-- .../Controllers/Api/Config/WikiController.php | 9 ++-- .../Api/Document/PageController.php | 51 +++++++------------ .../List/Playlist/TrackBackwardController.php | 9 ++-- .../Api/List/Playlist/TrackController.php | 51 +++++++------------ .../List/Playlist/TrackForwardController.php | 9 ++-- .../Api/List/PlaylistBackwardController.php | 9 ++-- .../Api/List/PlaylistController.php | 51 +++++++------------ .../Api/List/PlaylistForwardController.php | 9 ++-- .../Pivot/List/PlaylistImageController.php | 24 ++++----- .../Api/Pivot/Wiki/AnimeImageController.php | 24 ++++----- .../Pivot/Wiki/AnimeResourceController.php | 32 +++++------- .../Api/Pivot/Wiki/AnimeSeriesController.php | 24 ++++----- .../Api/Pivot/Wiki/AnimeStudioController.php | 24 ++++----- .../Wiki/AnimeThemeEntryVideoController.php | 24 ++++----- .../Api/Pivot/Wiki/ArtistImageController.php | 24 ++++----- .../Api/Pivot/Wiki/ArtistMemberController.php | 32 +++++------- .../Pivot/Wiki/ArtistResourceController.php | 32 +++++------- .../Api/Pivot/Wiki/ArtistSongController.php | 32 +++++------- .../Api/Pivot/Wiki/StudioImageController.php | 24 ++++----- .../Pivot/Wiki/StudioResourceController.php | 32 +++++------- app/Http/Controllers/Api/SearchController.php | 9 ++-- .../Api/Wiki/Anime/SynonymController.php | 51 +++++++------------ .../Api/Wiki/Anime/Theme/EntryController.php | 51 +++++++------------ .../Api/Wiki/Anime/ThemeController.php | 51 +++++++------------ .../Controllers/Api/Wiki/AnimeController.php | 51 +++++++------------ .../Controllers/Api/Wiki/ArtistController.php | 51 +++++++------------ .../Controllers/Api/Wiki/AudioController.php | 51 +++++++------------ .../Api/Wiki/ExternalResourceController.php | 51 +++++++------------ .../Controllers/Api/Wiki/ImageController.php | 51 +++++++------------ .../Controllers/Api/Wiki/SeriesController.php | 51 +++++++------------ .../Controllers/Api/Wiki/SongController.php | 51 +++++++------------ .../Controllers/Api/Wiki/StudioController.php | 51 +++++++------------ .../Api/Wiki/Video/ScriptController.php | 51 +++++++------------ .../Controllers/Api/Wiki/VideoController.php | 51 +++++++------------ 42 files changed, 513 insertions(+), 925 deletions(-) diff --git a/app/Http/Controllers/Api/Admin/AnnouncementController.php b/app/Http/Controllers/Api/Admin/AnnouncementController.php index 24fa58eaf..5f0cd91a6 100644 --- a/app/Http/Controllers/Api/Admin/AnnouncementController.php +++ b/app/Http/Controllers/Api/Admin/AnnouncementController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Admin\Collection\AnnouncementCollection; use App\Http\Resources\Admin\Resource\AnnouncementResource; use App\Models\Admin\Announcement; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class AnnouncementController. @@ -41,17 +40,15 @@ class AnnouncementController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnnouncementCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnnouncementCollection { $query = new Query($request->validated()); $announcements = $action->index(Announcement::query(), $query, $request->schema()); - $collection = new AnnouncementCollection($announcements, $query); - - return $collection->toResponse($request); + return new AnnouncementCollection($announcements, $query); } /** @@ -59,15 +56,13 @@ class AnnouncementController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return AnnouncementResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): AnnouncementResource { $announcement = $action->store(Announcement::query(), $request->validated()); - $resource = new AnnouncementResource($announcement, new Query()); - - return $resource->toResponse($request); + return new AnnouncementResource($announcement, new Query()); } /** @@ -76,17 +71,15 @@ class AnnouncementController extends BaseController * @param ShowRequest $request * @param Announcement $announcement * @param ShowAction $action - * @return JsonResponse + * @return AnnouncementResource */ - public function show(ShowRequest $request, Announcement $announcement, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Announcement $announcement, ShowAction $action): AnnouncementResource { $query = new Query($request->validated()); $show = $action->show($announcement, $query, $request->schema()); - $resource = new AnnouncementResource($show, $query); - - return $resource->toResponse($request); + return new AnnouncementResource($show, $query); } /** @@ -95,49 +88,41 @@ class AnnouncementController extends BaseController * @param UpdateRequest $request * @param Announcement $announcement * @param UpdateAction $action - * @return JsonResponse + * @return AnnouncementResource */ - public function update(UpdateRequest $request, Announcement $announcement, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Announcement $announcement, UpdateAction $action): AnnouncementResource { $updated = $action->update($announcement, $request->validated()); - $resource = new AnnouncementResource($updated, new Query()); - - return $resource->toResponse($request); + return new AnnouncementResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Announcement $announcement * @param DestroyAction $action - * @return JsonResponse + * @return AnnouncementResource */ - public function destroy(Request $request, Announcement $announcement, DestroyAction $action): JsonResponse + public function destroy(Announcement $announcement, DestroyAction $action): AnnouncementResource { $deleted = $action->destroy($announcement); - $resource = new AnnouncementResource($deleted, new Query()); - - return $resource->toResponse($request); + return new AnnouncementResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Announcement $announcement * @param RestoreAction $action - * @return JsonResponse + * @return AnnouncementResource */ - public function restore(Request $request, Announcement $announcement, RestoreAction $action): JsonResponse + public function restore(Announcement $announcement, RestoreAction $action): AnnouncementResource { $restored = $action->restore($announcement); - $resource = new AnnouncementResource($restored, new Query()); - - return $resource->toResponse($request); + return new AnnouncementResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Admin/DumpController.php b/app/Http/Controllers/Api/Admin/DumpController.php index 49a7ae176..d17460dd9 100644 --- a/app/Http/Controllers/Api/Admin/DumpController.php +++ b/app/Http/Controllers/Api/Admin/DumpController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Admin\Collection\DumpCollection; use App\Http\Resources\Admin\Resource\DumpResource; use App\Models\Admin\Dump; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class DumpController. @@ -41,17 +40,15 @@ class DumpController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return DumpCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): DumpCollection { $query = new Query($request->validated()); $dumps = $action->index(Dump::query(), $query, $request->schema()); - $collection = new DumpCollection($dumps, $query); - - return $collection->toResponse($request); + return new DumpCollection($dumps, $query); } /** @@ -59,15 +56,13 @@ class DumpController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return DumpResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): DumpResource { $dump = $action->store(Dump::query(), $request->validated()); - $resource = new DumpResource($dump, new Query()); - - return $resource->toResponse($request); + return new DumpResource($dump, new Query()); } /** @@ -76,17 +71,15 @@ class DumpController extends BaseController * @param ShowRequest $request * @param Dump $dump * @param ShowAction $action - * @return JsonResponse + * @return DumpResource */ - public function show(ShowRequest $request, Dump $dump, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Dump $dump, ShowAction $action): DumpResource { $query = new Query($request->validated()); $show = $action->show($dump, $query, $request->schema()); - $resource = new DumpResource($show, $query); - - return $resource->toResponse($request); + return new DumpResource($show, $query); } /** @@ -95,49 +88,41 @@ class DumpController extends BaseController * @param UpdateRequest $request * @param Dump $dump * @param UpdateAction $action - * @return JsonResponse + * @return DumpResource */ - public function update(UpdateRequest $request, Dump $dump, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Dump $dump, UpdateAction $action): DumpResource { $updated = $action->update($dump, $request->validated()); - $resource = new DumpResource($updated, new Query()); - - return $resource->toResponse($request); + return new DumpResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Dump $dump * @param DestroyAction $action - * @return JsonResponse + * @return DumpResource */ - public function destroy(Request $request, Dump $dump, DestroyAction $action): JsonResponse + public function destroy(Dump $dump, DestroyAction $action): DumpResource { $deleted = $action->destroy($dump); - $resource = new DumpResource($deleted, new Query()); - - return $resource->toResponse($request); + return new DumpResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Dump $dump * @param RestoreAction $action - * @return JsonResponse + * @return DumpResource */ - public function restore(Request $request, Dump $dump, RestoreAction $action): JsonResponse + public function restore(Dump $dump, RestoreAction $action): DumpResource { $restored = $action->restore($dump); - $resource = new DumpResource($restored, new Query()); - - return $resource->toResponse($request); + return new DumpResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Auth/User/Me/List/MyPlaylistController.php b/app/Http/Controllers/Api/Auth/User/Me/List/MyPlaylistController.php index 3310ef75a..6dab17388 100644 --- a/app/Http/Controllers/Api/Auth/User/Me/List/MyPlaylistController.php +++ b/app/Http/Controllers/Api/Auth/User/Me/List/MyPlaylistController.php @@ -13,7 +13,6 @@ use App\Http\Requests\Api\IndexRequest; use App\Http\Resources\List\Collection\PlaylistCollection; use App\Models\Auth\User; use App\Models\List\Playlist; -use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Auth; /** @@ -35,9 +34,9 @@ class MyPlaylistController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return PlaylistCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): PlaylistCollection { $query = new Query($request->validated()); @@ -48,9 +47,7 @@ class MyPlaylistController extends BaseController $playlists = $action->index($builder, $query, $request->schema()); - $collection = new PlaylistCollection($playlists, $query); - - return $collection->toResponse($request); + return new PlaylistCollection($playlists, $query); } /** diff --git a/app/Http/Controllers/Api/Auth/User/Me/MyController.php b/app/Http/Controllers/Api/Auth/User/Me/MyController.php index 3998e82a3..a61f5187c 100644 --- a/app/Http/Controllers/Api/Auth/User/Me/MyController.php +++ b/app/Http/Controllers/Api/Auth/User/Me/MyController.php @@ -12,7 +12,6 @@ use App\Http\Controllers\Api\BaseController; use App\Http\Requests\Api\ShowRequest; use App\Http\Resources\Auth\User\Resource\MyResource; use App\Models\Auth\User; -use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Auth; /** @@ -35,9 +34,9 @@ class MyController extends BaseController * * @param ShowRequest $request * @param ShowAction $action - * @return JsonResponse + * @return MyResource */ - public function show(ShowRequest $request, ShowAction $action): JsonResponse + public function show(ShowRequest $request, ShowAction $action): MyResource { $query = new Query($request->validated()); @@ -46,9 +45,7 @@ class MyController extends BaseController $show = $action->show($user, $query, $request->schema()); - $resource = new MyResource($show, $query); - - return $resource->toResponse($request); + return new MyResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Billing/BalanceController.php b/app/Http/Controllers/Api/Billing/BalanceController.php index b0c3f1d17..0afa14a5a 100644 --- a/app/Http/Controllers/Api/Billing/BalanceController.php +++ b/app/Http/Controllers/Api/Billing/BalanceController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Billing\Collection\BalanceCollection; use App\Http\Resources\Billing\Resource\BalanceResource; use App\Models\Billing\Balance; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class BalanceController. @@ -41,17 +40,15 @@ class BalanceController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return BalanceCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): BalanceCollection { $query = new Query($request->validated()); $resources = $action->index(Balance::query(), $query, $request->schema()); - $collection = new BalanceCollection($resources, $query); - - return $collection->toResponse($request); + return new BalanceCollection($resources, $query); } /** @@ -59,15 +56,13 @@ class BalanceController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return BalanceResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): BalanceResource { $balance = $action->store(Balance::query(), $request->validated()); - $resource = new BalanceResource($balance, new Query()); - - return $resource->toResponse($request); + return new BalanceResource($balance, new Query()); } /** @@ -76,17 +71,15 @@ class BalanceController extends BaseController * @param ShowRequest $request * @param Balance $balance * @param ShowAction $action - * @return JsonResponse + * @return BalanceResource */ - public function show(ShowRequest $request, Balance $balance, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Balance $balance, ShowAction $action): BalanceResource { $query = new Query($request->validated()); $show = $action->show($balance, $query, $request->schema()); - $resource = new BalanceResource($show, $query); - - return $resource->toResponse($request); + return new BalanceResource($show, $query); } /** @@ -95,49 +88,41 @@ class BalanceController extends BaseController * @param UpdateRequest $request * @param Balance $balance * @param UpdateAction $action - * @return JsonResponse + * @return BalanceResource */ - public function update(UpdateRequest $request, Balance $balance, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Balance $balance, UpdateAction $action): BalanceResource { $updated = $action->update($balance, $request->validated()); - $resource = new BalanceResource($updated, new Query()); - - return $resource->toResponse($request); + return new BalanceResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Balance $balance * @param DestroyAction $action - * @return JsonResponse + * @return BalanceResource */ - public function destroy(Request $request, Balance $balance, DestroyAction $action): JsonResponse + public function destroy(Balance $balance, DestroyAction $action): BalanceResource { $deleted = $action->destroy($balance); - $resource = new BalanceResource($deleted, new Query()); - - return $resource->toResponse($request); + return new BalanceResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Balance $balance * @param RestoreAction $action - * @return JsonResponse + * @return BalanceResource */ - public function restore(Request $request, Balance $balance, RestoreAction $action): JsonResponse + public function restore(Balance $balance, RestoreAction $action): BalanceResource { $restored = $action->restore($balance); - $resource = new BalanceResource($restored, new Query()); - - return $resource->toResponse($request); + return new BalanceResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Billing/TransactionController.php b/app/Http/Controllers/Api/Billing/TransactionController.php index 84927ff80..262588a68 100644 --- a/app/Http/Controllers/Api/Billing/TransactionController.php +++ b/app/Http/Controllers/Api/Billing/TransactionController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Billing\Collection\TransactionCollection; use App\Http\Resources\Billing\Resource\TransactionResource; use App\Models\Billing\Transaction; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class TransactionController. @@ -41,17 +40,15 @@ class TransactionController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return TransactionCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): TransactionCollection { $query = new Query($request->validated()); $transactions = $action->index(Transaction::query(), $query, $request->schema()); - $collection = new TransactionCollection($transactions, $query); - - return $collection->toResponse($request); + return new TransactionCollection($transactions, $query); } /** @@ -59,15 +56,13 @@ class TransactionController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return TransactionResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): TransactionResource { $transaction = $action->store(Transaction::query(), $request->validated()); - $resource = new TransactionResource($transaction, new Query()); - - return $resource->toResponse($request); + return new TransactionResource($transaction, new Query()); } /** @@ -76,17 +71,15 @@ class TransactionController extends BaseController * @param ShowRequest $request * @param Transaction $transaction * @param ShowAction $action - * @return JsonResponse + * @return TransactionResource */ - public function show(ShowRequest $request, Transaction $transaction, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Transaction $transaction, ShowAction $action): TransactionResource { $query = new Query($request->validated()); $show = $action->show($transaction, $query, $request->schema()); - $resource = new TransactionResource($show, $query); - - return $resource->toResponse($request); + return new TransactionResource($show, $query); } /** @@ -95,49 +88,41 @@ class TransactionController extends BaseController * @param UpdateRequest $request * @param Transaction $transaction * @param UpdateAction $action - * @return JsonResponse + * @return TransactionResource */ - public function update(UpdateRequest $request, Transaction $transaction, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Transaction $transaction, UpdateAction $action): TransactionResource { $updated = $action->update($transaction, $request->validated()); - $resource = new TransactionResource($updated, new Query()); - - return $resource->toResponse($request); + return new TransactionResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Transaction $transaction * @param DestroyAction $action - * @return JsonResponse + * @return TransactionResource */ - public function destroy(Request $request, Transaction $transaction, DestroyAction $action): JsonResponse + public function destroy(Transaction $transaction, DestroyAction $action): TransactionResource { $deleted = $action->destroy($transaction); - $resource = new TransactionResource($deleted, new Query()); - - return $resource->toResponse($request); + return new TransactionResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Transaction $transaction * @param RestoreAction $action - * @return JsonResponse + * @return TransactionResource */ - public function restore(Request $request, Transaction $transaction, RestoreAction $action): JsonResponse + public function restore(Transaction $transaction, RestoreAction $action): TransactionResource { $restored = $action->restore($transaction); - $resource = new TransactionResource($restored, new Query()); - - return $resource->toResponse($request); + return new TransactionResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Billing/TransparencyController.php b/app/Http/Controllers/Api/Billing/TransparencyController.php index cb3318e7c..f1fc05545 100644 --- a/app/Http/Controllers/Api/Billing/TransparencyController.php +++ b/app/Http/Controllers/Api/Billing/TransparencyController.php @@ -7,7 +7,6 @@ namespace App\Http\Controllers\Api\Billing; use App\Http\Controllers\Controller; use App\Http\Requests\Api\Billing\TransparencyRequest; use App\Http\Resources\Billing\Resource\TransparencyResource; -use Illuminate\Http\JsonResponse; /** * Class TransparencyController. @@ -18,17 +17,15 @@ class TransparencyController extends Controller * Show the transparency for the application. * * @param TransparencyRequest $request - * @return JsonResponse + * @return TransparencyResource */ - public function show(TransparencyRequest $request): JsonResponse + public function show(TransparencyRequest $request): TransparencyResource { - $resource = new TransparencyResource( + return new TransparencyResource( $request->getSelectedDate(), $request->getValidDates(), $request->getBalances(), $request->getTransactions() ); - - return $resource->toResponse($request); } } diff --git a/app/Http/Controllers/Api/Config/FlagsController.php b/app/Http/Controllers/Api/Config/FlagsController.php index 6a0748347..6c3f874e7 100644 --- a/app/Http/Controllers/Api/Config/FlagsController.php +++ b/app/Http/Controllers/Api/Config/FlagsController.php @@ -11,7 +11,6 @@ use App\Http\Api\Schema\Schema; use App\Http\Controllers\Controller; use App\Http\Requests\Api\ShowRequest; use App\Http\Resources\Config\Resource\FlagsResource; -use Illuminate\Http\JsonResponse; /** * Class FlagsController. @@ -22,15 +21,13 @@ class FlagsController extends Controller implements InteractsWithSchema * Flags resource. * * @param ShowRequest $request - * @return JsonResponse + * @return FlagsResource */ - public function show(ShowRequest $request): JsonResponse + public function show(ShowRequest $request): FlagsResource { $query = new Query($request->validated()); - $resource = new FlagsResource($query); - - return $resource->toResponse($request); + return new FlagsResource($query); } /** diff --git a/app/Http/Controllers/Api/Config/WikiController.php b/app/Http/Controllers/Api/Config/WikiController.php index c55aceef5..10626e7d6 100644 --- a/app/Http/Controllers/Api/Config/WikiController.php +++ b/app/Http/Controllers/Api/Config/WikiController.php @@ -11,7 +11,6 @@ use App\Http\Api\Schema\Schema; use App\Http\Controllers\Controller; use App\Http\Requests\Api\ShowRequest; use App\Http\Resources\Config\Resource\WikiResource; -use Illuminate\Http\JsonResponse; /** * Class WikiController. @@ -22,15 +21,13 @@ class WikiController extends Controller implements InteractsWithSchema * Wiki resource. * * @param ShowRequest $request - * @return JsonResponse + * @return WikiResource */ - public function show(ShowRequest $request): JsonResponse + public function show(ShowRequest $request): WikiResource { $query = new Query($request->validated()); - $resource = new WikiResource($query); - - return $resource->toResponse($request); + return new WikiResource($query); } /** diff --git a/app/Http/Controllers/Api/Document/PageController.php b/app/Http/Controllers/Api/Document/PageController.php index 49c2e88bf..460fe8702 100644 --- a/app/Http/Controllers/Api/Document/PageController.php +++ b/app/Http/Controllers/Api/Document/PageController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Document\Collection\PageCollection; use App\Http\Resources\Document\Resource\PageResource; use App\Models\Document\Page; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class PageController. @@ -41,17 +40,15 @@ class PageController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return PageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): PageCollection { $query = new Query($request->validated()); $pages = $action->index(Page::query(), $query, $request->schema()); - $collection = new PageCollection($pages, $query); - - return $collection->toResponse($request); + return new PageCollection($pages, $query); } /** @@ -59,15 +56,13 @@ class PageController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return PageResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): PageResource { $page = $action->store(Page::query(), $request->validated()); - $resource = new PageResource($page, new Query()); - - return $resource->toResponse($request); + return new PageResource($page, new Query()); } /** @@ -76,17 +71,15 @@ class PageController extends BaseController * @param ShowRequest $request * @param Page $page * @param ShowAction $action - * @return JsonResponse + * @return PageResource */ - public function show(ShowRequest $request, Page $page, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Page $page, ShowAction $action): PageResource { $query = new Query($request->validated()); $show = $action->show($page, $query, $request->schema()); - $resource = new PageResource($show, $query); - - return $resource->toResponse($request); + return new PageResource($show, $query); } /** @@ -95,49 +88,41 @@ class PageController extends BaseController * @param UpdateRequest $request * @param Page $page * @param UpdateAction $action - * @return JsonResponse + * @return PageResource */ - public function update(UpdateRequest $request, Page $page, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Page $page, UpdateAction $action): PageResource { $updated = $action->update($page, $request->validated()); - $resource = new PageResource($updated, new Query()); - - return $resource->toResponse($request); + return new PageResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Page $page * @param DestroyAction $action - * @return JsonResponse + * @return PageResource */ - public function destroy(Request $request, Page $page, DestroyAction $action): JsonResponse + public function destroy(Page $page, DestroyAction $action): PageResource { $deleted = $action->destroy($page); - $resource = new PageResource($deleted, new Query()); - - return $resource->toResponse($request); + return new PageResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Page $page * @param RestoreAction $action - * @return JsonResponse + * @return PageResource */ - public function restore(Request $request, Page $page, RestoreAction $action): JsonResponse + public function restore(Page $page, RestoreAction $action): PageResource { $restored = $action->restore($page); - $resource = new PageResource($restored, new Query()); - - return $resource->toResponse($request); + return new PageResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/List/Playlist/TrackBackwardController.php b/app/Http/Controllers/Api/List/Playlist/TrackBackwardController.php index f9a8ad56d..937991e7c 100644 --- a/app/Http/Controllers/Api/List/Playlist/TrackBackwardController.php +++ b/app/Http/Controllers/Api/List/Playlist/TrackBackwardController.php @@ -14,7 +14,6 @@ use App\Http\Resources\List\Playlist\Collection\TrackCollection; use App\Models\List\Playlist; use App\Models\List\Playlist\BackwardPlaylistTrack; use App\Models\List\Playlist\PlaylistTrack; -use Illuminate\Http\JsonResponse; /** * Class TrackBackwardController. @@ -36,11 +35,11 @@ class TrackBackwardController extends BaseController * @param Playlist $playlist * @param BackwardPlaylistTrack $track * @param IndexAction $action - * @return JsonResponse + * @return TrackCollection * * @noinspection PhpUnusedParameterInspection */ - public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, BackwardPlaylistTrack $track, IndexAction $action): JsonResponse + public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, BackwardPlaylistTrack $track, IndexAction $action): TrackCollection { $query = new Query($request->validated()); @@ -48,9 +47,7 @@ class TrackBackwardController extends BaseController $resources = $action->index($builder, $query, $request->schema()); - $collection = new TrackCollection($resources, $query); - - return $collection->toResponse($request); + return new TrackCollection($resources, $query); } /** diff --git a/app/Http/Controllers/Api/List/Playlist/TrackController.php b/app/Http/Controllers/Api/List/Playlist/TrackController.php index c9940ded7..d3cfb1e64 100644 --- a/app/Http/Controllers/Api/List/Playlist/TrackController.php +++ b/app/Http/Controllers/Api/List/Playlist/TrackController.php @@ -25,7 +25,6 @@ use App\Models\List\Playlist; use App\Models\List\Playlist\PlaylistTrack; use Exception; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; use Illuminate\Support\Str; /** @@ -55,9 +54,9 @@ class TrackController extends BaseController * @param IndexRequest $request * @param Playlist $playlist * @param IndexAction $action - * @return JsonResponse + * @return TrackCollection */ - public function index(IndexRequest $request, Playlist $playlist, IndexAction $action): JsonResponse + public function index(IndexRequest $request, Playlist $playlist, IndexAction $action): TrackCollection { $query = new Query($request->validated()); @@ -65,9 +64,7 @@ class TrackController extends BaseController $resources = $action->index($builder, $query, $request->schema()); - $collection = new TrackCollection($resources, $query); - - return $collection->toResponse($request); + return new TrackCollection($resources, $query); } /** @@ -76,17 +73,15 @@ class TrackController extends BaseController * @param StoreRequest $request * @param Playlist $playlist * @param StoreTrackAction $action - * @return JsonResponse + * @return TrackResource * * @throws Exception */ - public function store(StoreRequest $request, Playlist $playlist, StoreTrackAction $action): JsonResponse + public function store(StoreRequest $request, Playlist $playlist, StoreTrackAction $action): TrackResource { $track = $action->store($playlist, PlaylistTrack::query(), $request->validated()); - $resource = new TrackResource($track, new Query()); - - return $resource->toResponse($request); + return new TrackResource($track, new Query()); } /** @@ -96,19 +91,17 @@ class TrackController extends BaseController * @param Playlist $playlist * @param PlaylistTrack $track * @param ShowAction $action - * @return JsonResponse + * @return TrackResource * * @noinspection PhpUnusedParameterInspection */ - public function show(ShowRequest $request, Playlist $playlist, PlaylistTrack $track, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Playlist $playlist, PlaylistTrack $track, ShowAction $action): TrackResource { $query = new Query($request->validated()); $show = $action->show($track, $query, $request->schema()); - $resource = new TrackResource($show, $query); - - return $resource->toResponse($request); + return new TrackResource($show, $query); } /** @@ -118,57 +111,49 @@ class TrackController extends BaseController * @param Playlist $playlist * @param PlaylistTrack $track * @param UpdateTrackAction $action - * @return JsonResponse + * @return TrackResource * * @throws Exception */ - public function update(UpdateRequest $request, Playlist $playlist, PlaylistTrack $track, UpdateTrackAction $action): JsonResponse + public function update(UpdateRequest $request, Playlist $playlist, PlaylistTrack $track, UpdateTrackAction $action): TrackResource { $updated = $action->update($playlist, $track, $request->validated()); - $resource = new TrackResource($updated, new Query()); - - return $resource->toResponse($request); + return new TrackResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Playlist $playlist * @param PlaylistTrack $track * @param DestroyTrackAction $action - * @return JsonResponse + * @return TrackResource * * @throws Exception */ - public function destroy(Request $request, Playlist $playlist, PlaylistTrack $track, DestroyTrackAction $action): JsonResponse + public function destroy(Playlist $playlist, PlaylistTrack $track, DestroyTrackAction $action): TrackResource { $deleted = $action->destroy($playlist, $track); - $resource = new TrackResource($deleted, new Query()); - - return $resource->toResponse($request); + return new TrackResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Playlist $playlist * @param PlaylistTrack $track * @param RestoreTrackAction $action - * @return JsonResponse + * @return TrackResource * * @throws Exception */ - public function restore(Request $request, Playlist $playlist, PlaylistTrack $track, RestoreTrackAction $action): JsonResponse + public function restore(Playlist $playlist, PlaylistTrack $track, RestoreTrackAction $action): TrackResource { $restored = $action->restore($playlist, $track); - $resource = new TrackResource($restored, new Query()); - - return $resource->toResponse($request); + return new TrackResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/List/Playlist/TrackForwardController.php b/app/Http/Controllers/Api/List/Playlist/TrackForwardController.php index 1298ec19a..c984df5e5 100644 --- a/app/Http/Controllers/Api/List/Playlist/TrackForwardController.php +++ b/app/Http/Controllers/Api/List/Playlist/TrackForwardController.php @@ -14,7 +14,6 @@ use App\Http\Resources\List\Playlist\Collection\TrackCollection; use App\Models\List\Playlist; use App\Models\List\Playlist\ForwardPlaylistTrack; use App\Models\List\Playlist\PlaylistTrack; -use Illuminate\Http\JsonResponse; /** * Class TrackForwardController. @@ -36,11 +35,11 @@ class TrackForwardController extends BaseController * @param Playlist $playlist * @param ForwardPlaylistTrack $track * @param IndexAction $action - * @return JsonResponse + * @return TrackCollection * * @noinspection PhpUnusedParameterInspection */ - public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, ForwardPlaylistTrack $track, IndexAction $action): JsonResponse + public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, ForwardPlaylistTrack $track, IndexAction $action): TrackCollection { $query = new Query($request->validated()); @@ -48,9 +47,7 @@ class TrackForwardController extends BaseController $resources = $action->index($builder, $query, $request->schema()); - $collection = new TrackCollection($resources, $query); - - return $collection->toResponse($request); + return new TrackCollection($resources, $query); } /** diff --git a/app/Http/Controllers/Api/List/PlaylistBackwardController.php b/app/Http/Controllers/Api/List/PlaylistBackwardController.php index add328798..a00d224f5 100644 --- a/app/Http/Controllers/Api/List/PlaylistBackwardController.php +++ b/app/Http/Controllers/Api/List/PlaylistBackwardController.php @@ -15,7 +15,6 @@ use App\Models\List\Playlist; use App\Models\List\Playlist\BackwardPlaylistTrack; use App\Models\List\Playlist\PlaylistTrack; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\JsonResponse; /** * Class PlaylistBackwardController. @@ -36,9 +35,9 @@ class PlaylistBackwardController extends BaseController * @param ForwardBackwardIndexRequest $request * @param Playlist $playlist * @param IndexAction $action - * @return JsonResponse + * @return TrackCollection */ - public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, IndexAction $action): JsonResponse + public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, IndexAction $action): TrackCollection { $query = new Query($request->validated()); @@ -50,9 +49,7 @@ class PlaylistBackwardController extends BaseController $resources = $action->index($builder, $query, $request->schema()); - $collection = new TrackCollection($resources, $query); - - return $collection->toResponse($request); + return new TrackCollection($resources, $query); } /** diff --git a/app/Http/Controllers/Api/List/PlaylistController.php b/app/Http/Controllers/Api/List/PlaylistController.php index 8552f32c3..fca4ea9ce 100644 --- a/app/Http/Controllers/Api/List/PlaylistController.php +++ b/app/Http/Controllers/Api/List/PlaylistController.php @@ -24,7 +24,6 @@ use App\Http\Resources\List\Collection\PlaylistCollection; use App\Http\Resources\List\Resource\PlaylistResource; use App\Models\List\Playlist; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Str; @@ -54,9 +53,9 @@ class PlaylistController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return PlaylistCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): PlaylistCollection { $query = new Query($request->validated()); @@ -66,9 +65,7 @@ class PlaylistController extends BaseController ? $action->search($query, $request->schema()) : $action->index($builder, $query, $request->schema()); - $collection = new PlaylistCollection($playlists, $query); - - return $collection->toResponse($request); + return new PlaylistCollection($playlists, $query); } /** @@ -76,9 +73,9 @@ class PlaylistController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return PlaylistResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): PlaylistResource { $validated = array_merge( $request->validated(), @@ -87,9 +84,7 @@ class PlaylistController extends BaseController $playlist = $action->store(Playlist::query(), $validated); - $resource = new PlaylistResource($playlist, new Query()); - - return $resource->toResponse($request); + return new PlaylistResource($playlist, new Query()); } /** @@ -98,17 +93,15 @@ class PlaylistController extends BaseController * @param ShowRequest $request * @param Playlist $playlist * @param ShowAction $action - * @return JsonResponse + * @return PlaylistResource */ - public function show(ShowRequest $request, Playlist $playlist, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Playlist $playlist, ShowAction $action): PlaylistResource { $query = new Query($request->validated()); $show = $action->show($playlist, $query, $request->schema()); - $resource = new PlaylistResource($show, $query); - - return $resource->toResponse($request); + return new PlaylistResource($show, $query); } /** @@ -117,49 +110,41 @@ class PlaylistController extends BaseController * @param UpdateRequest $request * @param Playlist $playlist * @param UpdateAction $action - * @return JsonResponse + * @return PlaylistResource */ - public function update(UpdateRequest $request, Playlist $playlist, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Playlist $playlist, UpdateAction $action): PlaylistResource { $updated = $action->update($playlist, $request->validated()); - $resource = new PlaylistResource($updated, new Query()); - - return $resource->toResponse($request); + return new PlaylistResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Playlist $playlist * @param DestroyAction $action - * @return JsonResponse + * @return PlaylistResource */ - public function destroy(Request $request, Playlist $playlist, DestroyAction $action): JsonResponse + public function destroy(Playlist $playlist, DestroyAction $action): PlaylistResource { $deleted = $action->destroy($playlist); - $resource = new PlaylistResource($deleted, new Query()); - - return $resource->toResponse($request); + return new PlaylistResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Playlist $playlist * @param RestoreAction $action - * @return JsonResponse + * @return PlaylistResource */ - public function restore(Request $request, Playlist $playlist, RestoreAction $action): JsonResponse + public function restore(Playlist $playlist, RestoreAction $action): PlaylistResource { $restored = $action->restore($playlist); - $resource = new PlaylistResource($restored, new Query()); - - return $resource->toResponse($request); + return new PlaylistResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/List/PlaylistForwardController.php b/app/Http/Controllers/Api/List/PlaylistForwardController.php index cb4058325..3f5926491 100644 --- a/app/Http/Controllers/Api/List/PlaylistForwardController.php +++ b/app/Http/Controllers/Api/List/PlaylistForwardController.php @@ -15,7 +15,6 @@ use App\Models\List\Playlist; use App\Models\List\Playlist\ForwardPlaylistTrack; use App\Models\List\Playlist\PlaylistTrack; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\JsonResponse; /** * Class PlaylistForwardController. @@ -36,9 +35,9 @@ class PlaylistForwardController extends BaseController * @param ForwardBackwardIndexRequest $request * @param Playlist $playlist * @param IndexAction $action - * @return JsonResponse + * @return TrackCollection */ - public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, IndexAction $action): JsonResponse + public function index(ForwardBackwardIndexRequest $request, Playlist $playlist, IndexAction $action): TrackCollection { $query = new Query($request->validated()); @@ -50,9 +49,7 @@ class PlaylistForwardController extends BaseController $resources = $action->index($builder, $query, $request->schema()); - $collection = new TrackCollection($resources, $query); - - return $collection->toResponse($request); + return new TrackCollection($resources, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/List/PlaylistImageController.php b/app/Http/Controllers/Api/Pivot/List/PlaylistImageController.php index 8e03d7460..813316ece 100644 --- a/app/Http/Controllers/Api/Pivot/List/PlaylistImageController.php +++ b/app/Http/Controllers/Api/Pivot/List/PlaylistImageController.php @@ -49,9 +49,9 @@ class PlaylistImageController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return PlaylistImageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): PlaylistImageCollection { $query = new Query($request->validated()); @@ -62,9 +62,7 @@ class PlaylistImageController extends PivotController $resources = $action->index($builder, $query, $request->schema()); - $collection = new PlaylistImageCollection($resources, $query); - - return $collection->toResponse($request); + return new PlaylistImageCollection($resources, $query); } /** @@ -74,9 +72,9 @@ class PlaylistImageController extends PivotController * @param Playlist $playlist * @param Image $image * @param StoreAction $action - * @return JsonResponse + * @return PlaylistImageResource */ - public function store(StoreRequest $request, Playlist $playlist, Image $image, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Playlist $playlist, Image $image, StoreAction $action): PlaylistImageResource { $validated = array_merge( $request->validated(), @@ -88,9 +86,7 @@ class PlaylistImageController extends PivotController $playlistImage = $action->store(PlaylistImage::query(), $validated); - $resource = new PlaylistImageResource($playlistImage, new Query()); - - return $resource->toResponse($request); + return new PlaylistImageResource($playlistImage, new Query()); } /** @@ -100,9 +96,9 @@ class PlaylistImageController extends PivotController * @param Playlist $playlist * @param Image $image * @param ShowAction $action - * @return JsonResponse + * @return PlaylistImageResource */ - public function show(ShowRequest $request, Playlist $playlist, Image $image, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Playlist $playlist, Image $image, ShowAction $action): PlaylistImageResource { $playlistImage = PlaylistImage::query() ->where(PlaylistImage::ATTRIBUTE_PLAYLIST, $playlist->getKey()) @@ -113,9 +109,7 @@ class PlaylistImageController extends PivotController $show = $action->show($playlistImage, $query, $request->schema()); - $resource = new PlaylistImageResource($show, $query); - - return $resource->toResponse($request); + return new PlaylistImageResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/AnimeImageController.php b/app/Http/Controllers/Api/Pivot/Wiki/AnimeImageController.php index 22b4e592a..99a2c799e 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/AnimeImageController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/AnimeImageController.php @@ -38,17 +38,15 @@ class AnimeImageController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeImageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeImageCollection { $query = new Query($request->validated()); $resources = $action->index(AnimeImage::query(), $query, $request->schema()); - $collection = new AnimeImageCollection($resources, $query); - - return $collection->toResponse($request); + return new AnimeImageCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class AnimeImageController extends PivotController * @param Anime $anime * @param Image $image * @param StoreAction $action - * @return JsonResponse + * @return AnimeImageResource */ - public function store(StoreRequest $request, Anime $anime, Image $image, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Anime $anime, Image $image, StoreAction $action): AnimeImageResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class AnimeImageController extends PivotController $animeImage = $action->store(AnimeImage::query(), $validated); - $resource = new AnimeImageResource($animeImage, new Query()); - - return $resource->toResponse($request); + return new AnimeImageResource($animeImage, new Query()); } /** @@ -84,9 +80,9 @@ class AnimeImageController extends PivotController * @param Anime $anime * @param Image $image * @param ShowAction $action - * @return JsonResponse + * @return AnimeImageResource */ - public function show(ShowRequest $request, Anime $anime, Image $image, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Anime $anime, Image $image, ShowAction $action): AnimeImageResource { $animeImage = AnimeImage::query() ->where(AnimeImage::ATTRIBUTE_ANIME, $anime->getKey()) @@ -97,9 +93,7 @@ class AnimeImageController extends PivotController $show = $action->show($animeImage, $query, $request->schema()); - $resource = new AnimeImageResource($show, $query); - - return $resource->toResponse($request); + return new AnimeImageResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/AnimeResourceController.php b/app/Http/Controllers/Api/Pivot/Wiki/AnimeResourceController.php index fd402f657..9d8856e88 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/AnimeResourceController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/AnimeResourceController.php @@ -40,17 +40,15 @@ class AnimeResourceController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeResourceCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeResourceCollection { $query = new Query($request->validated()); $resources = $action->index(AnimeResource::query(), $query, $request->schema()); - $collection = new AnimeResourceCollection($resources, $query); - - return $collection->toResponse($request); + return new AnimeResourceCollection($resources, $query); } /** @@ -60,9 +58,9 @@ class AnimeResourceController extends PivotController * @param Anime $anime * @param ExternalResource $resource * @param StoreAction $action - * @return JsonResponse + * @return AnimeResourceResource */ - public function store(StoreRequest $request, Anime $anime, ExternalResource $resource, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Anime $anime, ExternalResource $resource, StoreAction $action): AnimeResourceResource { $validated = array_merge( $request->validated(), @@ -74,9 +72,7 @@ class AnimeResourceController extends PivotController $animeResource = $action->store(AnimeResource::query(), $validated); - $resource = new AnimeResourceResource($animeResource, new Query()); - - return $resource->toResponse($request); + return new AnimeResourceResource($animeResource, new Query()); } /** @@ -86,9 +82,9 @@ class AnimeResourceController extends PivotController * @param Anime $anime * @param ExternalResource $resource * @param ShowAction $action - * @return JsonResponse + * @return AnimeResourceResource */ - public function show(ShowRequest $request, Anime $anime, ExternalResource $resource, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Anime $anime, ExternalResource $resource, ShowAction $action): AnimeResourceResource { $animeResource = AnimeResource::query() ->where(AnimeResource::ATTRIBUTE_ANIME, $anime->getKey()) @@ -99,9 +95,7 @@ class AnimeResourceController extends PivotController $show = $action->show($animeResource, $query, $request->schema()); - $apiResource = new AnimeResourceResource($show, $query); - - return $apiResource->toResponse($request); + return new AnimeResourceResource($show, $query); } /** @@ -111,9 +105,9 @@ class AnimeResourceController extends PivotController * @param Anime $anime * @param ExternalResource $resource * @param UpdateAction $action - * @return JsonResponse + * @return AnimeResourceResource */ - public function update(UpdateRequest $request, Anime $anime, ExternalResource $resource, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Anime $anime, ExternalResource $resource, UpdateAction $action): AnimeResourceResource { $animeResource = AnimeResource::query() ->where(AnimeResource::ATTRIBUTE_ANIME, $anime->getKey()) @@ -124,9 +118,7 @@ class AnimeResourceController extends PivotController $updated = $action->update($animeResource, $request->validated()); - $apiResource = new AnimeResourceResource($updated, $query); - - return $apiResource->toResponse($request); + return new AnimeResourceResource($updated, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/AnimeSeriesController.php b/app/Http/Controllers/Api/Pivot/Wiki/AnimeSeriesController.php index 8f8b7e096..814c6828a 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/AnimeSeriesController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/AnimeSeriesController.php @@ -38,17 +38,15 @@ class AnimeSeriesController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeSeriesCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeSeriesCollection { $query = new Query($request->validated()); $resources = $action->index(AnimeSeries::query(), $query, $request->schema()); - $collection = new AnimeSeriesCollection($resources, $query); - - return $collection->toResponse($request); + return new AnimeSeriesCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class AnimeSeriesController extends PivotController * @param Anime $anime * @param Series $series * @param StoreAction $action - * @return JsonResponse + * @return AnimeSeriesResource */ - public function store(StoreRequest $request, Anime $anime, Series $series, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Anime $anime, Series $series, StoreAction $action): AnimeSeriesResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class AnimeSeriesController extends PivotController $animeSeries = $action->store(AnimeSeries::query(), $validated); - $resource = new AnimeSeriesResource($animeSeries, new Query()); - - return $resource->toResponse($request); + return new AnimeSeriesResource($animeSeries, new Query()); } /** @@ -84,9 +80,9 @@ class AnimeSeriesController extends PivotController * @param Anime $anime * @param Series $series * @param ShowAction $action - * @return JsonResponse + * @return AnimeSeriesResource */ - public function show(ShowRequest $request, Anime $anime, Series $series, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Anime $anime, Series $series, ShowAction $action): AnimeSeriesResource { $animeSeries = AnimeSeries::query() ->where(AnimeSeries::ATTRIBUTE_ANIME, $anime->getKey()) @@ -97,9 +93,7 @@ class AnimeSeriesController extends PivotController $show = $action->show($animeSeries, $query, $request->schema()); - $resource = new AnimeSeriesResource($show, $query); - - return $resource->toResponse($request); + return new AnimeSeriesResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/AnimeStudioController.php b/app/Http/Controllers/Api/Pivot/Wiki/AnimeStudioController.php index fc2d23960..1ab2a1c96 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/AnimeStudioController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/AnimeStudioController.php @@ -38,17 +38,15 @@ class AnimeStudioController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeStudioCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeStudioCollection { $query = new Query($request->validated()); $resources = $action->index(AnimeStudio::query(), $query, $request->schema()); - $collection = new AnimeStudioCollection($resources, $query); - - return $collection->toResponse($request); + return new AnimeStudioCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class AnimeStudioController extends PivotController * @param Anime $anime * @param Studio $studio * @param StoreAction $action - * @return JsonResponse + * @return AnimeStudioResource */ - public function store(StoreRequest $request, Anime $anime, Studio $studio, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Anime $anime, Studio $studio, StoreAction $action): AnimeStudioResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class AnimeStudioController extends PivotController $animeStudio = $action->store(AnimeStudio::query(), $validated); - $resource = new AnimeStudioResource($animeStudio, new Query()); - - return $resource->toResponse($request); + return new AnimeStudioResource($animeStudio, new Query()); } /** @@ -84,9 +80,9 @@ class AnimeStudioController extends PivotController * @param Anime $anime * @param Studio $studio * @param ShowAction $action - * @return JsonResponse + * @return AnimeStudioResource */ - public function show(ShowRequest $request, Anime $anime, Studio $studio, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Anime $anime, Studio $studio, ShowAction $action): AnimeStudioResource { $animeStudio = AnimeStudio::query() ->where(AnimeStudio::ATTRIBUTE_ANIME, $anime->getKey()) @@ -97,9 +93,7 @@ class AnimeStudioController extends PivotController $show = $action->show($animeStudio, $query, $request->schema()); - $resource = new AnimeStudioResource($show, $query); - - return $resource->toResponse($request); + return new AnimeStudioResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/AnimeThemeEntryVideoController.php b/app/Http/Controllers/Api/Pivot/Wiki/AnimeThemeEntryVideoController.php index dc22cfe18..0c8aafbbe 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/AnimeThemeEntryVideoController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/AnimeThemeEntryVideoController.php @@ -38,17 +38,15 @@ class AnimeThemeEntryVideoController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeThemeEntryVideoCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeThemeEntryVideoCollection { $query = new Query($request->validated()); $resources = $action->index(AnimeThemeEntryVideo::query(), $query, $request->schema()); - $collection = new AnimeThemeEntryVideoCollection($resources, $query); - - return $collection->toResponse($request); + return new AnimeThemeEntryVideoCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class AnimeThemeEntryVideoController extends PivotController * @param AnimeThemeEntry $animethemeentry * @param Video $video * @param StoreAction $action - * @return JsonResponse + * @return AnimeThemeEntryVideoResource */ - public function store(StoreRequest $request, AnimeThemeEntry $animethemeentry, Video $video, StoreAction $action): JsonResponse + public function store(StoreRequest $request, AnimeThemeEntry $animethemeentry, Video $video, StoreAction $action): AnimeThemeEntryVideoResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class AnimeThemeEntryVideoController extends PivotController $entryVideo = $action->store(AnimeThemeEntryVideo::query(), $validated); - $resource = new AnimeThemeEntryVideoResource($entryVideo, new Query()); - - return $resource->toResponse($request); + return new AnimeThemeEntryVideoResource($entryVideo, new Query()); } /** @@ -84,9 +80,9 @@ class AnimeThemeEntryVideoController extends PivotController * @param AnimeThemeEntry $animethemeentry * @param Video $video * @param ShowAction $action - * @return JsonResponse + * @return AnimeThemeEntryVideoResource */ - public function show(ShowRequest $request, AnimeThemeEntry $animethemeentry, Video $video, ShowAction $action): JsonResponse + public function show(ShowRequest $request, AnimeThemeEntry $animethemeentry, Video $video, ShowAction $action): AnimeThemeEntryVideoResource { $entryVideo = AnimeThemeEntryVideo::query() ->where(AnimeThemeEntryVideo::ATTRIBUTE_ENTRY, $animethemeentry->getKey()) @@ -97,9 +93,7 @@ class AnimeThemeEntryVideoController extends PivotController $show = $action->show($entryVideo, $query, $request->schema()); - $resource = new AnimeThemeEntryVideoResource($show, $query); - - return $resource->toResponse($request); + return new AnimeThemeEntryVideoResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/ArtistImageController.php b/app/Http/Controllers/Api/Pivot/Wiki/ArtistImageController.php index b7f6d7ad1..4441b85f7 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/ArtistImageController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/ArtistImageController.php @@ -38,17 +38,15 @@ class ArtistImageController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ArtistImageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ArtistImageCollection { $query = new Query($request->validated()); $resources = $action->index(ArtistImage::query(), $query, $request->schema()); - $collection = new ArtistImageCollection($resources, $query); - - return $collection->toResponse($request); + return new ArtistImageCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class ArtistImageController extends PivotController * @param Artist $artist * @param Image $image * @param StoreAction $action - * @return JsonResponse + * @return ArtistImageResource */ - public function store(StoreRequest $request, Artist $artist, Image $image, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Artist $artist, Image $image, StoreAction $action): ArtistImageResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class ArtistImageController extends PivotController $artistImage = $action->store(ArtistImage::query(), $validated); - $resource = new ArtistImageResource($artistImage, new Query()); - - return $resource->toResponse($request); + return new ArtistImageResource($artistImage, new Query()); } /** @@ -84,9 +80,9 @@ class ArtistImageController extends PivotController * @param Artist $artist * @param Image $image * @param ShowAction $action - * @return JsonResponse + * @return ArtistImageResource */ - public function show(ShowRequest $request, Artist $artist, Image $image, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Artist $artist, Image $image, ShowAction $action): ArtistImageResource { $artistImage = ArtistImage::query() ->where(ArtistImage::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -97,9 +93,7 @@ class ArtistImageController extends PivotController $show = $action->show($artistImage, $query, $request->schema()); - $resource = new ArtistImageResource($show, $query); - - return $resource->toResponse($request); + return new ArtistImageResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/ArtistMemberController.php b/app/Http/Controllers/Api/Pivot/Wiki/ArtistMemberController.php index ae5a3433e..be4525ddb 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/ArtistMemberController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/ArtistMemberController.php @@ -39,17 +39,15 @@ class ArtistMemberController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ArtistMemberCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ArtistMemberCollection { $query = new Query($request->validated()); $resources = $action->index(ArtistMember::query(), $query, $request->schema()); - $collection = new ArtistMemberCollection($resources, $query); - - return $collection->toResponse($request); + return new ArtistMemberCollection($resources, $query); } /** @@ -59,9 +57,9 @@ class ArtistMemberController extends PivotController * @param Artist $artist * @param Artist $member * @param StoreAction $action - * @return JsonResponse + * @return ArtistMemberResource */ - public function store(StoreRequest $request, Artist $artist, Artist $member, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Artist $artist, Artist $member, StoreAction $action): ArtistMemberResource { $validated = array_merge( $request->validated(), @@ -73,9 +71,7 @@ class ArtistMemberController extends PivotController $artistMember = $action->store(ArtistMember::query(), $validated); - $resource = new ArtistMemberResource($artistMember, new Query()); - - return $resource->toResponse($request); + return new ArtistMemberResource($artistMember, new Query()); } /** @@ -85,9 +81,9 @@ class ArtistMemberController extends PivotController * @param Artist $artist * @param Artist $member * @param ShowAction $action - * @return JsonResponse + * @return ArtistMemberResource */ - public function show(ShowRequest $request, Artist $artist, Artist $member, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Artist $artist, Artist $member, ShowAction $action): ArtistMemberResource { $artistMember = ArtistMember::query() ->where(ArtistMember::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -98,9 +94,7 @@ class ArtistMemberController extends PivotController $show = $action->show($artistMember, $query, $request->schema()); - $resource = new ArtistMemberResource($show, $query); - - return $resource->toResponse($request); + return new ArtistMemberResource($show, $query); } /** @@ -110,9 +104,9 @@ class ArtistMemberController extends PivotController * @param Artist $artist * @param Artist $member * @param UpdateAction $action - * @return JsonResponse + * @return ArtistMemberResource */ - public function update(UpdateRequest $request, Artist $artist, Artist $member, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Artist $artist, Artist $member, UpdateAction $action): ArtistMemberResource { $artistMember = ArtistMember::query() ->where(ArtistMember::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -123,9 +117,7 @@ class ArtistMemberController extends PivotController $updated = $action->update($artistMember, $request->validated()); - $apiResource = new ArtistMemberResource($updated, $query); - - return $apiResource->toResponse($request); + return new ArtistMemberResource($updated, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/ArtistResourceController.php b/app/Http/Controllers/Api/Pivot/Wiki/ArtistResourceController.php index c84568911..5f74f1393 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/ArtistResourceController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/ArtistResourceController.php @@ -40,17 +40,15 @@ class ArtistResourceController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ArtistResourceCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ArtistResourceCollection { $query = new Query($request->validated()); $resources = $action->index(ArtistResource::query(), $query, $request->schema()); - $collection = new ArtistResourceCollection($resources, $query); - - return $collection->toResponse($request); + return new ArtistResourceCollection($resources, $query); } /** @@ -60,9 +58,9 @@ class ArtistResourceController extends PivotController * @param Artist $artist * @param ExternalResource $resource * @param StoreAction $action - * @return JsonResponse + * @return ArtistResourceResource */ - public function store(StoreRequest $request, Artist $artist, ExternalResource $resource, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Artist $artist, ExternalResource $resource, StoreAction $action): ArtistResourceResource { $validated = array_merge( $request->validated(), @@ -74,9 +72,7 @@ class ArtistResourceController extends PivotController $artistResource = $action->store(ArtistResource::query(), $validated); - $resource = new ArtistResourceResource($artistResource, new Query()); - - return $resource->toResponse($request); + return new ArtistResourceResource($artistResource, new Query()); } /** @@ -86,9 +82,9 @@ class ArtistResourceController extends PivotController * @param Artist $artist * @param ExternalResource $resource * @param ShowAction $action - * @return JsonResponse + * @return ArtistResourceResource */ - public function show(ShowRequest $request, Artist $artist, ExternalResource $resource, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Artist $artist, ExternalResource $resource, ShowAction $action): ArtistResourceResource { $artistResource = ArtistResource::query() ->where(ArtistResource::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -99,9 +95,7 @@ class ArtistResourceController extends PivotController $show = $action->show($artistResource, $query, $request->schema()); - $apiResource = new ArtistResourceResource($show, $query); - - return $apiResource->toResponse($request); + return new ArtistResourceResource($show, $query); } /** @@ -111,9 +105,9 @@ class ArtistResourceController extends PivotController * @param Artist $artist * @param ExternalResource $resource * @param UpdateAction $action - * @return JsonResponse + * @return ArtistResourceResource */ - public function update(UpdateRequest $request, Artist $artist, ExternalResource $resource, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Artist $artist, ExternalResource $resource, UpdateAction $action): ArtistResourceResource { $artistResource = ArtistResource::query() ->where(ArtistResource::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -124,9 +118,7 @@ class ArtistResourceController extends PivotController $updated = $action->update($artistResource, $request->validated()); - $apiResource = new ArtistResourceResource($updated, $query); - - return $apiResource->toResponse($request); + return new ArtistResourceResource($updated, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/ArtistSongController.php b/app/Http/Controllers/Api/Pivot/Wiki/ArtistSongController.php index 4839f616b..f529fccd0 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/ArtistSongController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/ArtistSongController.php @@ -40,17 +40,15 @@ class ArtistSongController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ArtistSongCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ArtistSongCollection { $query = new Query($request->validated()); $resources = $action->index(ArtistSong::query(), $query, $request->schema()); - $collection = new ArtistSongCollection($resources, $query); - - return $collection->toResponse($request); + return new ArtistSongCollection($resources, $query); } /** @@ -60,9 +58,9 @@ class ArtistSongController extends PivotController * @param Artist $artist * @param Song $song * @param StoreAction $action - * @return JsonResponse + * @return ArtistSongResource */ - public function store(StoreRequest $request, Artist $artist, Song $song, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Artist $artist, Song $song, StoreAction $action): ArtistSongResource { $validated = array_merge( $request->validated(), @@ -74,9 +72,7 @@ class ArtistSongController extends PivotController $artistSong = $action->store(ArtistSong::query(), $validated); - $resource = new ArtistSongResource($artistSong, new Query()); - - return $resource->toResponse($request); + return new ArtistSongResource($artistSong, new Query()); } /** @@ -86,9 +82,9 @@ class ArtistSongController extends PivotController * @param Artist $artist * @param Song $song * @param ShowAction $action - * @return JsonResponse + * @return ArtistSongResource */ - public function show(ShowRequest $request, Artist $artist, Song $song, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Artist $artist, Song $song, ShowAction $action): ArtistSongResource { $artistSong = ArtistSong::query() ->where(ArtistSong::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -99,9 +95,7 @@ class ArtistSongController extends PivotController $show = $action->show($artistSong, $query, $request->schema()); - $resource = new ArtistSongResource($show, $query); - - return $resource->toResponse($request); + return new ArtistSongResource($show, $query); } /** @@ -111,9 +105,9 @@ class ArtistSongController extends PivotController * @param Artist $artist * @param Song $song * @param UpdateAction $action - * @return JsonResponse + * @return ArtistSongResource */ - public function update(UpdateRequest $request, Artist $artist, Song $song, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Artist $artist, Song $song, UpdateAction $action): ArtistSongResource { $artistSong = ArtistSong::query() ->where(ArtistSong::ATTRIBUTE_ARTIST, $artist->getKey()) @@ -124,9 +118,7 @@ class ArtistSongController extends PivotController $updated = $action->update($artistSong, $request->validated()); - $apiResource = new ArtistSongResource($updated, $query); - - return $apiResource->toResponse($request); + return new ArtistSongResource($updated, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/StudioImageController.php b/app/Http/Controllers/Api/Pivot/Wiki/StudioImageController.php index dc2823c07..aecc3c628 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/StudioImageController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/StudioImageController.php @@ -38,17 +38,15 @@ class StudioImageController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return StudioImageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): StudioImageCollection { $query = new Query($request->validated()); $resources = $action->index(StudioImage::query(), $query, $request->schema()); - $collection = new StudioImageCollection($resources, $query); - - return $collection->toResponse($request); + return new StudioImageCollection($resources, $query); } /** @@ -58,9 +56,9 @@ class StudioImageController extends PivotController * @param Studio $studio * @param Image $image * @param StoreAction $action - * @return JsonResponse + * @return StudioImageResource */ - public function store(StoreRequest $request, Studio $studio, Image $image, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Studio $studio, Image $image, StoreAction $action): StudioImageResource { $validated = array_merge( $request->validated(), @@ -72,9 +70,7 @@ class StudioImageController extends PivotController $studioImage = $action->store(StudioImage::query(), $validated); - $resource = new StudioImageResource($studioImage, new Query()); - - return $resource->toResponse($request); + return new StudioImageResource($studioImage, new Query()); } /** @@ -84,9 +80,9 @@ class StudioImageController extends PivotController * @param Studio $studio * @param Image $image * @param ShowAction $action - * @return JsonResponse + * @return StudioImageResource */ - public function show(ShowRequest $request, Studio $studio, Image $image, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Studio $studio, Image $image, ShowAction $action): StudioImageResource { $studioImage = StudioImage::query() ->where(StudioImage::ATTRIBUTE_STUDIO, $studio->getKey()) @@ -97,9 +93,7 @@ class StudioImageController extends PivotController $show = $action->show($studioImage, $query, $request->schema()); - $resource = new StudioImageResource($show, $query); - - return $resource->toResponse($request); + return new StudioImageResource($show, $query); } /** diff --git a/app/Http/Controllers/Api/Pivot/Wiki/StudioResourceController.php b/app/Http/Controllers/Api/Pivot/Wiki/StudioResourceController.php index 5a053a443..0f27b43d7 100644 --- a/app/Http/Controllers/Api/Pivot/Wiki/StudioResourceController.php +++ b/app/Http/Controllers/Api/Pivot/Wiki/StudioResourceController.php @@ -40,17 +40,15 @@ class StudioResourceController extends PivotController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return StudioResourceCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): StudioResourceCollection { $query = new Query($request->validated()); $resources = $action->index(StudioResource::query(), $query, $request->schema()); - $collection = new StudioResourceCollection($resources, $query); - - return $collection->toResponse($request); + return new StudioResourceCollection($resources, $query); } /** @@ -60,9 +58,9 @@ class StudioResourceController extends PivotController * @param Studio $studio * @param ExternalResource $resource * @param StoreAction $action - * @return JsonResponse + * @return StudioResourceResource */ - public function store(StoreRequest $request, Studio $studio, ExternalResource $resource, StoreAction $action): JsonResponse + public function store(StoreRequest $request, Studio $studio, ExternalResource $resource, StoreAction $action): StudioResourceResource { $validated = array_merge( $request->validated(), @@ -74,9 +72,7 @@ class StudioResourceController extends PivotController $studioResource = $action->store(StudioResource::query(), $validated); - $resource = new StudioResourceResource($studioResource, new Query()); - - return $resource->toResponse($request); + return new StudioResourceResource($studioResource, new Query()); } /** @@ -86,9 +82,9 @@ class StudioResourceController extends PivotController * @param Studio $studio * @param ExternalResource $resource * @param ShowAction $action - * @return JsonResponse + * @return StudioResourceResource */ - public function show(ShowRequest $request, Studio $studio, ExternalResource $resource, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Studio $studio, ExternalResource $resource, ShowAction $action): StudioResourceResource { $studioResource = StudioResource::query() ->where(StudioResource::ATTRIBUTE_STUDIO, $studio->getKey()) @@ -99,9 +95,7 @@ class StudioResourceController extends PivotController $show = $action->show($studioResource, $query, $request->schema()); - $apiResource = new StudioResourceResource($show, $query); - - return $apiResource->toResponse($request); + return new StudioResourceResource($show, $query); } /** @@ -111,9 +105,9 @@ class StudioResourceController extends PivotController * @param Studio $studio * @param ExternalResource $resource * @param UpdateAction $action - * @return JsonResponse + * @return StudioResourceResource */ - public function update(UpdateRequest $request, Studio $studio, ExternalResource $resource, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Studio $studio, ExternalResource $resource, UpdateAction $action): StudioResourceResource { $studioResource = StudioResource::query() ->where(StudioResource::ATTRIBUTE_STUDIO, $studio->getKey()) @@ -124,9 +118,7 @@ class StudioResourceController extends PivotController $updated = $action->update($studioResource, $request->validated()); - $apiResource = new StudioResourceResource($updated, $query); - - return $apiResource->toResponse($request); + return new StudioResourceResource($updated, $query); } /** diff --git a/app/Http/Controllers/Api/SearchController.php b/app/Http/Controllers/Api/SearchController.php index c8910974f..b6525143c 100644 --- a/app/Http/Controllers/Api/SearchController.php +++ b/app/Http/Controllers/Api/SearchController.php @@ -11,7 +11,6 @@ use App\Http\Api\Schema\SearchSchema; use App\Http\Controllers\Controller; use App\Http\Requests\Api\SearchRequest; use App\Http\Resources\SearchResource; -use Illuminate\Http\JsonResponse; /** * Class SearchController. @@ -22,15 +21,13 @@ class SearchController extends Controller implements InteractsWithSchema * Search resource. * * @param SearchRequest $request - * @return JsonResponse + * @return SearchResource */ - public function show(SearchRequest $request): JsonResponse + public function show(SearchRequest $request): SearchResource { $query = new Query($request->validated()); - $resource = new SearchResource($query); - - return $resource->toResponse($request); + return new SearchResource($query); } /** diff --git a/app/Http/Controllers/Api/Wiki/Anime/SynonymController.php b/app/Http/Controllers/Api/Wiki/Anime/SynonymController.php index 694073836..69de462cf 100644 --- a/app/Http/Controllers/Api/Wiki/Anime/SynonymController.php +++ b/app/Http/Controllers/Api/Wiki/Anime/SynonymController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Anime\Collection\SynonymCollection; use App\Http\Resources\Wiki\Anime\Resource\SynonymResource; use App\Models\Wiki\Anime\AnimeSynonym; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class SynonymController. @@ -41,9 +40,9 @@ class SynonymController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return SynonymCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): SynonymCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class SynonymController extends BaseController ? $action->search($query, $request->schema()) : $action->index(AnimeSynonym::query(), $query, $request->schema()); - $collection = new SynonymCollection($videos, $query); - - return $collection->toResponse($request); + return new SynonymCollection($videos, $query); } /** @@ -61,15 +58,13 @@ class SynonymController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return SynonymResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): SynonymResource { $synonym = $action->store(AnimeSynonym::query(), $request->validated()); - $resource = new SynonymResource($synonym, new Query()); - - return $resource->toResponse($request); + return new SynonymResource($synonym, new Query()); } /** @@ -78,17 +73,15 @@ class SynonymController extends BaseController * @param ShowRequest $request * @param AnimeSynonym $animesynonym * @param ShowAction $action - * @return JsonResponse + * @return SynonymResource */ - public function show(ShowRequest $request, AnimeSynonym $animesynonym, ShowAction $action): JsonResponse + public function show(ShowRequest $request, AnimeSynonym $animesynonym, ShowAction $action): SynonymResource { $query = new Query($request->validated()); $show = $action->show($animesynonym, $query, $request->schema()); - $resource = new SynonymResource($show, $query); - - return $resource->toResponse($request); + return new SynonymResource($show, $query); } /** @@ -97,49 +90,41 @@ class SynonymController extends BaseController * @param UpdateRequest $request * @param AnimeSynonym $animesynonym * @param UpdateAction $action - * @return JsonResponse + * @return SynonymResource */ - public function update(UpdateRequest $request, AnimeSynonym $animesynonym, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, AnimeSynonym $animesynonym, UpdateAction $action): SynonymResource { $updated = $action->update($animesynonym, $request->validated()); - $resource = new SynonymResource($updated, new Query()); - - return $resource->toResponse($request); + return new SynonymResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param AnimeSynonym $animesynonym * @param DestroyAction $action - * @return JsonResponse + * @return SynonymResource */ - public function destroy(Request $request, AnimeSynonym $animesynonym, DestroyAction $action): JsonResponse + public function destroy(AnimeSynonym $animesynonym, DestroyAction $action): SynonymResource { $deleted = $action->destroy($animesynonym); - $resource = new SynonymResource($deleted, new Query()); - - return $resource->toResponse($request); + return new SynonymResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param AnimeSynonym $animesynonym * @param RestoreAction $action - * @return JsonResponse + * @return SynonymResource */ - public function restore(Request $request, AnimeSynonym $animesynonym, RestoreAction $action): JsonResponse + public function restore(AnimeSynonym $animesynonym, RestoreAction $action): SynonymResource { $restored = $action->restore($animesynonym); - $resource = new SynonymResource($restored, new Query()); - - return $resource->toResponse($request); + return new SynonymResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/Anime/Theme/EntryController.php b/app/Http/Controllers/Api/Wiki/Anime/Theme/EntryController.php index ce15d84cf..0923f5fea 100644 --- a/app/Http/Controllers/Api/Wiki/Anime/Theme/EntryController.php +++ b/app/Http/Controllers/Api/Wiki/Anime/Theme/EntryController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Anime\Theme\Collection\EntryCollection; use App\Http\Resources\Wiki\Anime\Theme\Resource\EntryResource; use App\Models\Wiki\Anime\Theme\AnimeThemeEntry; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class EntryController. @@ -41,9 +40,9 @@ class EntryController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return EntryCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): EntryCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class EntryController extends BaseController ? $action->search($query, $request->schema()) : $action->index(AnimeThemeEntry::query(), $query, $request->schema()); - $collection = new EntryCollection($videos, $query); - - return $collection->toResponse($request); + return new EntryCollection($videos, $query); } /** @@ -61,15 +58,13 @@ class EntryController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return EntryResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): EntryResource { $entry = $action->store(AnimeThemeEntry::query(), $request->validated()); - $resource = new EntryResource($entry, new Query()); - - return $resource->toResponse($request); + return new EntryResource($entry, new Query()); } /** @@ -78,17 +73,15 @@ class EntryController extends BaseController * @param ShowRequest $request * @param AnimeThemeEntry $animethemeentry * @param ShowAction $action - * @return JsonResponse + * @return EntryResource */ - public function show(ShowRequest $request, AnimeThemeEntry $animethemeentry, ShowAction $action): JsonResponse + public function show(ShowRequest $request, AnimeThemeEntry $animethemeentry, ShowAction $action): EntryResource { $query = new Query($request->validated()); $show = $action->show($animethemeentry, $query, $request->schema()); - $resource = new EntryResource($show, $query); - - return $resource->toResponse($request); + return new EntryResource($show, $query); } /** @@ -97,49 +90,41 @@ class EntryController extends BaseController * @param UpdateRequest $request * @param AnimeThemeEntry $animethemeentry * @param UpdateAction $action - * @return JsonResponse + * @return EntryResource */ - public function update(UpdateRequest $request, AnimeThemeEntry $animethemeentry, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, AnimeThemeEntry $animethemeentry, UpdateAction $action): EntryResource { $updated = $action->update($animethemeentry, $request->validated()); - $resource = new EntryResource($updated, new Query()); - - return $resource->toResponse($request); + return new EntryResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param AnimeThemeEntry $animethemeentry * @param DestroyAction $action - * @return JsonResponse + * @return EntryResource */ - public function destroy(Request $request, AnimeThemeEntry $animethemeentry, DestroyAction $action): JsonResponse + public function destroy(AnimeThemeEntry $animethemeentry, DestroyAction $action): EntryResource { $deleted = $action->destroy($animethemeentry); - $resource = new EntryResource($deleted, new Query()); - - return $resource->toResponse($request); + return new EntryResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param AnimeThemeEntry $animethemeentry * @param RestoreAction $action - * @return JsonResponse + * @return EntryResource */ - public function restore(Request $request, AnimeThemeEntry $animethemeentry, RestoreAction $action): JsonResponse + public function restore(AnimeThemeEntry $animethemeentry, RestoreAction $action): EntryResource { $restored = $action->restore($animethemeentry); - $resource = new EntryResource($restored, new Query()); - - return $resource->toResponse($request); + return new EntryResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/Anime/ThemeController.php b/app/Http/Controllers/Api/Wiki/Anime/ThemeController.php index c4c798b82..f8bae7ea3 100644 --- a/app/Http/Controllers/Api/Wiki/Anime/ThemeController.php +++ b/app/Http/Controllers/Api/Wiki/Anime/ThemeController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Anime\Collection\ThemeCollection; use App\Http\Resources\Wiki\Anime\Resource\ThemeResource; use App\Models\Wiki\Anime\AnimeTheme; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class ThemeController. @@ -41,9 +40,9 @@ class ThemeController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ThemeCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ThemeCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class ThemeController extends BaseController ? $action->search($query, $request->schema()) : $action->index(AnimeTheme::query(), $query, $request->schema()); - $collection = new ThemeCollection($videos, $query); - - return $collection->toResponse($request); + return new ThemeCollection($videos, $query); } /** @@ -61,15 +58,13 @@ class ThemeController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return ThemeResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): ThemeResource { $theme = $action->store(AnimeTheme::query(), $request->validated()); - $resource = new ThemeResource($theme, new Query()); - - return $resource->toResponse($request); + return new ThemeResource($theme, new Query()); } /** @@ -78,17 +73,15 @@ class ThemeController extends BaseController * @param ShowRequest $request * @param AnimeTheme $animetheme * @param ShowAction $action - * @return JsonResponse + * @return ThemeResource */ - public function show(ShowRequest $request, AnimeTheme $animetheme, ShowAction $action): JsonResponse + public function show(ShowRequest $request, AnimeTheme $animetheme, ShowAction $action): ThemeResource { $query = new Query($request->validated()); $show = $action->show($animetheme, $query, $request->schema()); - $resource = new ThemeResource($show, $query); - - return $resource->toResponse($request); + return new ThemeResource($show, $query); } /** @@ -97,49 +90,41 @@ class ThemeController extends BaseController * @param UpdateRequest $request * @param AnimeTheme $animetheme * @param UpdateAction $action - * @return JsonResponse + * @return ThemeResource */ - public function update(UpdateRequest $request, AnimeTheme $animetheme, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, AnimeTheme $animetheme, UpdateAction $action): ThemeResource { $updated = $action->update($animetheme, $request->validated()); - $resource = new ThemeResource($updated, new Query()); - - return $resource->toResponse($request); + return new ThemeResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param AnimeTheme $animetheme * @param DestroyAction $action - * @return JsonResponse + * @return ThemeResource */ - public function destroy(Request $request, AnimeTheme $animetheme, DestroyAction $action): JsonResponse + public function destroy(AnimeTheme $animetheme, DestroyAction $action): ThemeResource { $deleted = $action->destroy($animetheme); - $resource = new ThemeResource($deleted, new Query()); - - return $resource->toResponse($request); + return new ThemeResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param AnimeTheme $animetheme * @param RestoreAction $action - * @return JsonResponse + * @return ThemeResource */ - public function restore(Request $request, AnimeTheme $animetheme, RestoreAction $action): JsonResponse + public function restore(AnimeTheme $animetheme, RestoreAction $action): ThemeResource { $restored = $action->restore($animetheme); - $resource = new ThemeResource($restored, new Query()); - - return $resource->toResponse($request); + return new ThemeResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/AnimeController.php b/app/Http/Controllers/Api/Wiki/AnimeController.php index 064c369fb..fb60ccff3 100644 --- a/app/Http/Controllers/Api/Wiki/AnimeController.php +++ b/app/Http/Controllers/Api/Wiki/AnimeController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\AnimeCollection; use App\Http\Resources\Wiki\Resource\AnimeResource; use App\Models\Wiki\Anime; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class AnimeController. @@ -41,9 +40,9 @@ class AnimeController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AnimeCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AnimeCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class AnimeController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Anime::query(), $query, $request->schema()); - $collection = new AnimeCollection($anime, $query); - - return $collection->toResponse($request); + return new AnimeCollection($anime, $query); } /** @@ -61,15 +58,13 @@ class AnimeController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return AnimeResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): AnimeResource { $anime = $action->store(Anime::query(), $request->validated()); - $resource = new AnimeResource($anime, new Query()); - - return $resource->toResponse($request); + return new AnimeResource($anime, new Query()); } /** @@ -78,17 +73,15 @@ class AnimeController extends BaseController * @param ShowRequest $request * @param Anime $anime * @param ShowAction $action - * @return JsonResponse + * @return AnimeResource */ - public function show(ShowRequest $request, Anime $anime, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Anime $anime, ShowAction $action): AnimeResource { $query = new Query($request->validated()); $show = $action->show($anime, $query, $request->schema()); - $resource = new AnimeResource($show, $query); - - return $resource->toResponse($request); + return new AnimeResource($show, $query); } /** @@ -97,49 +90,41 @@ class AnimeController extends BaseController * @param UpdateRequest $request * @param Anime $anime * @param UpdateAction $action - * @return JsonResponse + * @return AnimeResource */ - public function update(UpdateRequest $request, Anime $anime, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Anime $anime, UpdateAction $action): AnimeResource { $updated = $action->update($anime, $request->validated()); - $resource = new AnimeResource($updated, new Query()); - - return $resource->toResponse($request); + return new AnimeResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Anime $anime * @param DestroyAction $action - * @return JsonResponse + * @return AnimeResource */ - public function destroy(Request $request, Anime $anime, DestroyAction $action): JsonResponse + public function destroy(Anime $anime, DestroyAction $action): AnimeResource { $deleted = $action->destroy($anime); - $resource = new AnimeResource($deleted, new Query()); - - return $resource->toResponse($request); + return new AnimeResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Anime $anime * @param RestoreAction $action - * @return JsonResponse + * @return AnimeResource */ - public function restore(Request $request, Anime $anime, RestoreAction $action): JsonResponse + public function restore(Anime $anime, RestoreAction $action): AnimeResource { $restored = $action->restore($anime); - $resource = new AnimeResource($restored, new Query()); - - return $resource->toResponse($request); + return new AnimeResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/ArtistController.php b/app/Http/Controllers/Api/Wiki/ArtistController.php index 430a9ecbe..918e3ca49 100644 --- a/app/Http/Controllers/Api/Wiki/ArtistController.php +++ b/app/Http/Controllers/Api/Wiki/ArtistController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\ArtistCollection; use App\Http\Resources\Wiki\Resource\ArtistResource; use App\Models\Wiki\Artist; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class ArtistController. @@ -41,9 +40,9 @@ class ArtistController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ArtistCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ArtistCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class ArtistController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Artist::query(), $query, $request->schema()); - $collection = new ArtistCollection($artists, $query); - - return $collection->toResponse($request); + return new ArtistCollection($artists, $query); } /** @@ -61,15 +58,13 @@ class ArtistController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return ArtistResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): ArtistResource { $artist = $action->store(Artist::query(), $request->validated()); - $resource = new ArtistResource($artist, new Query()); - - return $resource->toResponse($request); + return new ArtistResource($artist, new Query()); } /** @@ -78,17 +73,15 @@ class ArtistController extends BaseController * @param ShowRequest $request * @param Artist $artist * @param ShowAction $action - * @return JsonResponse + * @return ArtistResource */ - public function show(ShowRequest $request, Artist $artist, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Artist $artist, ShowAction $action): ArtistResource { $query = new Query($request->validated()); $show = $action->show($artist, $query, $request->schema()); - $resource = new ArtistResource($show, $query); - - return $resource->toResponse($request); + return new ArtistResource($show, $query); } /** @@ -97,49 +90,41 @@ class ArtistController extends BaseController * @param UpdateRequest $request * @param Artist $artist * @param UpdateAction $action - * @return JsonResponse + * @return ArtistResource */ - public function update(UpdateRequest $request, Artist $artist, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Artist $artist, UpdateAction $action): ArtistResource { $updated = $action->update($artist, $request->validated()); - $resource = new ArtistResource($updated, new Query()); - - return $resource->toResponse($request); + return new ArtistResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Artist $artist * @param DestroyAction $action - * @return JsonResponse + * @return ArtistResource */ - public function destroy(Request $request, Artist $artist, DestroyAction $action): JsonResponse + public function destroy(Artist $artist, DestroyAction $action): ArtistResource { $deleted = $action->destroy($artist); - $resource = new ArtistResource($deleted, new Query()); - - return $resource->toResponse($request); + return new ArtistResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Artist $artist * @param RestoreAction $action - * @return JsonResponse + * @return ArtistResource */ - public function restore(Request $request, Artist $artist, RestoreAction $action): JsonResponse + public function restore(Artist $artist, RestoreAction $action): ArtistResource { $restored = $action->restore($artist); - $resource = new ArtistResource($restored, new Query()); - - return $resource->toResponse($request); + return new ArtistResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/AudioController.php b/app/Http/Controllers/Api/Wiki/AudioController.php index 97ed0fcee..60d239826 100644 --- a/app/Http/Controllers/Api/Wiki/AudioController.php +++ b/app/Http/Controllers/Api/Wiki/AudioController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\AudioCollection; use App\Http\Resources\Wiki\Resource\AudioResource; use App\Models\Wiki\Audio; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class AudioController. @@ -41,17 +40,15 @@ class AudioController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return AudioCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): AudioCollection { $query = new Query($request->validated()); $audios = $action->index(Audio::query(), $query, $request->schema()); - $collection = new AudioCollection($audios, $query); - - return $collection->toResponse($request); + return new AudioCollection($audios, $query); } /** @@ -59,15 +56,13 @@ class AudioController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return AudioResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): AudioResource { $audio = $action->store(Audio::query(), $request->validated()); - $resource = new AudioResource($audio, new Query()); - - return $resource->toResponse($request); + return new AudioResource($audio, new Query()); } /** @@ -76,17 +71,15 @@ class AudioController extends BaseController * @param ShowRequest $request * @param Audio $audio * @param ShowAction $action - * @return JsonResponse + * @return AudioResource */ - public function show(ShowRequest $request, Audio $audio, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Audio $audio, ShowAction $action): AudioResource { $query = new Query($request->validated()); $show = $action->show($audio, $query, $request->schema()); - $resource = new AudioResource($show, $query); - - return $resource->toResponse($request); + return new AudioResource($show, $query); } /** @@ -95,49 +88,41 @@ class AudioController extends BaseController * @param UpdateRequest $request * @param Audio $audio * @param UpdateAction $action - * @return JsonResponse + * @return AudioResource */ - public function update(UpdateRequest $request, Audio $audio, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Audio $audio, UpdateAction $action): AudioResource { $updated = $action->update($audio, $request->validated()); - $resource = new AudioResource($updated, new Query()); - - return $resource->toResponse($request); + return new AudioResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Audio $audio * @param DestroyAction $action - * @return JsonResponse + * @return AudioResource */ - public function destroy(Request $request, Audio $audio, DestroyAction $action): JsonResponse + public function destroy(Audio $audio, DestroyAction $action): AudioResource { $deleted = $action->destroy($audio); - $resource = new AudioResource($deleted, new Query()); - - return $resource->toResponse($request); + return new AudioResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Audio $audio * @param RestoreAction $action - * @return JsonResponse + * @return AudioResource */ - public function restore(Request $request, Audio $audio, RestoreAction $action): JsonResponse + public function restore(Audio $audio, RestoreAction $action): AudioResource { $restored = $action->restore($audio); - $resource = new AudioResource($restored, new Query()); - - return $resource->toResponse($request); + return new AudioResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/ExternalResourceController.php b/app/Http/Controllers/Api/Wiki/ExternalResourceController.php index e2e5ee2db..86d6f38be 100644 --- a/app/Http/Controllers/Api/Wiki/ExternalResourceController.php +++ b/app/Http/Controllers/Api/Wiki/ExternalResourceController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\ExternalResourceCollection; use App\Http\Resources\Wiki\Resource\ExternalResourceResource; use App\Models\Wiki\ExternalResource; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class ExternalResourceController. @@ -41,17 +40,15 @@ class ExternalResourceController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ExternalResourceCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ExternalResourceCollection { $query = new Query($request->validated()); $resources = $action->index(ExternalResource::query(), $query, $request->schema()); - $collection = new ExternalResourceCollection($resources, $query); - - return $collection->toResponse($request); + return new ExternalResourceCollection($resources, $query); } /** @@ -59,15 +56,13 @@ class ExternalResourceController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return ExternalResourceResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): ExternalResourceResource { $externalResource = $action->store(ExternalResource::query(), $request->validated()); - $resource = new ExternalResourceResource($externalResource, new Query()); - - return $resource->toResponse($request); + return new ExternalResourceResource($externalResource, new Query()); } /** @@ -76,17 +71,15 @@ class ExternalResourceController extends BaseController * @param ShowRequest $request * @param ExternalResource $resource * @param ShowAction $action - * @return JsonResponse + * @return ExternalResourceResource */ - public function show(ShowRequest $request, ExternalResource $resource, ShowAction $action): JsonResponse + public function show(ShowRequest $request, ExternalResource $resource, ShowAction $action): ExternalResourceResource { $query = new Query($request->validated()); $show = $action->show($resource, $query, $request->schema()); - $resource = new ExternalResourceResource($show, $query); - - return $resource->toResponse($request); + return new ExternalResourceResource($show, $query); } /** @@ -95,49 +88,41 @@ class ExternalResourceController extends BaseController * @param UpdateRequest $request * @param ExternalResource $resource * @param UpdateAction $action - * @return JsonResponse + * @return ExternalResourceResource */ - public function update(UpdateRequest $request, ExternalResource $resource, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, ExternalResource $resource, UpdateAction $action): ExternalResourceResource { $updated = $action->update($resource, $request->validated()); - $apiResource = new ExternalResourceResource($updated, new Query()); - - return $apiResource->toResponse($request); + return new ExternalResourceResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param ExternalResource $resource * @param DestroyAction $action - * @return JsonResponse + * @return ExternalResourceResource */ - public function destroy(Request $request, ExternalResource $resource, DestroyAction $action): JsonResponse + public function destroy(ExternalResource $resource, DestroyAction $action): ExternalResourceResource { $deleted = $action->destroy($resource); - $apiResource = new ExternalResourceResource($deleted, new Query()); - - return $apiResource->toResponse($request); + return new ExternalResourceResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param ExternalResource $resource * @param RestoreAction $action - * @return JsonResponse + * @return ExternalResourceResource */ - public function restore(Request $request, ExternalResource $resource, RestoreAction $action): JsonResponse + public function restore(ExternalResource $resource, RestoreAction $action): ExternalResourceResource { $restored = $action->restore($resource); - $apiResource = new ExternalResourceResource($restored, new Query()); - - return $apiResource->toResponse($request); + return new ExternalResourceResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/ImageController.php b/app/Http/Controllers/Api/Wiki/ImageController.php index 83292ee0b..f266413ab 100644 --- a/app/Http/Controllers/Api/Wiki/ImageController.php +++ b/app/Http/Controllers/Api/Wiki/ImageController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\ImageCollection; use App\Http\Resources\Wiki\Resource\ImageResource; use App\Models\Wiki\Image; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class ImageController. @@ -41,17 +40,15 @@ class ImageController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ImageCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ImageCollection { $query = new Query($request->validated()); $images = $action->index(Image::query(), $query, $request->schema()); - $collection = new ImageCollection($images, $query); - - return $collection->toResponse($request); + return new ImageCollection($images, $query); } /** @@ -59,15 +56,13 @@ class ImageController extends BaseController * * @param StoreRequest $request * @param StoreImageAction $action - * @return JsonResponse + * @return ImageResource */ - public function store(StoreRequest $request, StoreImageAction $action): JsonResponse + public function store(StoreRequest $request, StoreImageAction $action): ImageResource { $image = $action->store(Image::query(), $request->validated()); - $resource = new ImageResource($image, new Query()); - - return $resource->toResponse($request); + return new ImageResource($image, new Query()); } /** @@ -76,17 +71,15 @@ class ImageController extends BaseController * @param ShowRequest $request * @param Image $image * @param ShowAction $action - * @return JsonResponse + * @return ImageResource */ - public function show(ShowRequest $request, Image $image, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Image $image, ShowAction $action): ImageResource { $query = new Query($request->validated()); $show = $action->show($image, $query, $request->schema()); - $resource = new ImageResource($show, $query); - - return $resource->toResponse($request); + return new ImageResource($show, $query); } /** @@ -95,49 +88,41 @@ class ImageController extends BaseController * @param UpdateRequest $request * @param Image $image * @param UpdateAction $action - * @return JsonResponse + * @return ImageResource */ - public function update(UpdateRequest $request, Image $image, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Image $image, UpdateAction $action): ImageResource { $updated = $action->update($image, $request->validated()); - $resource = new ImageResource($updated, new Query()); - - return $resource->toResponse($request); + return new ImageResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Image $image * @param DestroyAction $action - * @return JsonResponse + * @return ImageResource */ - public function destroy(Request $request, Image $image, DestroyAction $action): JsonResponse + public function destroy(Image $image, DestroyAction $action): ImageResource { $deleted = $action->destroy($image); - $resource = new ImageResource($deleted, new Query()); - - return $resource->toResponse($request); + return new ImageResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Image $image * @param RestoreAction $action - * @return JsonResponse + * @return ImageResource */ - public function restore(Request $request, Image $image, RestoreAction $action): JsonResponse + public function restore(Image $image, RestoreAction $action): ImageResource { $restored = $action->restore($image); - $resource = new ImageResource($restored, new Query()); - - return $resource->toResponse($request); + return new ImageResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/SeriesController.php b/app/Http/Controllers/Api/Wiki/SeriesController.php index f3137a1d2..e7175b90c 100644 --- a/app/Http/Controllers/Api/Wiki/SeriesController.php +++ b/app/Http/Controllers/Api/Wiki/SeriesController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\SeriesCollection; use App\Http\Resources\Wiki\Resource\SeriesResource; use App\Models\Wiki\Series; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class SeriesController. @@ -41,9 +40,9 @@ class SeriesController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return SeriesCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): SeriesCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class SeriesController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Series::query(), $query, $request->schema()); - $collection = new SeriesCollection($series, $query); - - return $collection->toResponse($request); + return new SeriesCollection($series, $query); } /** @@ -61,15 +58,13 @@ class SeriesController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return SeriesResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): SeriesResource { $series = $action->store(Series::query(), $request->validated()); - $resource = new SeriesResource($series, new Query()); - - return $resource->toResponse($request); + return new SeriesResource($series, new Query()); } /** @@ -78,17 +73,15 @@ class SeriesController extends BaseController * @param ShowRequest $request * @param Series $series * @param ShowAction $action - * @return JsonResponse + * @return SeriesResource */ - public function show(ShowRequest $request, Series $series, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Series $series, ShowAction $action): SeriesResource { $query = new Query($request->validated()); $show = $action->show($series, $query, $request->schema()); - $resource = new SeriesResource($show, $query); - - return $resource->toResponse($request); + return new SeriesResource($show, $query); } /** @@ -97,49 +90,41 @@ class SeriesController extends BaseController * @param UpdateRequest $request * @param Series $series * @param UpdateAction $action - * @return JsonResponse + * @return SeriesResource */ - public function update(UpdateRequest $request, Series $series, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Series $series, UpdateAction $action): SeriesResource { $updated = $action->update($series, $request->validated()); - $resource = new SeriesResource($updated, new Query()); - - return $resource->toResponse($request); + return new SeriesResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Series $series * @param DestroyAction $action - * @return JsonResponse + * @return SeriesResource */ - public function destroy(Request $request, Series $series, DestroyAction $action): JsonResponse + public function destroy(Series $series, DestroyAction $action): SeriesResource { $deleted = $action->destroy($series); - $resource = new SeriesResource($deleted, new Query()); - - return $resource->toResponse($request); + return new SeriesResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Series $series * @param RestoreAction $action - * @return JsonResponse + * @return SeriesResource */ - public function restore(Request $request, Series $series, RestoreAction $action): JsonResponse + public function restore(Series $series, RestoreAction $action): SeriesResource { $restored = $action->restore($series); - $resource = new SeriesResource($restored, new Query()); - - return $resource->toResponse($request); + return new SeriesResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/SongController.php b/app/Http/Controllers/Api/Wiki/SongController.php index 852ea8f20..db9835f9d 100644 --- a/app/Http/Controllers/Api/Wiki/SongController.php +++ b/app/Http/Controllers/Api/Wiki/SongController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\SongCollection; use App\Http\Resources\Wiki\Resource\SongResource; use App\Models\Wiki\Song; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class SongController. @@ -41,9 +40,9 @@ class SongController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return SongCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): SongCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class SongController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Song::query(), $query, $request->schema()); - $collection = new SongCollection($songs, $query); - - return $collection->toResponse($request); + return new SongCollection($songs, $query); } /** @@ -61,15 +58,13 @@ class SongController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return SongResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): SongResource { $song = $action->store(Song::query(), $request->validated()); - $resource = new SongResource($song, new Query()); - - return $resource->toResponse($request); + return new SongResource($song, new Query()); } /** @@ -78,17 +73,15 @@ class SongController extends BaseController * @param ShowRequest $request * @param Song $song * @param ShowAction $action - * @return JsonResponse + * @return SongResource */ - public function show(ShowRequest $request, Song $song, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Song $song, ShowAction $action): SongResource { $query = new Query($request->validated()); $show = $action->show($song, $query, $request->schema()); - $resource = new SongResource($show, $query); - - return $resource->toResponse($request); + return new SongResource($show, $query); } /** @@ -97,49 +90,41 @@ class SongController extends BaseController * @param UpdateRequest $request * @param Song $song * @param UpdateAction $action - * @return JsonResponse + * @return SongResource */ - public function update(UpdateRequest $request, Song $song, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Song $song, UpdateAction $action): SongResource { $updated = $action->update($song, $request->validated()); - $resource = new SongResource($updated, new Query()); - - return $resource->toResponse($request); + return new SongResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Song $song * @param DestroyAction $action - * @return JsonResponse + * @return SongResource */ - public function destroy(Request $request, Song $song, DestroyAction $action): JsonResponse + public function destroy(Song $song, DestroyAction $action): SongResource { $deleted = $action->destroy($song); - $resource = new SongResource($deleted, new Query()); - - return $resource->toResponse($request); + return new SongResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Song $song * @param RestoreAction $action - * @return JsonResponse + * @return SongResource */ - public function restore(Request $request, Song $song, RestoreAction $action): JsonResponse + public function restore(Song $song, RestoreAction $action): SongResource { $restored = $action->restore($song); - $resource = new SongResource($restored, new Query()); - - return $resource->toResponse($request); + return new SongResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/StudioController.php b/app/Http/Controllers/Api/Wiki/StudioController.php index c12888f52..1bac89990 100644 --- a/app/Http/Controllers/Api/Wiki/StudioController.php +++ b/app/Http/Controllers/Api/Wiki/StudioController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\StudioCollection; use App\Http\Resources\Wiki\Resource\StudioResource; use App\Models\Wiki\Studio; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class StudioController. @@ -41,9 +40,9 @@ class StudioController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return StudioCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): StudioCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class StudioController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Studio::query(), $query, $request->schema()); - $collection = new StudioCollection($studios, $query); - - return $collection->toResponse($request); + return new StudioCollection($studios, $query); } /** @@ -61,15 +58,13 @@ class StudioController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return StudioResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): StudioResource { $studio = $action->store(Studio::query(), $request->validated()); - $resource = new StudioResource($studio, new Query()); - - return $resource->toResponse($request); + return new StudioResource($studio, new Query()); } /** @@ -78,17 +73,15 @@ class StudioController extends BaseController * @param ShowRequest $request * @param Studio $studio * @param ShowAction $action - * @return JsonResponse + * @return StudioResource */ - public function show(ShowRequest $request, Studio $studio, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Studio $studio, ShowAction $action): StudioResource { $query = new Query($request->validated()); $show = $action->show($studio, $query, $request->schema()); - $resource = new StudioResource($show, $query); - - return $resource->toResponse($request); + return new StudioResource($show, $query); } /** @@ -97,49 +90,41 @@ class StudioController extends BaseController * @param UpdateRequest $request * @param Studio $studio * @param UpdateAction $action - * @return JsonResponse + * @return StudioResource */ - public function update(UpdateRequest $request, Studio $studio, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Studio $studio, UpdateAction $action): StudioResource { $updated = $action->update($studio, $request->validated()); - $resource = new StudioResource($updated, new Query()); - - return $resource->toResponse($request); + return new StudioResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Studio $studio * @param DestroyAction $action - * @return JsonResponse + * @return StudioResource */ - public function destroy(Request $request, Studio $studio, DestroyAction $action): JsonResponse + public function destroy(Studio $studio, DestroyAction $action): StudioResource { $deleted = $action->destroy($studio); - $resource = new StudioResource($deleted, new Query()); - - return $resource->toResponse($request); + return new StudioResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Studio $studio * @param RestoreAction $action - * @return JsonResponse + * @return StudioResource */ - public function restore(Request $request, Studio $studio, RestoreAction $action): JsonResponse + public function restore(Studio $studio, RestoreAction $action): StudioResource { $restored = $action->restore($studio); - $resource = new StudioResource($restored, new Query()); - - return $resource->toResponse($request); + return new StudioResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/Video/ScriptController.php b/app/Http/Controllers/Api/Wiki/Video/ScriptController.php index f4a742370..0608c2e27 100644 --- a/app/Http/Controllers/Api/Wiki/Video/ScriptController.php +++ b/app/Http/Controllers/Api/Wiki/Video/ScriptController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Video\Collection\ScriptCollection; use App\Http\Resources\Wiki\Video\Resource\ScriptResource; use App\Models\Wiki\Video\VideoScript; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class ScriptController. @@ -41,17 +40,15 @@ class ScriptController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return ScriptCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): ScriptCollection { $query = new Query($request->validated()); $resources = $action->index(VideoScript::query(), $query, $request->schema()); - $collection = new ScriptCollection($resources, $query); - - return $collection->toResponse($request); + return new ScriptCollection($resources, $query); } /** @@ -59,15 +56,13 @@ class ScriptController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return ScriptResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): ScriptResource { $script = $action->store(VideoScript::query(), $request->validated()); - $resource = new ScriptResource($script, new Query()); - - return $resource->toResponse($request); + return new ScriptResource($script, new Query()); } /** @@ -76,17 +71,15 @@ class ScriptController extends BaseController * @param ShowRequest $request * @param VideoScript $videoscript * @param ShowAction $action - * @return JsonResponse + * @return ScriptResource */ - public function show(ShowRequest $request, VideoScript $videoscript, ShowAction $action): JsonResponse + public function show(ShowRequest $request, VideoScript $videoscript, ShowAction $action): ScriptResource { $query = new Query($request->validated()); $show = $action->show($videoscript, $query, $request->schema()); - $resource = new ScriptResource($show, $query); - - return $resource->toResponse($request); + return new ScriptResource($show, $query); } /** @@ -95,49 +88,41 @@ class ScriptController extends BaseController * @param UpdateRequest $request * @param VideoScript $videoscript * @param UpdateAction $action - * @return JsonResponse + * @return ScriptResource */ - public function update(UpdateRequest $request, VideoScript $videoscript, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, VideoScript $videoscript, UpdateAction $action): ScriptResource { $updated = $action->update($videoscript, $request->validated()); - $resource = new ScriptResource($updated, new Query()); - - return $resource->toResponse($request); + return new ScriptResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param VideoScript $videoscript * @param DestroyAction $action - * @return JsonResponse + * @return ScriptResource */ - public function destroy(Request $request, VideoScript $videoscript, DestroyAction $action): JsonResponse + public function destroy(VideoScript $videoscript, DestroyAction $action): ScriptResource { $deleted = $action->destroy($videoscript); - $resource = new ScriptResource($deleted, new Query()); - - return $resource->toResponse($request); + return new ScriptResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param VideoScript $videoscript * @param RestoreAction $action - * @return JsonResponse + * @return ScriptResource */ - public function restore(Request $request, VideoScript $videoscript, RestoreAction $action): JsonResponse + public function restore(VideoScript $videoscript, RestoreAction $action): ScriptResource { $restored = $action->restore($videoscript); - $resource = new ScriptResource($restored, new Query()); - - return $resource->toResponse($request); + return new ScriptResource($restored, new Query()); } /** diff --git a/app/Http/Controllers/Api/Wiki/VideoController.php b/app/Http/Controllers/Api/Wiki/VideoController.php index a68fe131f..2d821837d 100644 --- a/app/Http/Controllers/Api/Wiki/VideoController.php +++ b/app/Http/Controllers/Api/Wiki/VideoController.php @@ -21,7 +21,6 @@ use App\Http\Resources\Wiki\Collection\VideoCollection; use App\Http\Resources\Wiki\Resource\VideoResource; use App\Models\Wiki\Video; use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; /** * Class VideoController. @@ -41,9 +40,9 @@ class VideoController extends BaseController * * @param IndexRequest $request * @param IndexAction $action - * @return JsonResponse + * @return VideoCollection */ - public function index(IndexRequest $request, IndexAction $action): JsonResponse + public function index(IndexRequest $request, IndexAction $action): VideoCollection { $query = new Query($request->validated()); @@ -51,9 +50,7 @@ class VideoController extends BaseController ? $action->search($query, $request->schema()) : $action->index(Video::query(), $query, $request->schema()); - $collection = new VideoCollection($videos, $query); - - return $collection->toResponse($request); + return new VideoCollection($videos, $query); } /** @@ -61,15 +58,13 @@ class VideoController extends BaseController * * @param StoreRequest $request * @param StoreAction $action - * @return JsonResponse + * @return VideoResource */ - public function store(StoreRequest $request, StoreAction $action): JsonResponse + public function store(StoreRequest $request, StoreAction $action): VideoResource { $video = $action->store(Video::query(), $request->validated()); - $resource = new VideoResource($video, new Query()); - - return $resource->toResponse($request); + return new VideoResource($video, new Query()); } /** @@ -78,17 +73,15 @@ class VideoController extends BaseController * @param ShowRequest $request * @param Video $video * @param ShowAction $action - * @return JsonResponse + * @return VideoResource */ - public function show(ShowRequest $request, Video $video, ShowAction $action): JsonResponse + public function show(ShowRequest $request, Video $video, ShowAction $action): VideoResource { $query = new Query($request->validated()); $show = $action->show($video, $query, $request->schema()); - $resource = new VideoResource($show, $query); - - return $resource->toResponse($request); + return new VideoResource($show, $query); } /** @@ -97,49 +90,41 @@ class VideoController extends BaseController * @param UpdateRequest $request * @param Video $video * @param UpdateAction $action - * @return JsonResponse + * @return VideoResource */ - public function update(UpdateRequest $request, Video $video, UpdateAction $action): JsonResponse + public function update(UpdateRequest $request, Video $video, UpdateAction $action): VideoResource { $updated = $action->update($video, $request->validated()); - $resource = new VideoResource($updated, new Query()); - - return $resource->toResponse($request); + return new VideoResource($updated, new Query()); } /** * Remove the specified resource. * - * @param Request $request * @param Video $video * @param DestroyAction $action - * @return JsonResponse + * @return VideoResource */ - public function destroy(Request $request, Video $video, DestroyAction $action): JsonResponse + public function destroy(Video $video, DestroyAction $action): VideoResource { $deleted = $action->destroy($video); - $resource = new VideoResource($deleted, new Query()); - - return $resource->toResponse($request); + return new VideoResource($deleted, new Query()); } /** * Restore the specified resource. * - * @param Request $request * @param Video $video * @param RestoreAction $action - * @return JsonResponse + * @return VideoResource */ - public function restore(Request $request, Video $video, RestoreAction $action): JsonResponse + public function restore(Video $video, RestoreAction $action): VideoResource { $restored = $action->restore($video); - $resource = new VideoResource($restored, new Query()); - - return $resource->toResponse($request); + return new VideoResource($restored, new Query()); } /**