Merge branch 'release/6.0.2'

Author: rappasoft

.circleci/config.yml

@@ -23,7 +23,7 @@ DB_PASSWORD=secret
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
+SESSION_DRIVER=cookie
 SESSION_LIFETIME=120
 SESSION_ENCRYPT=false
 
@@ -38,7 +38,7 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=[email protected]
-MAIL_FROM_NAME=Example
+MAIL_FROM_NAME="${APP_NAME}"
 
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=

.env.example

@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [6.0.2] - 2020-01-01
+
+### Changed
+
+- Updated to Laravel commit: 25c36eb592c57e075acc32a12703005f67c4ec10
+- Updated ignition
+- Update laravel min version
+- Make avatar field on social_accounts text to account for Google
+- Fix user dropdown
+- Package updates
+
 ## [6.0.1] - 2019-10-22
 
 ### Added
@@ -156,7 +167,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.1...development
+[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.2...development
+[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
 [5.3.8]: https://github.com/rappasoft/laravel-boilerplate/compare/v5.3.7...v5.3.8

CHANGELOG.md

@@ -4,8 +4,8 @@
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;
-use Spatie\Permission\Exceptions\UnauthorizedException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Spatie\Permission\Exceptions\UnauthorizedException;
 
 /**
  * Class Handler.
@@ -49,7 +49,9 @@ public function report(Exception $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $exception)
     {

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Helpers\General;
 
-use Illuminate\Support\HtmlString;
 use Illuminate\Contracts\Routing\UrlGenerator;
+use Illuminate\Support\HtmlString;
 
 /**
  * Class HtmlHelper.

app/Helpers/General/HtmlHelper.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Composers\Backend;
 
-use Illuminate\View\View;
 use App\Repositories\Backend\Auth\UserRepository;
+use Illuminate\View\View;
 
 /**
  * Class SidebarComposer.

app/Http/Composers/Backend/SidebarComposer.php

@@ -2,14 +2,14 @@
 
 namespace App\Http\Controllers\Backend\Auth\Role;
 
-use App\Models\Auth\Role;
-use App\Http\Controllers\Controller;
 use App\Events\Backend\Auth\Role\RoleDeleted;
-use App\Repositories\Backend\Auth\RoleRepository;
-use App\Repositories\Backend\Auth\PermissionRepository;
-use App\Http\Requests\Backend\Auth\Role\StoreRoleRequest;
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Backend\Auth\Role\ManageRoleRequest;
+use App\Http\Requests\Backend\Auth\Role\StoreRoleRequest;
 use App\Http\Requests\Backend\Auth\Role\UpdateRoleRequest;
+use App\Models\Auth\Role;
+use App\Repositories\Backend\Auth\PermissionRepository;
+use App\Repositories\Backend\Auth\RoleRepository;
 
 /**
  * Class RoleController.

app/Http/Controllers/Backend/Auth/Role/RoleController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Backend\Auth\User;
 
-use App\Models\Auth\User;
 use App\Http\Controllers\Controller;
-use App\Repositories\Backend\Auth\UserRepository;
 use App\Http\Requests\Backend\Auth\User\ManageUserRequest;
+use App\Models\Auth\User;
 use App\Notifications\Frontend\Auth\UserNeedsConfirmation;
+use App\Repositories\Backend\Auth\UserRepository;
 
 /**
  * Class UserConfirmationController.

app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php

@@ -2,15 +2,15 @@
 
 namespace App\Http\Controllers\Backend\Auth\User;
 
-use App\Models\Auth\User;
-use App\Http\Controllers\Controller;
 use App\Events\Backend\Auth\User\UserDeleted;
-use App\Repositories\Backend\Auth\RoleRepository;
-use App\Repositories\Backend\Auth\UserRepository;
-use App\Repositories\Backend\Auth\PermissionRepository;
-use App\Http\Requests\Backend\Auth\User\StoreUserRequest;
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Backend\Auth\User\ManageUserRequest;
+use App\Http\Requests\Backend\Auth\User\StoreUserRequest;
 use App\Http\Requests\Backend\Auth\User\UpdateUserRequest;
+use App\Models\Auth\User;
+use App\Repositories\Backend\Auth\PermissionRepository;
+use App\Repositories\Backend\Auth\RoleRepository;
+use App\Repositories\Backend\Auth\UserRepository;
 
 /**
  * Class UserController.

app/Http/Controllers/Backend/Auth/User/UserController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Backend\Auth\User;
 
-use App\Models\Auth\User;
 use App\Http\Controllers\Controller;
-use App\Repositories\Backend\Auth\UserRepository;
 use App\Http\Requests\Backend\Auth\User\ManageUserRequest;
 use App\Http\Requests\Backend\Auth\User\UpdateUserPasswordRequest;
+use App\Models\Auth\User;
+use App\Repositories\Backend\Auth\UserRepository;
 
 /**
  * Class UserPasswordController.