From 4056bc78bf20da5a53754f3af4633a2f6a50d664 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Oct 2024 18:32:55 +0000
Subject: [PATCH 1/2] Bump elliptic from 6.5.4 to 6.5.7

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.4 to 6.5.7.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7)

---
updated-dependencies:
- dependency-name: elliptic
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 59574329b..fa095ed76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2430,9 +2430,9 @@ electron-to-chromium@^1.4.17:
   integrity sha512-UtV0xUA/dibCKKP2JMxOpDtXR74zABevuUEH4K0tvduFSIoxRVcYmQsbB51kXsFTX8MmOyWMt8tuZAlmDOqkrQ==
 
 elliptic@^6.5.3:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
-  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
+  version "6.5.7"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
+  integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
   dependencies:
     bn.js "^4.11.9"
     brorand "^1.1.0"

From 2dc2d9a6eac3c162e9da0afd12673a94970b1c0f Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 11 Oct 2024 18:33:05 +0000
Subject: [PATCH 2/2] Apply fixes from StyleCI

---
 .../Models/Traits/Scope/AnnouncementScope.php  |  8 ++++----
 app/Domains/Auth/Events/Role/RoleCreated.php   |  2 +-
 app/Domains/Auth/Events/Role/RoleDeleted.php   |  2 +-
 app/Domains/Auth/Events/Role/RoleUpdated.php   |  2 +-
 app/Domains/Auth/Events/User/UserCreated.php   |  2 +-
 app/Domains/Auth/Events/User/UserDeleted.php   |  2 +-
 app/Domains/Auth/Events/User/UserDestroyed.php |  2 +-
 app/Domains/Auth/Events/User/UserLoggedIn.php  |  2 +-
 app/Domains/Auth/Events/User/UserRestored.php  |  2 +-
 .../Auth/Events/User/UserStatusChanged.php     |  2 +-
 app/Domains/Auth/Events/User/UserUpdated.php   |  2 +-
 .../Backend/User/DeactivatedUserController.php |  2 +-
 .../Frontend/Auth/LoginController.php          |  2 +-
 .../Frontend/Auth/SocialController.php         |  4 ++--
 .../Auth/Http/Middleware/AdminCheck.php        |  2 +-
 .../Auth/Http/Middleware/PasswordExpires.php   |  2 +-
 .../Auth/Http/Middleware/SuperAdminCheck.php   |  2 +-
 .../TwoFactorAuthenticationStatus.php          |  2 +-
 app/Domains/Auth/Http/Middleware/UserCheck.php |  2 +-
 .../Auth/Http/Middleware/UserTypeCheck.php     |  4 ++--
 .../Auth/Listeners/RoleEventListener.php       |  6 +++---
 .../Auth/Listeners/UserEventListener.php       | 16 ++++++++--------
 .../Models/Traits/Attribute/UserAttribute.php  |  2 +-
 .../Auth/Models/Traits/Method/UserMethod.php   |  2 +-
 .../Models/Traits/Scope/PermissionScope.php    |  8 ++++----
 .../Auth/Models/Traits/Scope/RoleScope.php     |  4 ++--
 .../Auth/Models/Traits/Scope/UserScope.php     | 18 +++++++++---------
 app/Domains/Auth/Rules/UnusedPassword.php      |  2 +-
 app/Domains/Auth/Services/UserService.php      | 10 +++++-----
 app/Helpers/Global/GeneralHelper.php           |  2 +-
 app/Helpers/Global/LocaleHelper.php            | 18 ++++++------------
 app/Helpers/Global/SystemHelper.php            |  5 ++---
 app/Http/Controllers/LocaleController.php      |  2 +-
 app/Models/Traits/Uuid.php                     |  4 ++--
 app/Services/BaseService.php                   | 10 +++++-----
 ...0_02_25_034148_create_permission_tables.php |  4 ++--
 database/seeders/Traits/TruncateTable.php      |  4 ++--
 37 files changed, 80 insertions(+), 87 deletions(-)

diff --git a/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php b/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php
index cf5366970..c2d57bcd4 100644
--- a/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php
+++ b/app/Domains/Announcement/Models/Traits/Scope/AnnouncementScope.php
@@ -8,7 +8,7 @@
 trait AnnouncementScope
 {
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeEnabled($query)
@@ -17,8 +17,8 @@ public function scopeEnabled($query)
     }
 
     /**
-     * @param $query
-     * @param $area
+     * @param  $query
+     * @param  $area
      * @return mixed
      */
     public function scopeForArea($query, $area)
