Release 3.5.0

UPGRADE.md

@@ -13,6 +13,14 @@ 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, as opposed to app/Athenia/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`.
+
+This version also updates the file `code/app/Athenia/Mail/MessageMailer.php` to take in from information out of config.
+
+This version also fixes a deprecation warning from a recent PHPUnit update. This again will be resolved mostly by syncing the code directory.
+
 # 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.

code/app/Athenia/Http/Core/Controllers/Article/ArticleVersionControllerAbstract.php

@@ -36,23 +36,23 @@ 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));
     }
 
     /**
      * 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();
 

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));
     }

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());
     }

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();
 

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();
 

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));
     }

code/app/Athenia/Http/Core/Controllers/CategoryControllerAbstract.php

@@ -35,33 +35,33 @@ 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));
     }
 
     /**
      * 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));
     }
 
     /**
      * 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,23 +70,23 @@ 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());
     }
 
     /**
      * 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);

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);

code/app/Athenia/Http/Core/Controllers/CollectionControllerAbstract.php

@@ -23,35 +23,35 @@ 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));
     }
 
     /**
      * 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());
     }
 
     /**
      * 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);

code/app/Athenia/Http/Core/Controllers/CollectionItemControllerAbstract.php

@@ -22,23 +22,23 @@ 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));
     }
 
     /**
      * 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);

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,25 +94,25 @@ 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());
     }
 
     /**
      * 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);