Merge pull request #1510 from rappasoft/development

v8.0.3

.env.example

@@ -26,6 +26,9 @@ DB_DATABASE=laravel
 DB_USERNAME=root
 DB_PASSWORD=
 
+# Cache
+MEMCACHED_HOST=127.0.0.1
+
 # Queue
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null

.github/workflows/main.yml

@@ -1,26 +1,55 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - main
-      - master
-      - development
+on: [push, pull_request]
 
 jobs:
-  run-tests:
-    runs-on: ubuntu-latest
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [7.3]
+        laravel: [8.*]
+        stability: [prefer-stable]
+        include:
+          - laravel: 8.*
+            testbench: 6.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
       - name: Copy ENV Laravel Configuration for CI
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-      - name: Install Dependencies
-        run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
       - name: Install NPM Dependencies
         run: npm install
+
       - name: Compile Assets
         run: npm run production
+
       - name: Generate Key
         run: php artisan key:generate
-      - name: Execute Tests
+
+      - name: Execute tests
         run: vendor/bin/phpunit

.php_cs

@@ -8,7 +8,7 @@ $finder = Symfony\Component\Finder\Finder::create()
         __DIR__ . '/app',
         __DIR__ . '/config',
         __DIR__ . '/database/factories',
-        __DIR__ . '/database/seeds',
+        __DIR__ . '/database/seeders',
         __DIR__ . '/resources/lang',
         __DIR__ . '/routes',
         __DIR__ . '/tests',

CHANGELOG.md