@@ -30,7 +30,7 @@ public function scopeForArea($query, $area)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeInTimeFrame($query)
diff --git a/app/Domains/Auth/Events/Role/RoleCreated.php b/app/Domains/Auth/Events/Role/RoleCreated.php
index 4acc86a9e..569b2f685 100644
--- a/app/Domains/Auth/Events/Role/RoleCreated.php
+++ b/app/Domains/Auth/Events/Role/RoleCreated.php
@@ -18,7 +18,7 @@ class RoleCreated
     public $role;
 
     /**
-     * @param $role
+     * @param  $role
      */
     public function __construct(Role $role)
     {
diff --git a/app/Domains/Auth/Events/Role/RoleDeleted.php b/app/Domains/Auth/Events/Role/RoleDeleted.php
index 0626e02cb..3c680ec81 100644
--- a/app/Domains/Auth/Events/Role/RoleDeleted.php
+++ b/app/Domains/Auth/Events/Role/RoleDeleted.php
@@ -18,7 +18,7 @@ class RoleDeleted
     public $role;
 
     /**
-     * @param $role
+     * @param  $role
      */
     public function __construct(Role $role)
     {
diff --git a/app/Domains/Auth/Events/Role/RoleUpdated.php b/app/Domains/Auth/Events/Role/RoleUpdated.php
index afb06c02c..ef4c8801d 100644
--- a/app/Domains/Auth/Events/Role/RoleUpdated.php
+++ b/app/Domains/Auth/Events/Role/RoleUpdated.php
@@ -18,7 +18,7 @@ class RoleUpdated
     public $role;
 
     /**
-     * @param $role
+     * @param  $role
      */
     public function __construct(Role $role)
     {
diff --git a/app/Domains/Auth/Events/User/UserCreated.php b/app/Domains/Auth/Events/User/UserCreated.php
index 716e0e478..567e6f043 100644
--- a/app/Domains/Auth/Events/User/UserCreated.php
+++ b/app/Domains/Auth/Events/User/UserCreated.php
@@ -18,7 +18,7 @@ class UserCreated
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Events/User/UserDeleted.php b/app/Domains/Auth/Events/User/UserDeleted.php
index d0f5da921..c5fc69fb1 100644
--- a/app/Domains/Auth/Events/User/UserDeleted.php
+++ b/app/Domains/Auth/Events/User/UserDeleted.php
@@ -18,7 +18,7 @@ class UserDeleted
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Events/User/UserDestroyed.php b/app/Domains/Auth/Events/User/UserDestroyed.php
index 20d78a023..363fee24d 100644
--- a/app/Domains/Auth/Events/User/UserDestroyed.php
+++ b/app/Domains/Auth/Events/User/UserDestroyed.php
@@ -18,7 +18,7 @@ class UserDestroyed
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Events/User/UserLoggedIn.php b/app/Domains/Auth/Events/User/UserLoggedIn.php
index 8cb31c619..e4e736610 100644
--- a/app/Domains/Auth/Events/User/UserLoggedIn.php
+++ b/app/Domains/Auth/Events/User/UserLoggedIn.php
@@ -18,7 +18,7 @@ class UserLoggedIn
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Events/User/UserRestored.php b/app/Domains/Auth/Events/User/UserRestored.php
index 7c65c2b18..161f1e667 100644
--- a/app/Domains/Auth/Events/User/UserRestored.php
+++ b/app/Domains/Auth/Events/User/UserRestored.php
@@ -18,7 +18,7 @@ class UserRestored
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Events/User/UserStatusChanged.php b/app/Domains/Auth/Events/User/UserStatusChanged.php
index 5f7953efc..d78a83308 100644
--- a/app/Domains/Auth/Events/User/UserStatusChanged.php
+++ b/app/Domains/Auth/Events/User/UserStatusChanged.php
@@ -26,7 +26,7 @@ class UserStatusChanged
      * UserStatusChanged constructor.
      *
      * @param  User  $user
-     * @param $status
+     * @param  $status
      */
     public function __construct(User $user, $status)
     {
diff --git a/app/Domains/Auth/Events/User/UserUpdated.php b/app/Domains/Auth/Events/User/UserUpdated.php
index a4b37b370..7e9da52b4 100644
--- a/app/Domains/Auth/Events/User/UserUpdated.php
+++ b/app/Domains/Auth/Events/User/UserUpdated.php
@@ -18,7 +18,7 @@ class UserUpdated
     public $user;
 
     /**
-     * @param $user
+     * @param  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php b/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php
index 75dd9b898..9322febeb 100644
--- a/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php
+++ b/app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php
@@ -37,7 +37,7 @@ public function index()
     /**
      * @param  Request  $request
      * @param  User  $user
-     * @param $status
+     * @param  $status
      * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
diff --git a/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php b/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php
index f99ad03a8..6c0916b6a 100644
--- a/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php
+++ b/app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php
@@ -93,7 +93,7 @@ protected function attemptLogin(Request $request)
      * The user has been authenticated.
      *
      * @param  Request  $request
-     * @param $user
+     * @param  $user
      * @return mixed
      */
     protected function authenticated(Request $request, $user)
diff --git a/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php b/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php
index a6d393826..14ab2f005 100644
--- a/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php
+++ b/app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php
@@ -12,7 +12,7 @@
 class SocialController
 {
     /**
-     * @param $provider
+     * @param  $provider
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function redirect($provider)
@@ -21,7 +21,7 @@ public function redirect($provider)
     }
 
     /**
-     * @param $provider
+     * @param  $provider
      * @param  UserService  $userService
      * @return \Illuminate\Http\RedirectResponse
      *
diff --git a/app/Domains/Auth/Http/Middleware/AdminCheck.php b/app/Domains/Auth/Http/Middleware/AdminCheck.php
index e6734bb8a..7fe919ac4 100644
--- a/app/Domains/Auth/Http/Middleware/AdminCheck.php
+++ b/app/Domains/Auth/Http/Middleware/AdminCheck.php
@@ -11,7 +11,7 @@
 class AdminCheck
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
      * @return mixed
      */
diff --git a/app/Domains/Auth/Http/Middleware/PasswordExpires.php b/app/Domains/Auth/Http/Middleware/PasswordExpires.php
index 7d15544bf..f1076a0a0 100644
--- a/app/Domains/Auth/Http/Middleware/PasswordExpires.php
+++ b/app/Domains/Auth/Http/Middleware/PasswordExpires.php
@@ -11,7 +11,7 @@
 class PasswordExpires
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
      * @return \Illuminate\Http\RedirectResponse|mixed
      *
diff --git a/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php b/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php
index 67d3e44be..40335f8c9 100644
--- a/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php
+++ b/app/Domains/Auth/Http/Middleware/SuperAdminCheck.php
@@ -10,7 +10,7 @@
 class SuperAdminCheck
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
      * @return mixed
      */
diff --git a/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php b/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php
index aac56b3dd..4891def34 100644
--- a/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php
+++ b/app/Domains/Auth/Http/Middleware/TwoFactorAuthenticationStatus.php
@@ -10,7 +10,7 @@
 class TwoFactorAuthenticationStatus
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
      * @param  string  $status
      * @return mixed
diff --git a/app/Domains/Auth/Http/Middleware/UserCheck.php b/app/Domains/Auth/Http/Middleware/UserCheck.php
index fdd682e36..9311f39b0 100644
--- a/app/Domains/Auth/Http/Middleware/UserCheck.php
+++ b/app/Domains/Auth/Http/Middleware/UserCheck.php
@@ -11,7 +11,7 @@
 class UserCheck
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
      * @return mixed
      */
diff --git a/app/Domains/Auth/Http/Middleware/UserTypeCheck.php b/app/Domains/Auth/Http/Middleware/UserTypeCheck.php
index c065fd3f7..9bbb1a1fc 100644
--- a/app/Domains/Auth/Http/Middleware/UserTypeCheck.php
+++ b/app/Domains/Auth/Http/Middleware/UserTypeCheck.php
@@ -10,9 +10,9 @@
 class UserTypeCheck
 {
     /**
-     * @param $request
+     * @param  $request
      * @param  Closure  $next
-     * @param $type
+     * @param  $type
      * @return mixed
      */
     public function handle($request, Closure $next, $type)
diff --git a/app/Domains/Auth/Listeners/RoleEventListener.php b/app/Domains/Auth/Listeners/RoleEventListener.php
index 0c631e610..b3ca36154 100644
--- a/app/Domains/Auth/Listeners/RoleEventListener.php
+++ b/app/Domains/Auth/Listeners/RoleEventListener.php
@@ -12,7 +12,7 @@
 class RoleEventListener
 {
     /**
-     * @param $event
+     * @param  $event
      */
     public function onCreated($event)
     {
@@ -29,7 +29,7 @@ public function onCreated($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onUpdated($event)
     {
@@ -46,7 +46,7 @@ public function onUpdated($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onDeleted($event)
     {
diff --git a/app/Domains/Auth/Listeners/UserEventListener.php b/app/Domains/Auth/Listeners/UserEventListener.php
index ac430c7ca..dfd3cd955 100644
--- a/app/Domains/Auth/Listeners/UserEventListener.php
+++ b/app/Domains/Auth/Listeners/UserEventListener.php
@@ -17,7 +17,7 @@
 class UserEventListener
 {
     /**
-     * @param $event
+     * @param  $event
      */
     public function onLoggedIn($event)
     {
@@ -29,7 +29,7 @@ public function onLoggedIn($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onPasswordReset($event)
     {
@@ -39,7 +39,7 @@ public function onPasswordReset($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onCreated($event)
     {
@@ -60,7 +60,7 @@ public function onCreated($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onUpdated($event)
     {
@@ -79,7 +79,7 @@ public function onUpdated($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onDeleted($event)
     {
@@ -89,7 +89,7 @@ public function onDeleted($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onRestored($event)
     {
@@ -99,7 +99,7 @@ public function onRestored($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onDestroyed($event)
     {
@@ -109,7 +109,7 @@ public function onDestroyed($event)
     }
 
     /**
-     * @param $event
+     * @param  $event
      */
     public function onStatusChanged($event)
     {
diff --git a/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php b/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php
index 65bc674bf..30fd16748 100644
--- a/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php
+++ b/app/Domains/Auth/Models/Traits/Attribute/UserAttribute.php
@@ -10,7 +10,7 @@
 trait UserAttribute
 {
     /**
-     * @param $password
+     * @param  $password
      */
     public function setPasswordAttribute($password): void
     {
diff --git a/app/Domains/Auth/Models/Traits/Method/UserMethod.php b/app/Domains/Auth/Models/Traits/Method/UserMethod.php
index 51e061530..28302521d 100644
--- a/app/Domains/Auth/Models/Traits/Method/UserMethod.php
+++ b/app/Domains/Auth/Models/Traits/Method/UserMethod.php
@@ -42,7 +42,7 @@ public function hasAllAccess(): bool
     }
 
     /**
-     * @param $type
+     * @param  $type
      * @return bool
      */
     public function isType($type): bool
diff --git a/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php b/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php
index 2dbafd5d5..3a490072e 100644
--- a/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php
+++ b/app/Domains/Auth/Models/Traits/Scope/PermissionScope.php
@@ -8,7 +8,7 @@
 trait PermissionScope
 {
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeIsMaster($query)
@@ -18,7 +18,7 @@ public function scopeIsMaster($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeIsParent($query)
@@ -27,7 +27,7 @@ public function scopeIsParent($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeIsChild($query)
@@ -36,7 +36,7 @@ public function scopeIsChild($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeSingular($query)
diff --git a/app/Domains/Auth/Models/Traits/Scope/RoleScope.php b/app/Domains/Auth/Models/Traits/Scope/RoleScope.php
index 8f3473e4e..33aedc2ac 100644
--- a/app/Domains/Auth/Models/Traits/Scope/RoleScope.php
+++ b/app/Domains/Auth/Models/Traits/Scope/RoleScope.php
@@ -8,8 +8,8 @@
 trait RoleScope
 {
     /**
-     * @param $query
-     * @param $term
+     * @param  $query
+     * @param  $term
      * @return mixed
      */
     public function scopeSearch($query, $term)
diff --git a/app/Domains/Auth/Models/Traits/Scope/UserScope.php b/app/Domains/Auth/Models/Traits/Scope/UserScope.php
index d9c59f7fc..4f4f96384 100644
--- a/app/Domains/Auth/Models/Traits/Scope/UserScope.php
+++ b/app/Domains/Auth/Models/Traits/Scope/UserScope.php
@@ -8,8 +8,8 @@
 trait UserScope
 {
     /**
-     * @param $query
-     * @param $term
+     * @param  $query
+     * @param  $term
      * @return mixed
      */
     public function scopeSearch($query, $term)
@@ -21,7 +21,7 @@ public function scopeSearch($query, $term)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeOnlyDeactivated($query)
@@ -30,7 +30,7 @@ public function scopeOnlyDeactivated($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeOnlyActive($query)
@@ -39,8 +39,8 @@ public function scopeOnlyActive($query)
     }
 
     /**
-     * @param $query
-     * @param $type
+     * @param  $query
+     * @param  $type
      * @return mixed
      */
     public function scopeByType($query, $type)
@@ -49,7 +49,7 @@ public function scopeByType($query, $type)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeAllAccess($query)
@@ -60,7 +60,7 @@ public function scopeAllAccess($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeAdmins($query)
@@ -69,7 +69,7 @@ public function scopeAdmins($query)
     }
 
     /**
-     * @param $query
+     * @param  $query
      * @return mixed
      */
     public function scopeUsers($query)
diff --git a/app/Domains/Auth/Rules/UnusedPassword.php b/app/Domains/Auth/Rules/UnusedPassword.php
index 283ac9928..11be82e63 100644
--- a/app/Domains/Auth/Rules/UnusedPassword.php
+++ b/app/Domains/Auth/Rules/UnusedPassword.php
@@ -22,7 +22,7 @@ class UnusedPassword implements Rule
      *
      * UnusedPassword constructor.
      *
-     * @param $user
+     * @param  $user
      */
     public function __construct($user)
     {
diff --git a/app/Domains/Auth/Services/UserService.php b/app/Domains/Auth/Services/UserService.php
index f1bdaeac2..e1c28ec3f 100644
--- a/app/Domains/Auth/Services/UserService.php
+++ b/app/Domains/Auth/Services/UserService.php
@@ -31,7 +31,7 @@ public function __construct(User $user)
     }
 
     /**
-     * @param $type
+     * @param  $type
      * @param  bool|int  $perPage
      * @return mixed
      */
@@ -68,8 +68,8 @@ public function registerUser(array $data = []): User
     }
 
     /**
-     * @param $info
-     * @param $provider
+     * @param  $info
+     * @param  $provider
      * @return mixed
      *
      * @throws GeneralException
@@ -205,7 +205,7 @@ public function updateProfile(User $user, array $data = []): User
 
     /**
      * @param  User  $user
-     * @param $data
+     * @param  $data
      * @param  bool  $expired
      * @return User
      *
@@ -232,7 +232,7 @@ public function updatePassword(User $user, $data, $expired = false): User
 
     /**
      * @param  User  $user
-     * @param $status
+     * @param  $status
      * @return User
      *
      * @throws GeneralException
diff --git a/app/Helpers/Global/GeneralHelper.php b/app/Helpers/Global/GeneralHelper.php
index 57e7c5b98..750187fdc 100644
--- a/app/Helpers/Global/GeneralHelper.php
+++ b/app/Helpers/Global/GeneralHelper.php
@@ -18,7 +18,7 @@ function appName()
     /**
      * Create a new Carbon instance from a time.
      *
-     * @param $time
+     * @param  $time
      * @return Carbon
      *
      * @throws Exception
diff --git a/app/Helpers/Global/LocaleHelper.php b/app/Helpers/Global/LocaleHelper.php
index 8748c8c48..100353bb3 100644
--- a/app/Helpers/Global/LocaleHelper.php
+++ b/app/Helpers/Global/LocaleHelper.php
@@ -3,9 +3,8 @@
 use Carbon\Carbon;
 
 if (! function_exists('setAllLocale')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      */
     function setAllLocale($locale)
     {
@@ -17,9 +16,8 @@ function setAllLocale($locale)
 }
 
 if (! function_exists('setAppLocale')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      */
     function setAppLocale($locale)
     {
@@ -28,9 +26,8 @@ function setAppLocale($locale)
 }
 
 if (! function_exists('setPHPLocale')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      */
     function setPHPLocale($locale)
     {
@@ -39,9 +36,8 @@ function setPHPLocale($locale)
 }
 
 if (! function_exists('setCarbonLocale')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      */
     function setCarbonLocale($locale)
     {
@@ -50,9 +46,8 @@ function setCarbonLocale($locale)
 }
 
 if (! function_exists('setLocaleReadingDirection')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      */
     function setLocaleReadingDirection($locale)
     {
@@ -71,9 +66,8 @@ function setLocaleReadingDirection($locale)
 }
 
 if (! function_exists('getLocaleName')) {
-
     /**
-     * @param $locale
+     * @param  $locale
      * @return mixed
      */
     function getLocaleName($locale)
diff --git a/app/Helpers/Global/SystemHelper.php b/app/Helpers/Global/SystemHelper.php
index c78ca3fb1..60ac65e18 100644
--- a/app/Helpers/Global/SystemHelper.php
+++ b/app/Helpers/Global/SystemHelper.php
@@ -5,7 +5,7 @@
      * Loops through a folder and requires all PHP files
      * Searches sub-directories as well.
      *
-     * @param $folder
+     * @param  $folder
      */
     function includeFilesInFolder($folder)
     {
@@ -27,9 +27,8 @@ function includeFilesInFolder($folder)
 }
 
 if (! function_exists('includeRouteFiles')) {
-
     /**
-     * @param $folder
+     * @param  $folder
      */
     function includeRouteFiles($folder)
     {
diff --git a/app/Http/Controllers/LocaleController.php b/app/Http/Controllers/LocaleController.php
index dbf171133..8a2b5c6c3 100644
--- a/app/Http/Controllers/LocaleController.php
+++ b/app/Http/Controllers/LocaleController.php
@@ -8,7 +8,7 @@
 class LocaleController
 {
     /**
-     * @param $locale
+     * @param  $locale
      * @return \Illuminate\Http\RedirectResponse
      */
     public function change($locale)
diff --git a/app/Models/Traits/Uuid.php b/app/Models/Traits/Uuid.php
index 637f73c3d..4cd5a966e 100644
--- a/app/Models/Traits/Uuid.php
+++ b/app/Models/Traits/Uuid.php
@@ -10,8 +10,8 @@
 trait Uuid
 {
     /**
-     * @param $query
-     * @param $uuid
+     * @param  $query
+     * @param  $uuid
      * @return mixed
      */
     public function scopeUuid($query, $uuid)
diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php
index 117318b73..cd52583ad 100644
--- a/app/Services/BaseService.php
+++ b/app/Services/BaseService.php
@@ -142,7 +142,7 @@ public function get()
     /**
      * Get the specified model record from the database.
      *
-     * @param $id
+     * @param  $id
      * @return \Illuminate\Database\Eloquent\Model
      */
     public function getById($id)
@@ -155,8 +155,8 @@ public function getById($id)
     }
 
     /**
-     * @param $item
-     * @param $column
+     * @param  $item
+     * @param  $column
      * @param  array  $columns
      * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|object|null
      */
@@ -172,7 +172,7 @@ public function getByColumn($item, $column, array $columns = ['*'])
     /**
      * Delete the specified model record from the database.
      *
-     * @param $id
+     * @param  $id
      * @return bool|null
      *
      * @throws \Exception
@@ -263,7 +263,7 @@ public function whereIn($column, $values)
     /**
      * Set Eloquent relationships to eager load.
      *
-     * @param $relations
+     * @param  $relations
      * @return $this
      */
     public function with($relations)
diff --git a/database/migrations/2020_02_25_034148_create_permission_tables.php b/database/migrations/2020_02_25_034148_create_permission_tables.php
index f4fcf646b..597b96475 100644
--- a/database/migrations/2020_02_25_034148_create_permission_tables.php
+++ b/database/migrations/2020_02_25_034148_create_permission_tables.php
@@ -54,7 +54,7 @@ public function up()
                 ->onDelete('cascade');
 
             $table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_permissions_permission_model_type_primary');
+                'model_has_permissions_permission_model_type_primary');
         });
 
         Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) {
@@ -70,7 +70,7 @@ public function up()
                 ->onDelete('cascade');
 
             $table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],
-                    'model_has_roles_role_model_type_primary');
+                'model_has_roles_role_model_type_primary');
         });
 
         Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) {
diff --git a/database/seeders/Traits/TruncateTable.php b/database/seeders/Traits/TruncateTable.php
index 80900fcb0..7a1c622e1 100644
--- a/database/seeders/Traits/TruncateTable.php
+++ b/database/seeders/Traits/TruncateTable.php
@@ -10,7 +10,7 @@
 trait TruncateTable
 {
     /**
-     * @param $table
+     * @param  $table
      * @return bool
      */
     protected function truncate($table)
@@ -23,7 +23,7 @@ protected function truncate($table)
                 return  DB::statement('TRUNCATE TABLE '.$table.' RESTART IDENTITY CASCADE');
 
             case 'sqlite': case 'sqlsrv':
-            return DB::statement('DELETE FROM '.$table);
+                return DB::statement('DELETE FROM '.$table);
         }
 
         return false;