diff --git a/app/Console/Commands/MakeApiControllerCommand.php b/app/Console/Commands/MakeApiControllerCommand.php
index 0b0368a9..d2eaa3f7 100644
--- a/app/Console/Commands/MakeApiControllerCommand.php
+++ b/app/Console/Commands/MakeApiControllerCommand.php
@@ -36,7 +36,7 @@ class MakeApiControllerCommand extends GeneratorCommand
     /**
      * Create a new command instance.
      *
-     * @param Filesystem $file
+     * @param  Filesystem  $file
      */
     public function __construct(Filesystem $file)
     {
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
index e51cd18f..21b97a1c 100644
--- a/app/Http/Controllers/Api/ApiController.php
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -72,8 +72,9 @@ public function __construct()
     /**
      * Display a listing of the resource.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
+     *
      * @throws \Illuminate\Validation\ValidationException
      */
     public function index(Request $request)
@@ -128,7 +129,7 @@ public function store()
     /**
      * Display the specified resource.
      *
-     * @param int $id
+     * @param  int  $id
      * @return JsonResource
      */
     public function show($id)
@@ -143,7 +144,7 @@ public function show($id)
     /**
      * Update the specified resource in storage.
      *
-     * @param int $id
+     * @param  int  $id
      * @return JsonResource
      */
     public function update($id)
@@ -162,7 +163,7 @@ public function update($id)
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int $id
+     * @param  int  $id
      * @return \Illuminate\Http\Response
      */
     public function destroy($id)
diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php
index 19129159..df880ae3 100644
--- a/app/Http/Controllers/Api/OrderController.php
+++ b/app/Http/Controllers/Api/OrderController.php
@@ -82,7 +82,7 @@ public function destroyRequest()
     /**
      * Create an Order, which requires adding one or more Items to the Order.
      *
-     * @param Request $request
+     * @param  Request  $request
      * @return Response
      */
     public function storeOrder(StoreOrder $request)
@@ -114,7 +114,7 @@ public function storeOrder(StoreOrder $request)
     /**
      * Add one or more Items to an existing Order.
      *
-     * @param UpdateOrder $request
+     * @param  UpdateOrder  $request
      * @return Response
      */
     public function addItems(UpdateOrder $request)
@@ -146,7 +146,7 @@ public function addItems(UpdateOrder $request)
     /**
      * Remove one or more Items from an existing Order.
      *
-     * @param UpdateOrder $request
+     * @param  UpdateOrder  $request
      * @return Response
      */
     public function removeItems(UpdateOrder $request)
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index b7763ef8..dec6a6cc 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -16,8 +16,8 @@ public function all()
     }
 
     /**
-     * @param int $limit
-     * @param int|null $paginate
+     * @param  int  $limit
+     * @param  int|null  $paginate
      * @return mixed
      */
     public function limit(int $limit, int $paginate = null)
@@ -35,7 +35,7 @@ public function limit(int $limit, int $paginate = null)
     }
 
     /**
-     * @param int $paginate
+     * @param  int  $paginate
      * @return mixed
      */
     public function paginate(int $paginate)
@@ -45,6 +45,7 @@ public function paginate(int $paginate)
 
     /**
      * @return object
+     *
      * @throws \ReflectionException
      */
     public function new()
diff --git a/app/Repositories/CountryRepository.php b/app/Repositories/CountryRepository.php
index be2ec046..a11148c7 100644
--- a/app/Repositories/CountryRepository.php
+++ b/app/Repositories/CountryRepository.php
@@ -8,12 +8,12 @@
 class CountryRepository extends BaseRepository implements CountryRepositoryInterface
 {
     /**
-     * @var  string
+     * @var string
      */
     protected $class = Country::class;
 
     /**
-     * @var  Country
+     * @var Country
      */
     protected $country;
 
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 25f879a0..2a9df3c6 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -32,9 +32,9 @@ class UserRepository extends CrudRepository implements UserRepositoryInterface
     /**
      * UserRepository constructor.
      *
-     * @param User $user
-     * @param AccountRepositoryInterface $account
-     * @param Hasher $hasher
+     * @param  User  $user
+     * @param  AccountRepositoryInterface  $account
+     * @param  Hasher  $hasher
      */
     public function __construct(
         User $user,
diff --git a/composer.lock b/composer.lock
index a981497f..97e7c15e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -957,16 +957,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.7.0",
+            "version": "1.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
-                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
                 "shasum": ""
             },
             "require": {
@@ -991,25 +991,46 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
                 },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
                 {
                     "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
                     "homepage": "https://github.com/Tobion"
                 }
             ],
@@ -1026,9 +1047,23 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.7.0"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
             },
