Merge branch 'release/6.0.3'

Author: rappasoft

.env.example

@@ -23,7 +23,7 @@ DB_PASSWORD=secret
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync
-SESSION_DRIVER=cookie
+SESSION_DRIVER=file
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 

CHANGELOG.md

@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [6.0.3] - 2020-02-17
+
+### Changed
+
+- Update to Laravel commit: c78a1d8184f00f8270d8a135cc21590837b6bfbd
+- Fix log viewer error
+- Rename include_route_files to include_files_in_folder
+- Update form-control-file class
+
 ## [6.0.2] - 2020-01-01
 
 ### Changed
@@ -167,7 +176,8 @@ All notable changes to this project will be documented in this file.
 - Fix yarn tests
 - Fix: Socially logged in users get assigned the default role
 
-[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.2...development
+[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.3...development
+[6.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.2...v6.0.3
 [6.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.1...v6.0.2
 [6.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.0...v6.0.1
 [6.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v5.3.8...v6.0.0

app/Helpers/General/TimezoneHelper.php

@@ -15,7 +15,7 @@ class TimezoneHelper
      *
      * @return Carbon
      */
-    public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y') : string
+    public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y'): string
     {
         return $date->setTimezone(auth()->user()->timezone ?? config('app.timezone'))->format($format);
     }
@@ -25,7 +25,7 @@ public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y') : stri
      *
      * @return Carbon
      */
-    public function convertFromLocal($date) : Carbon
+    public function convertFromLocal($date): Carbon
     {
         return Carbon::parse($date, auth()->user()->timezone)->setTimezone('UTC');
     }

app/Helpers/Global/SystemHelper.php

@@ -1,13 +1,13 @@
 <?php
 
-if (! function_exists('include_route_files')) {
+if (! function_exists('include_files_in_folder')) {
     /**
      * Loops through a folder and requires all PHP files
      * Searches sub-directories as well.
      *
      * @param $folder
      */
-    function include_route_files($folder)
+    function include_files_in_folder($folder)
     {
         try {
             $rdi = new RecursiveDirectoryIterator($folder);
@@ -25,3 +25,16 @@ function include_route_files($folder)
         }
     }
 }
+
+if (! function_exists('include_route_files')) {
+    /**
+     * Loops through a folder and requires all PHP files
+     * Searches sub-directories as well.
+     *
+     * @param $folder
+     */
+    function include_route_files($folder)
+    {
+        include_files_in_folder($folder);
+    }
+}

app/Models/Auth/Traits/Attribute/UserAttribute.php

@@ -12,7 +12,7 @@ trait UserAttribute
     /**
      * @param $password
      */
-    public function setPasswordAttribute($password) : void
+    public function setPasswordAttribute($password): void
     {
         // If password was accidentally passed in already hashed, try not to double hash it
         if (

app/Observers/User/UserObserver.php

@@ -14,7 +14,7 @@ class UserObserver
      *
      * @param  \App\Models\Auth\User  $user
      */
-    public function created(User $user) : void
+    public function created(User $user): void
     {
         $this->logPasswordHistory($user);
     }
@@ -24,7 +24,7 @@ public function created(User $user) : void
      *
      * @param  \App\Models\Auth\User  $user
      */
-    public function updated(User $user) : void
+    public function updated(User $user): void
     {
         // Only log password history on update if the password actually changed
         if ($user->isDirty('password')) {
@@ -35,7 +35,7 @@ public function updated(User $user) : void
     /**
      * @param User $user
      */
-    private function logPasswordHistory(User $user) : void
+    private function logPasswordHistory(User $user): void
     {
         if (config('access.users.password_history')) {
             $user->passwordHistories()->create([

app/Repositories/Backend/Auth/RoleRepository.php

@@ -31,7 +31,7 @@ public function __construct(Role $model)
      * @throws \Throwable
      * @return Role
      */
-    public function create(array $data) : Role
+    public function create(array $data): Role
     {
         // Make sure it doesn't already exist
         if ($this->roleExists($data['name'])) {
@@ -112,7 +112,7 @@ public function update(Role $role, array $data)
      *
      * @return bool
      */
-    protected function roleExists($name) : bool
+    protected function roleExists($name): bool
     {
         return $this->model
             ->where('name', strtolower($name))

app/Repositories/Backend/Auth/UserRepository.php

@@ -37,7 +37,7 @@ public function __construct(User $model)
     /**
      * @return mixed
      */
-    public function getUnconfirmedCount() : int
+    public function getUnconfirmedCount(): int
     {
         return $this->model
             ->where('confirmed', false)
@@ -51,7 +51,7 @@ public function getUnconfirmedCount() : int
      *
      * @return mixed
      */
-    public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc') : LengthAwarePaginator
+    public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
     {
         return $this->model
             ->with('roles', 'permissions', 'providers')
@@ -67,7 +67,7 @@ public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort =
      *
      * @return LengthAwarePaginator
      */
-    public function getInactivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc') : LengthAwarePaginator
+    public function getInactivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
     {
         return $this->model
             ->with('roles', 'permissions', 'providers')
@@ -83,7 +83,7 @@ public function getInactivePaginated($paged = 25, $orderBy = 'created_at', $sort
      *
      * @return LengthAwarePaginator
      */
-    public function getDeletedPaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc') : LengthAwarePaginator
+    public function getDeletedPaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
     {
         return $this->model
             ->with('roles', 'permissions', 'providers')
@@ -99,7 +99,7 @@ public function getDeletedPaginated($paged = 25, $orderBy = 'created_at', $sort
      * @throws \Throwable
      * @return User
      */
-    public function create(array $data) : User
+    public function create(array $data): User
     {
         return DB::transaction(function () use ($data) {
             $user = $this->model::create([
@@ -150,7 +150,7 @@ public function create(array $data) : User
      * @throws \Throwable
      * @return User
      */
-    public function update(User $user, array $data) : User
+    public function update(User $user, array $data): User
     {
         $this->checkUserByEmail($user, $data['email']);
 
@@ -185,7 +185,7 @@ public function update(User $user, array $data) : User
      * @throws GeneralException
      * @return User
      */
-    public function updatePassword(User $user, $input) : User
+    public function updatePassword(User $user, $input): User
     {
         if ($user->update(['password' => $input['password']])) {
             event(new UserPasswordChanged($user));
@@ -203,7 +203,7 @@ public function updatePassword(User $user, $input) : User
      * @throws GeneralException
      * @return User
      */
-    public function mark(User $user, $status) : User
+    public function mark(User $user, $status): User
     {
         if ($status === 0 && auth()->id() === $user->id) {
             throw new GeneralException(__('exceptions.backend.access.users.cant_deactivate_self'));
@@ -233,7 +233,7 @@ public function mark(User $user, $status) : User
      * @throws GeneralException
      * @return User
      */
-    public function confirm(User $user) : User
+    public function confirm(User $user): User
     {
         if ($user->confirmed) {
             throw new GeneralException(__('exceptions.backend.access.users.already_confirmed'));
@@ -262,7 +262,7 @@ public function confirm(User $user) : User
      * @throws GeneralException
      * @return User
      */
-    public function unconfirm(User $user) : User
+    public function unconfirm(User $user): User
     {
         if (! $user->confirmed) {
             throw new GeneralException(__('exceptions.backend.access.users.not_confirmed'));
@@ -298,7 +298,7 @@ public function unconfirm(User $user) : User
      * @throws \Throwable
      * @return User
      */
-    public function forceDelete(User $user) : User
+    public function forceDelete(User $user): User
     {
         if ($user->deleted_at === null) {
             throw new GeneralException(__('exceptions.backend.access.users.delete_first'));
@@ -325,7 +325,7 @@ public function forceDelete(User $user) : User
      * @throws GeneralException
      * @return User
      */
-    public function restore(User $user) : User
+    public function restore(User $user): User
     {
         if ($user->deleted_at === null) {
             throw new GeneralException(__('exceptions.backend.access.users.cant_restore'));

composer.json

@@ -34,7 +34,7 @@
         "facade/ignition-self-diagnosis": "^1.0",
         "facade/ignition-tinker-tab": "^1.0",
         "friendsofphp/php-cs-fixer": "^2.14",
-        "fzaninotto/faker": "^1.4",
+        "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
         "phpunit/phpunit": "^8.0",