diff --git a/UPGRADE.md b/UPGRADE.md index cccbcbb6..8afe539f 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -13,6 +13,11 @@ The fastest way to upgrade is to run the following commands from your repos root After that, you always want to make sure you inspect all changes, and you still want to go through the change log to check for moved files and deleted files, as rsync cannot check for deleted files, since it would delete any files created for the child application. +# 3.5.0 + +This version rearranges all requests to make sure they are easy to modify going forward. After rsync is ran, make sure to inspect all request changes to identify any customizations previously made. All of those customizations should now be put into the new Requests structure in app/Http/Core/Requests. The request code/app/Athenia/Http/Core/Requests/MembershipPlan/RetrieveRequest.php and code/app/Athenia/Http/Core/Requests/Organization/RetrieveRequest.php should both be deleted after rsync as those have been renamed to `ViewRequest`. + + # 3.4.0 This update adds some miscellaneous changes as well as updating the environment to php 8.4. It also updates the dependencies to use laravel 11, which has resulted in the generators package to be removed from the base service provider. After updating the Athenia files above, make sure to update the following files. diff --git a/code/app/Athenia/Http/Core/Controllers/Article/ArticleVersionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Article/ArticleVersionControllerAbstract.php index a76dc09e..66c07883 100644 --- a/code/app/Athenia/Http/Core/Controllers/Article/ArticleVersionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Article/ArticleVersionControllerAbstract.php @@ -36,11 +36,11 @@ public function __construct(ArticleVersionRepositoryContract $repository) /** * Loads all created version for the related article * - * @param \App\Athenia\Http\Core\Requests\Article\ArticleVersion\IndexRequest $request + * @param Requests\Article\ArticleVersion\IndexRequest $request * @param Article $article * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Article\ArticleVersion\IndexRequest $request, Article $article) + public function index(Requests\Article\ArticleVersion\IndexRequest $request, Article $article) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$article], (int)$request->input('page', 1)); } @@ -48,11 +48,11 @@ public function index(\App\Athenia\Http\Core\Requests\Article\ArticleVersion\Ind /** * Creates a new article version * - * @param \App\Athenia\Http\Core\Requests\Article\ArticleVersion\StoreRequest $request + * @param Requests\Article\ArticleVersion\StoreRequest $request * @param Article $article * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Article\ArticleVersion\StoreRequest $request, Article $article) : JsonResponse + public function store(Requests\Article\ArticleVersion\StoreRequest $request, Article $article) : JsonResponse { $data = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/Article/IterationControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Article/IterationControllerAbstract.php index 79266e9b..b3aa2195 100644 --- a/code/app/Athenia/Http/Core/Controllers/Article/IterationControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Article/IterationControllerAbstract.php @@ -93,11 +93,11 @@ public function __construct(ArticleIterationRepositoryContract $repository) * } * ) * - * @param \App\Athenia\Http\Core\Requests\Article\Iteration\IndexRequest $request + * @param Requests\Article\Iteration\IndexRequest $request * @param Article $article * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Article\Iteration\IndexRequest $request, Article $article) + public function index(Requests\Article\Iteration\IndexRequest $request, Article $article) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$article], (int)$request->input('page', 1)); } diff --git a/code/app/Athenia/Http/Core/Controllers/ArticleControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/ArticleControllerAbstract.php index 098441a9..9f953357 100644 --- a/code/app/Athenia/Http/Core/Controllers/ArticleControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/ArticleControllerAbstract.php @@ -88,10 +88,10 @@ public function __construct(ArticleRepositoryContract $repository) * } * ) * - * @param \App\Athenia\Http\Core\Requests\Article\IndexRequest $request + * @param Requests\Article\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Article\IndexRequest $request) + public function index(Requests\Article\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } @@ -145,11 +145,11 @@ public function index(\App\Athenia\Http\Core\Requests\Article\IndexRequest $requ * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Article\ViewRequest $request + * @param Requests\Article\ViewRequest $request * @param Article $article * @return Article */ - public function show(\App\Athenia\Http\Core\Requests\Article\ViewRequest $request, Article $article) + public function show(Requests\Article\ViewRequest $request, Article $article) { return $article->load($this->expand($request)); } @@ -198,10 +198,10 @@ public function show(\App\Athenia\Http\Core\Requests\Article\ViewRequest $reques * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Article\StoreRequest $request + * @param Requests\Article\StoreRequest $request * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Article\StoreRequest $request) + public function store(Requests\Article\StoreRequest $request) { $user = Auth::user(); $data = $request->json()->all(); @@ -267,11 +267,11 @@ public function store(\App\Athenia\Http\Core\Requests\Article\StoreRequest $requ * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Article\UpdateRequest $request + * @param Requests\Article\UpdateRequest $request * @param Article $article * @return Article|BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Article\UpdateRequest $request, Article $article) + public function update(Requests\Article\UpdateRequest $request, Article $article) { return $this->repository->update($article, $request->json()->all()); } diff --git a/code/app/Athenia/Http/Core/Controllers/AuthenticationControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/AuthenticationControllerAbstract.php index 299543fc..f43e283b 100644 --- a/code/app/Athenia/Http/Core/Controllers/AuthenticationControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/AuthenticationControllerAbstract.php @@ -120,11 +120,11 @@ public function __construct(UserRepositoryContract $userRepository, Hasher $hash * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Authentication\LoginRequest $request + * @param Requests\Authentication\LoginRequest $request * @return JsonResponse * @throws JWTException */ - public function login(\App\Athenia\Http\Core\Requests\Authentication\LoginRequest $request) + public function login(Requests\Authentication\LoginRequest $request) { $credentials = $request->only('email', 'password'); if (! $token = $this->auth->attempt($credentials)) { @@ -236,10 +236,10 @@ public function refresh(Request $request) * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Authentication\SignUpRequest $request + * @param Requests\Authentication\SignUpRequest $request * @return JsonResponse */ - public function signUp(\App\Athenia\Http\Core\Requests\Authentication\SignUpRequest $request) + public function signUp(Requests\Authentication\SignUpRequest $request) { $data = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/Ballot/BallotCompletionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Ballot/BallotCompletionControllerAbstract.php index f20f2c5c..c7d6f362 100644 --- a/code/app/Athenia/Http/Core/Controllers/Ballot/BallotCompletionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Ballot/BallotCompletionControllerAbstract.php @@ -31,11 +31,11 @@ public function __construct(BallotCompletionRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\Ballot\BallotCompletion\StoreRequest $request + * @param Requests\Ballot\BallotCompletion\StoreRequest $request * @param Ballot $ballot * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Ballot\BallotCompletion\StoreRequest $request, Ballot $ballot) + public function store(Requests\Ballot\BallotCompletion\StoreRequest $request, Ballot $ballot) { $data = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/BallotControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/BallotControllerAbstract.php index 50a64013..2eec0533 100644 --- a/code/app/Athenia/Http/Core/Controllers/BallotControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/BallotControllerAbstract.php @@ -31,11 +31,11 @@ public function __construct(BallotRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\Ballot\ViewRequest $request + * @param Requests\Ballot\ViewRequest $request * @param Ballot $ballot * @return Ballot */ - public function show(\App\Athenia\Http\Core\Requests\Ballot\ViewRequest $request, Ballot $ballot) + public function show(Requests\Ballot\ViewRequest $request, Ballot $ballot) { return $ballot->load($this->expand($request)); } diff --git a/code/app/Athenia/Http/Core/Controllers/CategoryControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/CategoryControllerAbstract.php index d149ade3..df17c2d4 100644 --- a/code/app/Athenia/Http/Core/Controllers/CategoryControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/CategoryControllerAbstract.php @@ -35,10 +35,10 @@ public function __construct(CategoryRepositoryContract $repository) /** * Display a listing of the resource. * - * @param \App\Athenia\Http\Core\Requests\Category\IndexRequest $request + * @param Requests\Category\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Category\IndexRequest $request) + public function index(Requests\Category\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } @@ -46,11 +46,11 @@ public function index(\App\Athenia\Http\Core\Requests\Category\IndexRequest $req /** * Display the specified resource. * - * @param \App\Athenia\Http\Core\Requests\Category\ViewRequest $request + * @param Requests\Category\ViewRequest $request * @param Category $model * @return Category */ - public function show(\App\Athenia\Http\Core\Requests\Category\ViewRequest $request, Category $model) + public function show(Requests\Category\ViewRequest $request, Category $model) { return $model->load($this->expand($request)); } @@ -58,10 +58,10 @@ public function show(\App\Athenia\Http\Core\Requests\Category\ViewRequest $reque /** * Store a newly created resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Category\StoreRequest $request + * @param Requests\Category\StoreRequest $request * @return Category */ - public function store(\App\Athenia\Http\Core\Requests\Category\StoreRequest $request) + public function store(Requests\Category\StoreRequest $request) { $model = $this->repository->create($request->json()->all()); return response($model, 201); @@ -70,11 +70,11 @@ public function store(\App\Athenia\Http\Core\Requests\Category\StoreRequest $req /** * Update the specified resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Category\UpdateRequest $request + * @param Requests\Category\UpdateRequest $request * @param Category $membershipPlan * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Category\UpdateRequest $request, Category $membershipPlan) + public function update(Requests\Category\UpdateRequest $request, Category $membershipPlan) { return $this->repository->update($membershipPlan, $request->json()->all()); } @@ -82,11 +82,11 @@ public function update(\App\Athenia\Http\Core\Requests\Category\UpdateRequest $r /** * Remove the specified resource from storage. * - * @param \App\Athenia\Http\Core\Requests\Category\DeleteRequest $request + * @param Requests\Category\DeleteRequest $request * @param Category $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\Category\DeleteRequest $request, Category $model) + public function destroy(Requests\Category\DeleteRequest $request, Category $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/Collection/CollectionItemControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Collection/CollectionItemControllerAbstract.php index 9bce135b..05a27b7b 100644 --- a/code/app/Athenia/Http/Core/Controllers/Collection/CollectionItemControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Collection/CollectionItemControllerAbstract.php @@ -27,21 +27,21 @@ public function __construct(protected CollectionItemRepositoryContract $reposito {} /** - * @param \App\Athenia\Http\Core\Requests\Collection\CollectionItem\IndexRequest $request + * @param Requests\Collection\CollectionItem\IndexRequest $request * @param Collection $collection * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Collection\CollectionItem\IndexRequest $request, Collection $collection) + public function index(Requests\Collection\CollectionItem\IndexRequest $request, Collection $collection) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$collection], (int)$request->input('page', 1)); } /** - * @param \App\Athenia\Http\Core\Requests\Collection\CollectionItem\StoreRequest $request + * @param Requests\Collection\CollectionItem\StoreRequest $request * @param Collection $collection * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Collection\CollectionItem\StoreRequest $request, Collection $collection) : JsonResponse + public function store(Requests\Collection\CollectionItem\StoreRequest $request, Collection $collection) : JsonResponse { $data = $request->json()->all(); return new JsonResponse($this->repository->create($data, $collection), 201); diff --git a/code/app/Athenia/Http/Core/Controllers/CollectionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/CollectionControllerAbstract.php index 06a34029..cbb7dfbb 100644 --- a/code/app/Athenia/Http/Core/Controllers/CollectionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/CollectionControllerAbstract.php @@ -23,11 +23,11 @@ public function __construct(protected CollectionRepositoryContract $repository) /** * Display the specified resource. * - * @param \App\Athenia\Http\Core\Requests\Collection\ViewRequest $request + * @param Requests\Collection\ViewRequest $request * @param Collection $model * @return Category */ - public function show(\App\Athenia\Http\Core\Requests\Collection\ViewRequest $request, Collection $model) + public function show(Requests\Collection\ViewRequest $request, Collection $model) { return $model->load($this->expand($request)); } @@ -35,11 +35,11 @@ public function show(\App\Athenia\Http\Core\Requests\Collection\ViewRequest $req /** * Update the specified resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Collection\UpdateRequest $request + * @param Requests\Collection\UpdateRequest $request * @param Collection $model * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Collection\UpdateRequest $request, Collection $model) + public function update(Requests\Collection\UpdateRequest $request, Collection $model) { return $this->repository->update($model, $request->json()->all()); } @@ -47,11 +47,11 @@ public function update(\App\Athenia\Http\Core\Requests\Collection\UpdateRequest /** * Remove the specified resource from storage. * - * @param \App\Athenia\Http\Core\Requests\Collection\DeleteRequest $request + * @param Requests\Collection\DeleteRequest $request * @param Collection $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\Collection\DeleteRequest $request, Collection $model) + public function destroy(Requests\Collection\DeleteRequest $request, Collection $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/CollectionItemControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/CollectionItemControllerAbstract.php index b1e93362..c420d087 100644 --- a/code/app/Athenia/Http/Core/Controllers/CollectionItemControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/CollectionItemControllerAbstract.php @@ -22,11 +22,11 @@ public function __construct(protected CollectionItemRepositoryContract $reposito /** * Display the specified resource. * - * @param \App\Athenia\Http\Core\Requests\CollectionItem\ViewRequest $request + * @param Requests\CollectionItem\ViewRequest $request * @param CollectionItem $model * @return Category */ - public function show(\App\Athenia\Http\Core\Requests\CollectionItem\ViewRequest $request, CollectionItem $model) + public function show(Requests\CollectionItem\ViewRequest $request, CollectionItem $model) { return $model->load($this->expand($request)); } @@ -34,11 +34,11 @@ public function show(\App\Athenia\Http\Core\Requests\CollectionItem\ViewRequest /** * Remove the specified resource from storage. * - * @param \App\Athenia\Http\Core\Requests\CollectionItem\DeleteRequest $request + * @param Requests\CollectionItem\DeleteRequest $request * @param CollectionItem $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\CollectionItem\DeleteRequest $request, CollectionItem $model) + public function destroy(Requests\CollectionItem\DeleteRequest $request, CollectionItem $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/AssetControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/AssetControllerAbstract.php index b397246a..5291f676 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/AssetControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/AssetControllerAbstract.php @@ -48,11 +48,11 @@ public function __construct(AssetRepositoryContract $repository, MimeTypes $mime /** * Gets all assets for a user * - * @param \App\Athenia\Http\Core\Requests\Entity\Asset\IndexRequest $request + * @param Requests\Entity\Asset\IndexRequest $request * @param IsAnEntityContract $entity * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Entity\Asset\IndexRequest $request, IsAnEntityContract $entity) + public function index(Requests\Entity\Asset\IndexRequest $request, IsAnEntityContract $entity) { $filter = $this->filter($request); @@ -73,11 +73,11 @@ public function index(\App\Athenia\Http\Core\Requests\Entity\Asset\IndexRequest /** * Creates the new asset for us * - * @param \App\Athenia\Http\Core\Requests\Entity\Asset\StoreRequest $request + * @param Requests\Entity\Asset\StoreRequest $request * @param IsAnEntityContract $entity * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Entity\Asset\StoreRequest $request, IsAnEntityContract $entity) + public function store(Requests\Entity\Asset\StoreRequest $request, IsAnEntityContract $entity) { $data = $request->json()->all(); @@ -94,12 +94,12 @@ public function store(\App\Athenia\Http\Core\Requests\Entity\Asset\StoreRequest /** * Updates an asset properly * - * @param \App\Athenia\Http\Core\Requests\Entity\Asset\UpdateRequest $request + * @param Requests\Entity\Asset\UpdateRequest $request * @param IsAnEntityContract $entity * @param Asset $asset * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Entity\Asset\UpdateRequest $request, IsAnEntityContract $entity, Asset $asset) + public function update(Requests\Entity\Asset\UpdateRequest $request, IsAnEntityContract $entity, Asset $asset) { return $this->repository->update($asset, $request->json()->all()); } @@ -107,12 +107,12 @@ public function update(\App\Athenia\Http\Core\Requests\Entity\Asset\UpdateReques /** * Deletes an asset from the server * - * @param \App\Athenia\Http\Core\Requests\Entity\Asset\DeleteRequest $request + * @param Requests\Entity\Asset\DeleteRequest $request * @param IsAnEntityContract $entity * @param Asset $asset * @return ResponseFactory|Response */ - public function destroy(\App\Athenia\Http\Core\Requests\Entity\Asset\DeleteRequest $request, IsAnEntityContract $entity, Asset $asset) + public function destroy(Requests\Entity\Asset\DeleteRequest $request, IsAnEntityContract $entity, Asset $asset) { $this->repository->delete($asset); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/CollectionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/CollectionControllerAbstract.php index 1dad6891..b3001eae 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/CollectionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/CollectionControllerAbstract.php @@ -30,11 +30,11 @@ public function __construct(protected CollectionRepositoryContract $repository) {} /** - * @param \App\Athenia\Http\Core\Requests\Entity\Collection\IndexRequest $request + * @param Requests\Entity\Collection\IndexRequest $request * @param User $user * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Entity\Collection\IndexRequest $request, IsAnEntityContract $entity) + public function index(Requests\Entity\Collection\IndexRequest $request, IsAnEntityContract $entity) { $filter = $this->filter($request); @@ -64,11 +64,11 @@ public function index(\App\Athenia\Http\Core\Requests\Entity\Collection\IndexReq } /** - * @param \App\Athenia\Http\Core\Requests\Entity\Collection\StoreRequest $request + * @param Requests\Entity\Collection\StoreRequest $request * @param User $user * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Entity\Collection\StoreRequest $request, IsAnEntityContract $entity) : JsonResponse + public function store(Requests\Entity\Collection\StoreRequest $request, IsAnEntityContract $entity) : JsonResponse { $data = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/PaymentControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/PaymentControllerAbstract.php index 78788dc2..f2651db1 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/PaymentControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/PaymentControllerAbstract.php @@ -34,11 +34,11 @@ public function __construct(PaymentRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\Entity\Payment\IndexRequest $request + * @param Requests\Entity\Payment\IndexRequest $request * @param IsAnEntityContract $entity * @return LengthAwarePaginator|Collection */ - public function index(\App\Athenia\Http\Core\Requests\Entity\Payment\IndexRequest $request, IsAnEntityContract $entity) + public function index(Requests\Entity\Payment\IndexRequest $request, IsAnEntityContract $entity) { $filter = $this->filter($request); diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/PaymentMethodControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/PaymentMethodControllerAbstract.php index 6453bfe7..f1da5039 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/PaymentMethodControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/PaymentMethodControllerAbstract.php @@ -94,11 +94,11 @@ public function __construct(PaymentMethodRepositoryContract $repository, * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Entity\PaymentMethod\StoreRequest $request + * @param Requests\Entity\PaymentMethod\StoreRequest $request * @param IsAnEntityContract $entity * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Entity\PaymentMethod\StoreRequest $request, IsAnEntityContract $entity) + public function store(Requests\Entity\PaymentMethod\StoreRequest $request, IsAnEntityContract $entity) { $data = $request->json()->all(); @@ -107,12 +107,12 @@ public function store(\App\Athenia\Http\Core\Requests\Entity\PaymentMethod\Store } /** - * @param \App\Athenia\Http\Core\Requests\Entity\PaymentMethod\UpdateRequest $request + * @param Requests\Entity\PaymentMethod\UpdateRequest $request * @param IsAnEntityContract $entity * @param PaymentMethod $paymentMethod * @return \App\Athenia\Models\BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Entity\PaymentMethod\UpdateRequest $request, IsAnEntityContract $entity, PaymentMethod $paymentMethod) + public function update(Requests\Entity\PaymentMethod\UpdateRequest $request, IsAnEntityContract $entity, PaymentMethod $paymentMethod) { $data = $request->json()->all(); @@ -175,12 +175,12 @@ public function update(\App\Athenia\Http\Core\Requests\Entity\PaymentMethod\Upda * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Entity\PaymentMethod\DeleteRequest $request + * @param Requests\Entity\PaymentMethod\DeleteRequest $request * @param IsAnEntityContract $entity * @param PaymentMethod $paymentMethod * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\Entity\PaymentMethod\DeleteRequest $request, IsAnEntityContract $entity, PaymentMethod $paymentMethod) + public function destroy(Requests\Entity\PaymentMethod\DeleteRequest $request, IsAnEntityContract $entity, PaymentMethod $paymentMethod) { $this->repository->delete($paymentMethod); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/ProfileImageControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/ProfileImageControllerAbstract.php index 94944842..e3e6c0ee 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/ProfileImageControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/ProfileImageControllerAbstract.php @@ -89,11 +89,11 @@ public function __construct(ProfileImageRepositoryContract $repository, MimeType * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Entity\ProfileImage\StoreRequest $request + * @param Requests\Entity\ProfileImage\StoreRequest $request * @param IsAnEntityContract $entity * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Entity\ProfileImage\StoreRequest $request, IsAnEntityContract $entity) + public function store(Requests\Entity\ProfileImage\StoreRequest $request, IsAnEntityContract $entity) { $data = []; diff --git a/code/app/Athenia/Http/Core/Controllers/Entity/SubscriptionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Entity/SubscriptionControllerAbstract.php index ea92b740..c305c7a7 100644 --- a/code/app/Athenia/Http/Core/Controllers/Entity/SubscriptionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Entity/SubscriptionControllerAbstract.php @@ -48,11 +48,11 @@ public function __construct(SubscriptionRepositoryContract $repository, /** * Gets all assets for a user * - * @param \App\Athenia\Http\Core\Requests\Entity\Subscription\IndexRequest $request + * @param Requests\Entity\Subscription\IndexRequest $request * @param IsAnEntityContract $entity * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Entity\Subscription\IndexRequest $request, IsAnEntityContract $entity) + public function index(Requests\Entity\Subscription\IndexRequest $request, IsAnEntityContract $entity) { $filter = $this->filter($request); @@ -122,11 +122,11 @@ public function index(\App\Athenia\Http\Core\Requests\Entity\Subscription\IndexR * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Entity\Subscription\StoreRequest $request + * @param Requests\Entity\Subscription\StoreRequest $request * @param IsAnEntityContract $entity * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\Entity\Subscription\StoreRequest $request, IsAnEntityContract $entity) + public function store(Requests\Entity\Subscription\StoreRequest $request, IsAnEntityContract $entity) { $model = $this->entitySubscriptionCreationService->createSubscription($entity, $request->json()->all()); return new JsonResponse($model, 201); @@ -196,12 +196,12 @@ public function store(\App\Athenia\Http\Core\Requests\Entity\Subscription\StoreR * ), * ) * - * @param \App\Athenia\Http\Core\Requests\Entity\Subscription\UpdateRequest $request + * @param Requests\Entity\Subscription\UpdateRequest $request * @param IsAnEntityContract $entity * @param Subscription $subscription * @return Subscription|BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Entity\Subscription\UpdateRequest $request, IsAnEntityContract $entity, Subscription $subscription) + public function update(Requests\Entity\Subscription\UpdateRequest $request, IsAnEntityContract $entity, Subscription $subscription) { $data = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/FeatureControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/FeatureControllerAbstract.php index e0db64a5..d617da5e 100644 --- a/code/app/Athenia/Http/Core/Controllers/FeatureControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/FeatureControllerAbstract.php @@ -34,10 +34,10 @@ public function __construct(FeatureRepositoryContract $repository) /** * Display a listing of the resource. * - * @param \App\Athenia\Http\Core\Requests\Feature\IndexRequest $request + * @param Requests\Feature\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Feature\IndexRequest $request) + public function index(Requests\Feature\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } @@ -45,11 +45,11 @@ public function index(\App\Athenia\Http\Core\Requests\Feature\IndexRequest $requ /** * Display the specified resource. * - * @param \App\Athenia\Http\Core\Requests\Feature\ViewRequest $request + * @param Requests\Feature\ViewRequest $request * @param Feature $model * @return Feature */ - public function show(\App\Athenia\Http\Core\Requests\Feature\ViewRequest $request, Feature $model) + public function show(Requests\Feature\ViewRequest $request, Feature $model) { return $model->load($this->expand($request)); } diff --git a/code/app/Athenia/Http/Core/Controllers/ForgotPasswordControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/ForgotPasswordControllerAbstract.php index 065f5c71..5f0acf63 100644 --- a/code/app/Athenia/Http/Core/Controllers/ForgotPasswordControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/ForgotPasswordControllerAbstract.php @@ -80,10 +80,10 @@ public function __construct(UserRepositoryContract $userRepository, * ), * ) * - * @param \App\Athenia\Http\Core\Requests\ForgotPassword\ForgotPasswordRequest $request + * @param Requests\ForgotPassword\ForgotPasswordRequest $request * @return JsonResponse */ - public function forgotPassword(\App\Athenia\Http\Core\Requests\ForgotPassword\ForgotPasswordRequest $request) + public function forgotPassword(Requests\ForgotPassword\ForgotPasswordRequest $request) { $user = $this->userRepository->findByEmail($request->input('email')); @@ -152,10 +152,10 @@ public function forgotPassword(\App\Athenia\Http\Core\Requests\ForgotPassword\Fo * ), * ) * - * @param \App\Athenia\Http\Core\Requests\ForgotPassword\ResetPasswordRequest $request + * @param Requests\ForgotPassword\ResetPasswordRequest $request * @return JsonResponse */ - public function resetPassword(\App\Athenia\Http\Core\Requests\ForgotPassword\ResetPasswordRequest $request) + public function resetPassword(Requests\ForgotPassword\ResetPasswordRequest $request) { $user = $this->userRepository->findByEmail($request->input('email')); diff --git a/code/app/Athenia/Http/Core/Controllers/MembershipPlan/MembershipPlanRateControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/MembershipPlan/MembershipPlanRateControllerAbstract.php index 031213a0..0fb926fe 100644 --- a/code/app/Athenia/Http/Core/Controllers/MembershipPlan/MembershipPlanRateControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/MembershipPlan/MembershipPlanRateControllerAbstract.php @@ -34,11 +34,11 @@ public function __construct(MembershipPlanRateRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\MembershipPlanRate\IndexRequest $request + * @param Requests\MembershipPlan\MembershipPlanRate\IndexRequest $request * @param MembershipPlan $membershipPlan * @return LengthAwarePaginator|Collection */ - public function index(\App\Athenia\Http\Core\Requests\MembershipPlan\MembershipPlanRate\IndexRequest $request, MembershipPlan $membershipPlan) + public function index(Requests\MembershipPlan\MembershipPlanRate\IndexRequest $request, MembershipPlan $membershipPlan) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$membershipPlan], (int)$request->input('page', 1)); } diff --git a/code/app/Athenia/Http/Core/Controllers/MembershipPlanControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/MembershipPlanControllerAbstract.php index ce70e4ad..1cefb005 100644 --- a/code/app/Athenia/Http/Core/Controllers/MembershipPlanControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/MembershipPlanControllerAbstract.php @@ -96,10 +96,10 @@ public function __construct(MembershipPlanRepositoryContract $repository) * ) * ) * - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\IndexRequest $request + * @param Requests\MembershipPlan\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\MembershipPlan\IndexRequest $request) + public function index(Requests\MembershipPlan\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } @@ -153,11 +153,11 @@ public function index(\App\Athenia\Http\Core\Requests\MembershipPlan\IndexReques * ), * ) * - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\RetrieveRequest $request + * @param Requests\MembershipPlan\ViewRequest $request * @param MembershipPlan $membershipPlan * @return MembershipPlan */ - public function show(\App\Athenia\Http\Core\Requests\MembershipPlan\RetrieveRequest $request, MembershipPlan $membershipPlan) + public function show(Requests\MembershipPlan\ViewRequest $request, MembershipPlan $membershipPlan) { return $membershipPlan->load($this->expand($request)); } @@ -212,10 +212,10 @@ public function show(\App\Athenia\Http\Core\Requests\MembershipPlan\RetrieveRequ * ), * ) * - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\StoreRequest $request + * @param Requests\MembershipPlan\StoreRequest $request * @return MembershipPlan */ - public function store(\App\Athenia\Http\Core\Requests\MembershipPlan\StoreRequest $request) + public function store(Requests\MembershipPlan\StoreRequest $request) { $model = $this->repository->create($request->json()->all()); return response($model, 201)->header('Location', route('v1.membership-plans.show', ['membership_plan' => $model])); @@ -277,11 +277,11 @@ public function store(\App\Athenia\Http\Core\Requests\MembershipPlan\StoreReques * ), * ) * - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\UpdateRequest $request + * @param Requests\MembershipPlan\UpdateRequest $request * @param MembershipPlan $membershipPlan * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\MembershipPlan\UpdateRequest $request, MembershipPlan $membershipPlan) + public function update(Requests\MembershipPlan\UpdateRequest $request, MembershipPlan $membershipPlan) { return $this->repository->update($membershipPlan, $request->json()->all()); } @@ -334,11 +334,11 @@ public function update(\App\Athenia\Http\Core\Requests\MembershipPlan\UpdateRequ * ), * ) * - * @param \App\Athenia\Http\Core\Requests\MembershipPlan\DeleteRequest $request + * @param Requests\MembershipPlan\DeleteRequest $request * @param MembershipPlan $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\MembershipPlan\DeleteRequest $request, MembershipPlan $model) + public function destroy(Requests\MembershipPlan\DeleteRequest $request, MembershipPlan $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/MessageControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/MessageControllerAbstract.php index 255c652d..7e15e182 100644 --- a/code/app/Athenia/Http/Core/Controllers/MessageControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/MessageControllerAbstract.php @@ -4,11 +4,8 @@ namespace App\Athenia\Http\Core\Controllers; use App\Athenia\Contracts\Repositories\Messaging\MessageRepositoryContract; -use App\Athenia\Http\Core\Requests\Message\StoreRequest; -use App\Athenia\Models\BaseModelAbstract; -use App\Athenia\Http\Core\Requests; +use App\Http\Core\Requests; use App\Models\Organization\Organization; -use App\Models\Role; use Illuminate\Support\Facades\Auth; /** @@ -28,7 +25,7 @@ public function __construct( /** * Store a newly created resource in storage. * - * @param StoreRequest $request + * @param Requests\Message\StoreRequest $request * @return Organization */ public function store(Requests\Message\StoreRequest $request) diff --git a/code/app/Athenia/Http/Core/Controllers/Organization/OrganizationManagerControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/Organization/OrganizationManagerControllerAbstract.php index 8b90b670..09bc980d 100644 --- a/code/app/Athenia/Http/Core/Controllers/Organization/OrganizationManagerControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/Organization/OrganizationManagerControllerAbstract.php @@ -58,11 +58,11 @@ public function __construct(OrganizationManagerRepositoryContract $repository, /** * Display a listing of the resource. * - * @param \App\Athenia\Http\Core\Requests\Organization\OrganizationManager\IndexRequest $request + * @param Requests\Organization\OrganizationManager\IndexRequest $request * @param Organization $organization * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Organization\OrganizationManager\IndexRequest $request, Organization $organization) + public function index(Requests\Organization\OrganizationManager\IndexRequest $request, Organization $organization) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$organization], (int)$request->input('page', 1)); } @@ -70,11 +70,11 @@ public function index(\App\Athenia\Http\Core\Requests\Organization\OrganizationM /** * Store a newly created resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\OrganizationManager\StoreRequest $request + * @param Requests\Organization\OrganizationManager\StoreRequest $request * @param Organization $organization * @return OrganizationManager */ - public function store(\App\Athenia\Http\Core\Requests\Organization\OrganizationManager\StoreRequest $request, Organization $organization) + public function store(Requests\Organization\OrganizationManager\StoreRequest $request, Organization $organization) { $data = $request->json()->all(); @@ -102,12 +102,12 @@ public function store(\App\Athenia\Http\Core\Requests\Organization\OrganizationM /** * Update the specified resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\OrganizationManager\UpdateRequest $request + * @param Requests\Organization\OrganizationManager\UpdateRequest $request * @param Organization $organization * @param OrganizationManager $model * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Organization\OrganizationManager\UpdateRequest $request, Organization $organization, OrganizationManager $model) + public function update(Requests\Organization\OrganizationManager\UpdateRequest $request, Organization $organization, OrganizationManager $model) { return $this->repository->update($model, $request->json()->all()); } @@ -115,12 +115,12 @@ public function update(\App\Athenia\Http\Core\Requests\Organization\Organization /** * Remove the specified resource from storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\OrganizationManager\DeleteRequest $request + * @param Requests\Organization\OrganizationManager\DeleteRequest $request * @param Organization $organization * @param OrganizationManager $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\Organization\OrganizationManager\DeleteRequest $request, Organization $organization, OrganizationManager $model) + public function destroy(Requests\Organization\OrganizationManager\DeleteRequest $request, Organization $organization, OrganizationManager $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/OrganizationControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/OrganizationControllerAbstract.php index 18690ac7..1340dfad 100644 --- a/code/app/Athenia/Http/Core/Controllers/OrganizationControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/OrganizationControllerAbstract.php @@ -46,10 +46,10 @@ public function __construct(OrganizationRepositoryContract $repository, /** * Display a listing of the resource. * - * @param \App\Athenia\Http\Core\Requests\Organization\IndexRequest $request + * @param Requests\Organization\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Organization\IndexRequest $request) + public function index(Requests\Organization\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } @@ -57,11 +57,11 @@ public function index(\App\Athenia\Http\Core\Requests\Organization\IndexRequest /** * Display the specified resource. * - * @param \App\Athenia\Http\Core\Requests\Organization\RetrieveRequest $request + * @param Requests\Organization\ViewRequest $request * @param Organization $model * @return Organization */ - public function show(\App\Athenia\Http\Core\Requests\Organization\RetrieveRequest $request, Organization $model) + public function show(Requests\Organization\ViewRequest $request, Organization $model) { return $model->load($this->expand($request)); } @@ -69,10 +69,10 @@ public function show(\App\Athenia\Http\Core\Requests\Organization\RetrieveReques /** * Store a newly created resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\StoreRequest $request + * @param Requests\Organization\StoreRequest $request * @return Organization */ - public function store(\App\Athenia\Http\Core\Requests\Organization\StoreRequest $request) + public function store(Requests\Organization\StoreRequest $request) { $model = $this->repository->create($request->json()->all()); $this->organizationManagerRepository->create([ @@ -86,11 +86,11 @@ public function store(\App\Athenia\Http\Core\Requests\Organization\StoreRequest /** * Update the specified resource in storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\UpdateRequest $request + * @param Requests\Organization\UpdateRequest $request * @param Organization $model * @return BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\Organization\UpdateRequest $request, Organization $model) + public function update(Requests\Organization\UpdateRequest $request, Organization $model) { return $this->repository->update($model, $request->json()->all()); } @@ -98,11 +98,11 @@ public function update(\App\Athenia\Http\Core\Requests\Organization\UpdateReques /** * Remove the specified resource from storage. * - * @param \App\Athenia\Http\Core\Requests\Organization\DeleteRequest $request + * @param Requests\Organization\DeleteRequest $request * @param Organization $model * @return null */ - public function destroy(\App\Athenia\Http\Core\Requests\Organization\DeleteRequest $request, Organization $model) + public function destroy(Requests\Organization\DeleteRequest $request, Organization $model) { $this->repository->delete($model); return response(null, 204); diff --git a/code/app/Athenia/Http/Core/Controllers/ResourceControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/ResourceControllerAbstract.php index 94b8265c..9a5aab22 100644 --- a/code/app/Athenia/Http/Core/Controllers/ResourceControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/ResourceControllerAbstract.php @@ -30,10 +30,10 @@ public function __construct(ResourceRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\Resource\IndexRequest $request + * @param Requests\Resource\IndexRequest $request * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Resource\IndexRequest $request) + public function index(Requests\Resource\IndexRequest $request) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } diff --git a/code/app/Athenia/Http/Core/Controllers/RoleControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/RoleControllerAbstract.php index 27186a7e..797a58ee 100644 --- a/code/app/Athenia/Http/Core/Controllers/RoleControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/RoleControllerAbstract.php @@ -94,10 +94,10 @@ public function __construct(RoleRepositoryContract $roleRepository) * ) * ) * - * @param \App\Athenia\Http\Core\Requests\Role\IndexRequest $request + * @param Requests\Role\IndexRequest $request * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\Role\IndexRequest $request) + public function index(Requests\Role\IndexRequest $request) { return $this->roleRepository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [], (int)$request->input('page', 1)); } diff --git a/code/app/Athenia/Http/Core/Controllers/User/BallotCompletionControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/User/BallotCompletionControllerAbstract.php index 79844150..259a12da 100644 --- a/code/app/Athenia/Http/Core/Controllers/User/BallotCompletionControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/User/BallotCompletionControllerAbstract.php @@ -33,11 +33,11 @@ public function __construct(BallotCompletionRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\User\BallotCompletion\IndexRequest $request + * @param Requests\User\BallotCompletion\IndexRequest $request * @param User $user * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\User\BallotCompletion\IndexRequest $request, User $user) + public function index(Requests\User\BallotCompletion\IndexRequest $request, User $user) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$user], (int)$request->input('page', 1)); } diff --git a/code/app/Athenia/Http/Core/Controllers/User/ContactControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/User/ContactControllerAbstract.php index 6fc8d9e6..83f45772 100644 --- a/code/app/Athenia/Http/Core/Controllers/User/ContactControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/User/ContactControllerAbstract.php @@ -46,21 +46,21 @@ public function __construct(ContactRepositoryContract $repository, Dispatcher $d } /** - * @param \App\Athenia\Http\Core\Requests\User\Contact\IndexRequest $request + * @param Requests\User\Contact\IndexRequest $request * @param User $user * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\User\Contact\IndexRequest $request, User $user) + public function index(Requests\User\Contact\IndexRequest $request, User $user) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$user], (int)$request->input('page', 1)); } /** - * @param \App\Athenia\Http\Core\Requests\User\Contact\StoreRequest $request + * @param Requests\User\Contact\StoreRequest $request * @param User $user * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\User\Contact\StoreRequest $request, User $user) + public function store(Requests\User\Contact\StoreRequest $request, User $user) { $data = $request->json()->all(); @@ -77,13 +77,13 @@ public function store(\App\Athenia\Http\Core\Requests\User\Contact\StoreRequest /** * Updates an event participant, mostly used to link assets * - * @param \App\Athenia\Http\Core\Requests\User\Contact\UpdateRequest $request + * @param Requests\User\Contact\UpdateRequest $request * @param User $user * @param Contact $contact * @return BaseModelAbstract * @throws \Exception */ - public function update(\App\Athenia\Http\Core\Requests\User\Contact\UpdateRequest $request, User $user, Contact $contact) + public function update(Requests\User\Contact\UpdateRequest $request, User $user, Contact $contact) { $requestData = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/User/Thread/MessageControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/User/Thread/MessageControllerAbstract.php index d6f3df4b..38bd8079 100644 --- a/code/app/Athenia/Http/Core/Controllers/User/Thread/MessageControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/User/Thread/MessageControllerAbstract.php @@ -38,12 +38,12 @@ public function __construct(MessageRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\User\Thread\Message\IndexRequest $request + * @param Requests\User\Thread\Message\IndexRequest $request * @param User $user * @param Thread $thread * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\User\Thread\Message\IndexRequest $request, User $user, Thread $thread) + public function index(Requests\User\Thread\Message\IndexRequest $request, User $user, Thread $thread) { $order = $this->order($request); @@ -55,12 +55,12 @@ public function index(\App\Athenia\Http\Core\Requests\User\Thread\Message\IndexR } /** - * @param \App\Athenia\Http\Core\Requests\User\Thread\Message\StoreRequest $request + * @param Requests\User\Thread\Message\StoreRequest $request * @param User $user * @param Thread $thread * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\User\Thread\Message\StoreRequest $request, User $user, Thread $thread) : JsonResponse + public function store(Requests\User\Thread\Message\StoreRequest $request, User $user, Thread $thread) : JsonResponse { $message = $request->json('message'); $data = [ @@ -80,14 +80,14 @@ public function store(\App\Athenia\Http\Core\Requests\User\Thread\Message\StoreR /** * Updates a message, mostly used to set the message as seen * - * @param \App\Athenia\Http\Core\Requests\User\Thread\Message\UpdateRequest $request + * @param Requests\User\Thread\Message\UpdateRequest $request * @param User $user * @param Thread $thread * @param Message $message * @return BaseModelAbstract * @throws \Exception */ - public function update(\App\Athenia\Http\Core\Requests\User\Thread\Message\UpdateRequest $request, User $user, Thread $thread, Message $message) + public function update(Requests\User\Thread\Message\UpdateRequest $request, User $user, Thread $thread, Message $message) { $requestData = $request->json()->all(); diff --git a/code/app/Athenia/Http/Core/Controllers/User/ThreadControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/User/ThreadControllerAbstract.php index c7ca53f8..47f8ef44 100644 --- a/code/app/Athenia/Http/Core/Controllers/User/ThreadControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/User/ThreadControllerAbstract.php @@ -34,21 +34,21 @@ public function __construct(ThreadRepositoryContract $repository) } /** - * @param \App\Athenia\Http\Core\Requests\User\Thread\IndexRequest $request + * @param Requests\User\Thread\IndexRequest $request * @param User $user * @return LengthAwarePaginator */ - public function index(\App\Athenia\Http\Core\Requests\User\Thread\IndexRequest $request, User $user) + public function index(Requests\User\Thread\IndexRequest $request, User $user) { return $this->repository->findAll($this->filter($request), $this->search($request), $this->order($request), $this->expand($request), $this->limit($request), [$user], (int)$request->input('page', 1)); } /** - * @param \App\Athenia\Http\Core\Requests\User\Thread\StoreRequest $request + * @param Requests\User\Thread\StoreRequest $request * @param User $user * @return JsonResponse */ - public function store(\App\Athenia\Http\Core\Requests\User\Thread\StoreRequest $request, User $user) : JsonResponse + public function store(Requests\User\Thread\StoreRequest $request, User $user) : JsonResponse { $data = $request->json()->all(); $data['users'][] = $user->id; diff --git a/code/app/Athenia/Http/Core/Controllers/UserControllerAbstract.php b/code/app/Athenia/Http/Core/Controllers/UserControllerAbstract.php index 9a4f17f1..061450a9 100644 --- a/code/app/Athenia/Http/Core/Controllers/UserControllerAbstract.php +++ b/code/app/Athenia/Http/Core/Controllers/UserControllerAbstract.php @@ -90,11 +90,11 @@ public function __construct(UserRepositoryContract $repository, * ), * ) * - * @param \App\Athenia\Http\Core\Requests\User\ViewRequest $request + * @param Requests\User\ViewRequest $request * @param User $user * @return User */ - public function show(\App\Athenia\Http\Core\Requests\User\ViewRequest $request, User $user) + public function show(Requests\User\ViewRequest $request, User $user) { return $user->load($this->expand($request)); } @@ -155,11 +155,11 @@ public function show(\App\Athenia\Http\Core\Requests\User\ViewRequest $request, * ), * ) * - * @param \App\Athenia\Http\Core\Requests\User\UpdateRequest $request + * @param Requests\User\UpdateRequest $request * @param User $user * @return User|BaseModelAbstract */ - public function update(\App\Athenia\Http\Core\Requests\User\UpdateRequest $request, User $user) + public function update(Requests\User\UpdateRequest $request, User $user) { return $this->repository->update($user, $request->json()->all()); } @@ -205,10 +205,10 @@ public function update(\App\Athenia\Http\Core\Requests\User\UpdateRequest $reque * ), * ) * - * @param \App\Athenia\Http\Core\Requests\User\MeRequest $request + * @param Requests\User\MeRequest $request * @return JsonResponse */ - public function me(\App\Athenia\Http\Core\Requests\User\MeRequest $request) + public function me(Requests\User\MeRequest $request) { /** @var User $user */ $user = auth()->user(); diff --git a/code/app/Athenia/Http/Core/Requests/MembershipPlan/RetrieveRequest.php b/code/app/Athenia/Http/Core/Requests/MembershipPlan/ViewRequest.php similarity index 95% rename from code/app/Athenia/Http/Core/Requests/MembershipPlan/RetrieveRequest.php rename to code/app/Athenia/Http/Core/Requests/MembershipPlan/ViewRequest.php index 71cc7c1f..6e411460 100644 --- a/code/app/Athenia/Http/Core/Requests/MembershipPlan/RetrieveRequest.php +++ b/code/app/Athenia/Http/Core/Requests/MembershipPlan/ViewRequest.php @@ -12,7 +12,7 @@ * Class ViewRequest * @package App\Http\Core\Requests\MembershipPlan */ -class RetrieveRequest extends BaseAuthenticatedRequestAbstract +class ViewRequest extends BaseAuthenticatedRequestAbstract { use HasNoRules; diff --git a/code/app/Athenia/Http/Core/Requests/Organization/RetrieveRequest.php b/code/app/Athenia/Http/Core/Requests/Organization/ViewRequest.php similarity index 96% rename from code/app/Athenia/Http/Core/Requests/Organization/RetrieveRequest.php rename to code/app/Athenia/Http/Core/Requests/Organization/ViewRequest.php index a4232222..2eb9e7a9 100644 --- a/code/app/Athenia/Http/Core/Requests/Organization/RetrieveRequest.php +++ b/code/app/Athenia/Http/Core/Requests/Organization/ViewRequest.php @@ -12,7 +12,7 @@ * Class ViewRequest * @package App\Http\Core\Requests\Organization */ -class RetrieveRequest extends BaseAuthenticatedRequestAbstract +class ViewRequest extends BaseAuthenticatedRequestAbstract { use HasNoRules; diff --git a/code/app/Http/Core/Requests/.gitkeep b/code/app/Http/Core/Requests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/code/app/Http/Core/Requests/Article/ArticleVersion/IndexRequest.php b/code/app/Http/Core/Requests/Article/ArticleVersion/IndexRequest.php new file mode 100644 index 00000000..dd6e8594 --- /dev/null +++ b/code/app/Http/Core/Requests/Article/ArticleVersion/IndexRequest.php @@ -0,0 +1,13 @@ +