@@ -3,6 +3,36 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [8.0.3] - 2021-02-20
+
+### Added
+
+- Added pt_PT language
+- Added RO language
+- Added missing cors middleware
+
+### Changed
+
+- Updated composer
+- Updated yarn
+- Update to Laravel commit: f0de9fd9967d4e1b4427d8458bf8983bc2cde201
+- Upgrade to Laravel Mix 6
+- Fixed 2fa/admin issue (https://github.com/rappasoft/laravel-boilerplate/pull/1488)
+- Update pt_BR language
+- Updated failed_jobs table (https://github.com/rappasoft/laravel-boilerplate/pull/1503, https://github.com/rappasoft/laravel-boilerplate/issues/1501)
+
+### Removed
+
+- Google Analytics tag and config since it's done differently since that was added
+
+## [8.0.2] - 2020-12-15
+
+### Changed
+
+- Removed the base controller dependency from all controllers as it's not needed for any of the current functionality and is just more overhead for no reason.
+- Move verification middleware to routes file
+- Update phpunit.xml file to current format
+
 ## [8.0.1] - 2020-12-12
 
 ## Changed
@@ -393,7 +423,9 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
 - Fix yarn tests
 - Fix: Socially logged in users get assigned the default role
 
-[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...development
+[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.3...development
+[8.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.2...v8.0.3
+[8.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.1...v8.0.2
 [8.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v8.0.0...v8.0.1
 [8.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.6...v8.0.0
 [7.2.6]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.2.5...v7.2.6

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

@@ -9,12 +9,11 @@
 use App\Domains\Auth\Models\Role;
 use App\Domains\Auth\Services\PermissionService;
 use App\Domains\Auth\Services\RoleService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class RoleController.
  */
-class RoleController extends Controller
+class RoleController
 {
     /**
      * @var RoleService

app/Domains/Auth/Http/Controllers/Backend/User/DeactivatedUserController.php

@@ -4,13 +4,12 @@
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 /**
  * Class UserStatusController.
  */
-class DeactivatedUserController extends Controller
+class DeactivatedUserController
 {
     /**
      * @var UserService

app/Domains/Auth/Http/Controllers/Backend/User/DeletedUserController.php

@@ -4,12 +4,11 @@
 
 use App\Domains\Auth\Models\User;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class DeletedUserController.
  */
-class DeletedUserController extends Controller
+class DeletedUserController
 {
     /**
      * @var UserService

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

@@ -10,12 +10,11 @@
 use App\Domains\Auth\Services\PermissionService;
 use App\Domains\Auth\Services\RoleService;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class UserController.
  */
-class UserController extends Controller
+class UserController
 {
     /**
      * @var UserService
@@ -47,7 +46,7 @@ public function __construct(UserService $userService, RoleService $roleService,
     }
 
     /**
-     * @return \Illuminate\View\View
+     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
      */
     public function index()
     {

app/Domains/Auth/Http/Controllers/Backend/User/UserPasswordController.php

@@ -6,12 +6,11 @@
 use App\Domains\Auth\Http\Requests\Backend\User\UpdateUserPasswordRequest;
 use App\Domains\Auth\Models\User;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class UserPasswordController.
  */
-class UserPasswordController extends Controller
+class UserPasswordController
 {
     /**
      * @var UserService

app/Domains/Auth/Http/Controllers/Backend/User/UserSessionController.php

@@ -4,12 +4,11 @@
 
 use App\Domains\Auth\Http\Requests\Backend\User\ClearUserSessionRequest;
 use App\Domains\Auth\Models\User;
-use App\Http\Controllers\Controller;
 
 /**
  * Class UserSessionController.
  */
-class UserSessionController extends Controller
+class UserSessionController
 {
     /**
      * @param  ClearUserSessionRequest  $request

app/Domains/Auth/Http/Controllers/Frontend/Auth/ConfirmPasswordController.php

@@ -2,14 +2,13 @@
 
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
-use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ConfirmsPasswords;
 
 /**
  * Class ConfirmPasswordController.
  */
-class ConfirmPasswordController extends Controller
+class ConfirmPasswordController
 {
     /*
     |--------------------------------------------------------------------------

app/Domains/Auth/Http/Controllers/Frontend/Auth/DisableTwoFactorAuthenticationController.php

@@ -3,12 +3,11 @@
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
 use App\Domains\Auth\Http\Requests\Frontend\Auth\DisableTwoFactorAuthenticationRequest;
-use App\Http\Controllers\Controller;
 
 /**
  * Class DisableTwoFactorAuthenticationController.
  */
-class DisableTwoFactorAuthenticationController extends Controller
+class DisableTwoFactorAuthenticationController
 {
     /**
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View

app/Domains/Auth/Http/Controllers/Frontend/Auth/ForgotPasswordController.php

@@ -2,13 +2,12 @@
 
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
 /**
  * Class ForgotPasswordController.
  */
-class ForgotPasswordController extends Controller
+class ForgotPasswordController
 {
     /*
     |--------------------------------------------------------------------------

app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php

@@ -3,16 +3,16 @@
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
 use App\Domains\Auth\Events\User\UserLoggedIn;
-use App\Http\Controllers\Controller;
 use App\Rules\Captcha;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Request;
 use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class LoginController.
  */
-class LoginController extends Controller
+class LoginController
 {
     /*
     |--------------------------------------------------------------------------

app/Domains/Auth/Http/Controllers/Frontend/Auth/PasswordExpiredController.php

@@ -4,12 +4,11 @@
 
 use App\Domains\Auth\Http\Requests\Frontend\Auth\UpdatePasswordRequest;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class PasswordExpiredController.
  */
-class PasswordExpiredController extends Controller
+class PasswordExpiredController
 {
     /**
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View

app/Domains/Auth/Http/Controllers/Frontend/Auth/RegisterController.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 use App\Rules\Captcha;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Validator;
@@ -13,7 +12,7 @@
 /**
  * Class RegisterController.
  */
-class RegisterController extends Controller
+class RegisterController
 {
     /*
     |--------------------------------------------------------------------------

app/Domains/Auth/Http/Controllers/Frontend/Auth/ResetPasswordController.php

@@ -3,7 +3,6 @@
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
 use App\Domains\Auth\Rules\UnusedPassword;
-use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 use Illuminate\Http\Request;
@@ -12,7 +11,7 @@
 /**
  * Class ResetPasswordController.
  */
-class ResetPasswordController extends Controller
+class ResetPasswordController
 {
     /*
     |--------------------------------------------------------------------------

app/Domains/Auth/Http/Controllers/Frontend/Auth/SocialController.php

@@ -4,13 +4,12 @@
 
 use App\Domains\Auth\Events\User\UserLoggedIn;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 use Laravel\Socialite\Facades\Socialite;
 
 /**
  * Class SocialController.
  */
-class SocialController extends Controller
+class SocialController
 {
     /**
      * @param $provider

app/Domains/Auth/Http/Controllers/Frontend/Auth/TwoFactorAuthenticationController.php

@@ -2,13 +2,12 @@
 
 namespace App\Domains\Auth\Http\Controllers\Frontend\Auth;
 
-use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
 /**
  * Class TwoFactorAuthenticationController.
  */
-class TwoFactorAuthenticationController extends Controller
+class TwoFactorAuthenticationController
 {
     /**
      * @param  Request  $request

app/Domains/Auth/Http/Controllers/Frontend/Auth/UpdatePasswordController.php

@@ -4,12 +4,11 @@
 
 use App\Domains\Auth\Http\Requests\Frontend\Auth\UpdatePasswordRequest;
 use App\Domains\Auth\Services\UserService;
-use App\Http\Controllers\Controller;
 
 /**
  * Class UpdatePasswordController.
  */
-class UpdatePasswordController extends Controller
+class UpdatePasswordController
 {
     /**
      * @var UserService