-            "time": "2020-09-30T07:37:11+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-03-20T21:51:18+00:00"
         },
         {
             "name": "indiehd/velkart",
@@ -9106,5 +9141,5 @@
         "php": "^7.3|^8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/config/cartalyst.sentinel.php b/config/cartalyst.sentinel.php
index 2d528a8b..a3795e7f 100644
--- a/config/cartalyst.sentinel.php
+++ b/config/cartalyst.sentinel.php
@@ -11,9 +11,11 @@
  * bundled with this package in the LICENSE file.
  *
  * @version    2.0.17
+ *
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
  * @copyright  (c) 2011-2017, Cartalyst LLC
+ *
  * @link       http://cartalyst.com
  */
 
diff --git a/tests/Feature/Controllers/FeaturedControllerTest.php b/tests/Feature/Controllers/FeaturedControllerTest.php
index 9e478e9a..503a549b 100644
--- a/tests/Feature/Controllers/FeaturedControllerTest.php
+++ b/tests/Feature/Controllers/FeaturedControllerTest.php
@@ -70,7 +70,7 @@ protected function getJsonStructure()
     /**
      * Create an Artist.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Artist
      */
     protected function createArtist(array $properties = [])
@@ -81,7 +81,7 @@ protected function createArtist(array $properties = [])
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
diff --git a/tests/Feature/Controllers/OrderControllerTest.php b/tests/Feature/Controllers/OrderControllerTest.php
index bd374965..9d2f5618 100644
--- a/tests/Feature/Controllers/OrderControllerTest.php
+++ b/tests/Feature/Controllers/OrderControllerTest.php
@@ -317,7 +317,7 @@ protected function createUser()
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
@@ -367,7 +367,7 @@ protected function createSong()
     /**
      * Make an Order Item.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\DigitalAsset
      */
     protected function makeOrderItem($properties = [])
diff --git a/tests/Feature/Featured/FeaturedArtisanCommandTest.php b/tests/Feature/Featured/FeaturedArtisanCommandTest.php
index 4b838fef..c83db90a 100644
--- a/tests/Feature/Featured/FeaturedArtisanCommandTest.php
+++ b/tests/Feature/Featured/FeaturedArtisanCommandTest.php
@@ -107,7 +107,7 @@ public function testWhenCalledFeatureArtisanCommandFeaturesExpectedEntities()
     /**
      * Create an Artist.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Artist
      */
     protected function createArtist(array $properties = [])
@@ -118,7 +118,7 @@ protected function createArtist(array $properties = [])
     /**
      * Create an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function createAlbum(array $properties = [])
@@ -133,7 +133,7 @@ protected function createAlbum(array $properties = [])
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
@@ -148,7 +148,7 @@ protected function makeAlbum(array $properties = [])
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbumWithSongs(array $properties = [])
diff --git a/tests/Feature/Featured/FeaturedArtistEligibilityTest.php b/tests/Feature/Featured/FeaturedArtistEligibilityTest.php
index 71064b55..c6b5b4e5 100644
--- a/tests/Feature/Featured/FeaturedArtistEligibilityTest.php
+++ b/tests/Feature/Featured/FeaturedArtistEligibilityTest.php
@@ -176,7 +176,7 @@ public function testFeaturableResultsMatchExpected()
     /**
      * Create an Artist.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Artist
      */
     protected function createArtist(array $properties = [])
@@ -187,7 +187,7 @@ protected function createArtist(array $properties = [])
     /**
      * Create an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function createAlbum(array $properties = [])
@@ -202,7 +202,7 @@ protected function createAlbum(array $properties = [])
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
@@ -217,7 +217,7 @@ protected function makeAlbum(array $properties = [])
     /**
      * Make a Digital Asset.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\DigitalAsset
      */
     protected function makeDigitalAsset($properties = [])
diff --git a/tests/Feature/Repositories/AccountRepositoryTest.php b/tests/Feature/Repositories/AccountRepositoryTest.php
index 35e395b9..a5678f29 100644
--- a/tests/Feature/Repositories/AccountRepositoryTest.php
+++ b/tests/Feature/Repositories/AccountRepositoryTest.php
@@ -137,8 +137,8 @@ public function testWhenAccountRelatedToCountryItBelongsToCountry()
     /**
      * Make a new User object.
      *
-     * @param array $userProperties
-     * @param array $accountProperties
+     * @param  array  $userProperties
+     * @param  array  $accountProperties
      * @return \App\User
      */
     protected function makeUser(array $userProperties = [], array $accountProperties = [])
diff --git a/tests/Feature/Repositories/AlbumRepositoryTest.php b/tests/Feature/Repositories/AlbumRepositoryTest.php
index ddcc1e0e..f9ae9c05 100644
--- a/tests/Feature/Repositories/AlbumRepositoryTest.php
+++ b/tests/Feature/Repositories/AlbumRepositoryTest.php
@@ -212,7 +212,7 @@ public function testWhenAlbumSoldItMorphsManyDigitalAsset()
     /**
      * Create an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
@@ -243,7 +243,7 @@ protected function makeAlbum(array $properties = [])
     /**
      * Make a Digital Asset.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\DigitalAsset
      */
     protected function makeDigitalAsset(array $properties = [])
diff --git a/tests/Feature/Repositories/ArtistRepositoryTest.php b/tests/Feature/Repositories/ArtistRepositoryTest.php
index 3954d080..0ef1c989 100644
--- a/tests/Feature/Repositories/ArtistRepositoryTest.php
+++ b/tests/Feature/Repositories/ArtistRepositoryTest.php
@@ -260,8 +260,8 @@ public function testWhenArtistRelatedToAlbumItHasManySongs()
     /**
      * Create a new User.
      *
-     * @param array $userProperties
-     * @param array $accountProperties
+     * @param  array  $userProperties
+     * @param  array  $accountProperties
      * @return \App\User
      */
     protected function createUser(array $userProperties = [], array $accountProperties = [])
diff --git a/tests/Feature/Repositories/CatalogEntityRepositoryTest.php b/tests/Feature/Repositories/CatalogEntityRepositoryTest.php
index 5300e865..24b57a34 100644
--- a/tests/Feature/Repositories/CatalogEntityRepositoryTest.php
+++ b/tests/Feature/Repositories/CatalogEntityRepositoryTest.php
@@ -228,8 +228,8 @@ protected function createUser()
      * Make a CatalogEntity.
      *
      * @param $type
-     * @param array $entityProperties
-     * @param array $catalogableProperties
+     * @param  array  $entityProperties
+     * @param  array  $catalogableProperties
      * @return mixed
      */
     protected function makeCatalogEntity($type, array $entityProperties = [], array $catalogableProperties = [])
diff --git a/tests/Feature/Repositories/DigitalAssetRepositoryTest.php b/tests/Feature/Repositories/DigitalAssetRepositoryTest.php
index 5a201c6d..1eb9f8e4 100644
--- a/tests/Feature/Repositories/DigitalAssetRepositoryTest.php
+++ b/tests/Feature/Repositories/DigitalAssetRepositoryTest.php
@@ -203,7 +203,7 @@ public function testWhenSongSoldItMorphsToAsset()
     /**
      * Create an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function createAlbum(array $properties = [])
@@ -224,7 +224,7 @@ protected function createAlbum(array $properties = [])
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
@@ -257,7 +257,7 @@ protected function createSong()
     /**
      * Make a Digital Asset.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\DigitalAsset
      */
     protected function makeDigitalAsset($properties = [])
diff --git a/tests/Feature/Repositories/GenreRepositoryTest.php b/tests/Feature/Repositories/GenreRepositoryTest.php
index dd65222e..79339819 100644
--- a/tests/Feature/Repositories/GenreRepositoryTest.php
+++ b/tests/Feature/Repositories/GenreRepositoryTest.php
@@ -177,7 +177,7 @@ public function testWhenGenreIsCreatedApprovalFieldsAreNull()
     /**
      * Make an Album.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\Album
      */
     protected function makeAlbum(array $properties = [])
diff --git a/tests/Feature/Repositories/LabelRepositoryTest.php b/tests/Feature/Repositories/LabelRepositoryTest.php
index 8e9534b7..fb0037fb 100644
--- a/tests/Feature/Repositories/LabelRepositoryTest.php
+++ b/tests/Feature/Repositories/LabelRepositoryTest.php
@@ -243,8 +243,8 @@ public function testWhenLabelRelatedToArtistItHasManyAlbums()
     /**
      * Create a User.
      *
-     * @param array $userProperties
-     * @param array $accountProperties
+     * @param  array  $userProperties
+     * @param  array  $accountProperties
      * @return \App\User
      */
     protected function createUser(array $userProperties = [], array $accountProperties = [])
diff --git a/tests/Feature/Repositories/SongRepositoryTest.php b/tests/Feature/Repositories/SongRepositoryTest.php
index 9e111d39..5c227a2e 100644
--- a/tests/Feature/Repositories/SongRepositoryTest.php
+++ b/tests/Feature/Repositories/SongRepositoryTest.php
@@ -185,7 +185,7 @@ protected function createSong()
     /**
      * Make a Digital Asset.
      *
-     * @param array $properties
+     * @param  array  $properties
      * @return \App\DigitalAsset
      */
     protected function makeDigitalAsset($properties = [])
diff --git a/tests/Feature/Repositories/UserRepositoryTest.php b/tests/Feature/Repositories/UserRepositoryTest.php
index cb49f642..8dce4bf6 100644
--- a/tests/Feature/Repositories/UserRepositoryTest.php
+++ b/tests/Feature/Repositories/UserRepositoryTest.php
@@ -174,8 +174,8 @@ protected function createUser()
      * Make a CatalogEntity.
      *
      * @param $type
-     * @param array $entityProperties
-     * @param array $catalogableProperties
+     * @param  array  $entityProperties
+     * @param  array  $catalogableProperties
      * @return mixed
      */
     protected function makeCatalogEntity($type, array $entityProperties = [], array $catalogableProperties = [])