Merge branch 'upstream-master-for-8.x' into upstream-master

# Conflicts: # Modules/Core/composer.json # Modules/Media/composer.json # Modules/Menu/composer.json # Modules/Setting/composer.json # composer.json # composer.travis.json
arturmamedov · Nov 11, 2020 · c8d5a7d · c8d5a7d
2 parents 5e1413e + ccbb416
commit c8d5a7d
Show file tree

Hide file tree

Showing 27 changed files with 197 additions and 200 deletions.
diff --git a/.env.example b/.env.example
@@ -27,14 +27,14 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=smtp
+MAIL_MAILER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_FROM_ADDRESS=null
-MAIL_FROM_NAME=null
-MAIL_ENCRYPTION=null
+MAIL_USERNAME="your username"
+MAIL_PASSWORD="your password"
+MAIL_ENCRYPTION=tls
+#MAIL_FROM_ADDRESS=null
+#MAIL_FROM_NAME="${APP_NAME}"
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.2
   - 7.3
   - 7.4
 

diff --git a/Modules/Core/composer.json b/Modules/Core/composer.json
@@ -23,11 +23,11 @@
     "php": "^7.1.3",
     "composer/installers": "~1.0",
     "nwidart/laravel-modules": "^6.0",
-    "laravelcollective/html": "5.7.*",
+    "laravelcollective/html": "^6.0",
     "laracasts/presenter": "^0.2.4",
-    "astrotomic/laravel-translatable": "^11.1",
+    "astrotomic/laravel-translatable": "^11.9",
     "mcamara/laravel-localization": "^1.6",
-    "imagina/stylist": "^2.0",
+    "imagina/stylist": "^3.0",
     "maatwebsite/laravel-sidebar": "^2.4",
     "yajra/laravel-datatables-oracle": "~8.0",
     "tightenco/ziggy": "^0.9.4"

diff --git a/Modules/Media/composer.json b/Modules/Media/composer.json
@@ -36,7 +36,7 @@
     "league/flysystem-aws-s3-v3": "~1.0",
     "mockery/mockery": "^0.9.5",
     "friendsofphp/php-cs-fixer": "^2.12",
-    "doctrine/dbal": "^2.10"
+    "doctrine/dbal": "^2.11"
   },
   "autoload-dev": {
     "psr-4": {

diff --git a/Modules/Menu/composer.json b/Modules/Menu/composer.json
@@ -31,7 +31,7 @@
     "phpunit/phpunit": "~7.0",
     "orchestra/testbench": "3.8.*",
     "fzaninotto/faker": "1.4.0",
-    "doctrine/dbal": "^2.10",
+    "doctrine/dbal": "^2.11",
     "idavoll/page-module": "4.0.x-dev"
   },
   "autoload-dev": {

diff --git a/Modules/Setting/composer.json b/Modules/Setting/composer.json
@@ -22,7 +22,7 @@
   "require": {
     "php": "^7.1.3",
     "composer/installers": "~1.0",
-    "doctrine/dbal": "^2.10"
+    "doctrine/dbal": "^2.11"
   },
   "require-dev": {
     "phpunit/phpunit": "~7.0",

diff --git a/Modules/User/Config/config.php b/Modules/User/Config/config.php
@@ -77,6 +77,7 @@
     | Set the fields that will be casted by Eloquent
     */
     'casts' => [
+        'permissions' => 'json',
     ],
     /*
     |--------------------------------------------------------------------------

diff --git a/Modules/User/composer.json b/Modules/User/composer.json
@@ -24,7 +24,7 @@
   "require": {
     "php": "^7.1.3",
     "composer/installers": "~1.0",
-    "ramsey/uuid": "^3.4"
+    "ramsey/uuid": "^4.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~7.0",

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -16,7 +16,7 @@ class Kernel extends HttpKernel
     protected $middleware = [
         \App\Http\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
+            'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
@@ -54,7 +54,6 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         // 'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,

diff --git a/...tp/Middleware/CheckForMaintenanceMode.php → ...ware/PreventRequestsDuringMaintenance.php b/...tp/Middleware/CheckForMaintenanceMode.php → ...ware/PreventRequestsDuringMaintenance.php
@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
 
-class CheckForMaintenanceMode extends Middleware
+class PreventRequestsDuringMaintenance extends Middleware
 {
     /**
      * The URIs that should be reachable while maintenance mode is enabled.

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -4,6 +4,7 @@
 
 use App\Providers\RouteServiceProvider;
 use Closure;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class RedirectIfAuthenticated
@@ -13,13 +14,17 @@ class RedirectIfAuthenticated
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Closure  $next
-     * @param  string|null  $guard
+     * @param  string|null  ...$guards
      * @return mixed
      */
-    public function handle($request, Closure $next, $guard = null)
+    public function handle(Request $request, Closure $next, ...$guards)
     {
-        if (Auth::guard($guard)->check()) {
-            return redirect(RouteServiceProvider::HOME);
+        $guards = empty($guards) ? [null] : $guards;
+
+        foreach ($guards as $guard) {
+            if (Auth::guard($guard)->check()) {
+                return redirect(RouteServiceProvider::HOME);
+            }
         }
 
         return $next($request);

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
@@ -27,7 +27,6 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        parent::boot();
 
         //
     }

diff --git a/composer.json b/composer.json
@@ -6,34 +6,30 @@
         "asgardcms",
         "multilingual",
         "laravel",
-        "laravel5"
+        "laravel8"
     ],
     "license": "MIT",
     "type": "project",
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/imagina/laravel-menus.git"
-        }
-    ],
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.3",
         "astrotomic/laravel-translatable": "^11.9",
-        "cartalyst/sentinel": "^4.0",
-        "doctrine/dbal": "^2.10",
+        "cartalyst/sentinel": "^5.0",
+        "doctrine/dbal": "^2.11",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0.1",
         "imagina/laravel-menus": "dev-master",
-        "imagina/stylist": "^2.0",
+        "imagina/stylist": "^3.0",
         "intervention/image": "^2.5",
         "laracasts/presenter": "^0.2.4",
-        "laravel/framework": "^7.29",
+        "laravelcollective/html": "^6.0",
+        "laravel/framework": "^8.13",
         "laravel/tinker": "^2.5",
-        "laravel/ui": "^2.4",
+        "laravel/ui": "^3.0",
         "maatwebsite/laravel-sidebar": "^2.4",
         "mcamara/laravel-localization": "^1.6",
         "nwidart/laravel-modules": "^6.0",
+        "ramsey/uuid": "^4.0",
         "symfony/yaml": "^5.1",
         "tightenco/ziggy": "^0.9.4",
         "typicms/nestablecollection": "^1.1",
@@ -50,27 +46,25 @@
         "idavoll/translation-module": "4.0.x-dev",
         "idavoll/user-module": "4.0.x-dev",
         "idavoll/workshop-module": "4.0.x-dev"
+
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",
         "fzaninotto/faker": "^1.9.1",
         "league/flysystem-aws-s3-v3": "^1.0",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^4.1",
-        "orchestra/testbench": "^5.7",
-        "phpunit/phpunit": "^8.5",
+        "nunomaduro/collision": "^5.0",
+        "orchestra/testbench": "^6.2",
+        "phpunit/phpunit": "^9.3",
         "predis/predis": "^1.1",
-        "roave/security-advisories": "dev-master",
-        "facade/ignition": "^2.0"
+        "facade/ignition": "^2.3.6"
     },
     "autoload": {
-        "classmap": [
-            "database/seeds",
-            "database/factories"
-        ],
         "psr-4": {
             "App\\": "app/",
-            "Modules\\": "Modules/"
+            "Modules\\": "Modules/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
@@ -103,5 +97,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-
 }
diff --git a/composer.travis.json b/composer.travis.json
@@ -6,34 +6,30 @@
         "asgardcms",
         "multilingual",
         "laravel",
-        "laravel5"
+        "laravel8"
     ],
     "license": "MIT",
     "type": "project",
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/imagina/laravel-menus.git"
-        }
-    ],
     "require": {
-        "php": "^7.2.5",
+        "php": "^7.3",
         "astrotomic/laravel-translatable": "^11.9",
-        "cartalyst/sentinel": "^4.0",
-        "doctrine/dbal": "^2.10",
+        "cartalyst/sentinel": "^5.0",
+        "doctrine/dbal": "^2.11",
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0.1",
         "imagina/laravel-menus": "dev-master",
-        "imagina/stylist": "^2.0",
+        "imagina/stylist": "^3.0",
         "intervention/image": "^2.5",
         "laracasts/presenter": "^0.2.4",
-        "laravel/framework": "^7.29",
+        "laravelcollective/html": "^6.0",
+        "laravel/framework": "^8.13",
         "laravel/tinker": "^2.5",
-        "laravel/ui": "^2.4",
+        "laravel/ui": "^3.0",
         "maatwebsite/laravel-sidebar": "^2.4",
         "mcamara/laravel-localization": "^1.6",
         "nwidart/laravel-modules": "^6.0",
+        "ramsey/uuid": "^4.0",
         "symfony/yaml": "^5.1",
         "tightenco/ziggy": "^0.9.4",
         "typicms/nestablecollection": "^1.1",
@@ -44,21 +40,18 @@
         "fzaninotto/faker": "^1.9.1",
         "league/flysystem-aws-s3-v3": "^1.0",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^4.1",
-        "orchestra/testbench": "^5.7",
-        "phpunit/phpunit": "^8.5",
+        "nunomaduro/collision": "^5.0",
+        "orchestra/testbench": "^6.2",
+        "phpunit/phpunit": "^9.3",
         "predis/predis": "^1.1",
-        "roave/security-advisories": "dev-master",
-        "facade/ignition": "^2.0"
+        "facade/ignition": "^2.3.6"
     },
     "autoload": {
-        "classmap": [
-            "database/seeds",
-            "database/factories"
-        ],
         "psr-4": {
             "App\\": "app/",
-            "Modules\\": "Modules/"
+            "Modules\\": "Modules/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
@@ -91,5 +84,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-
 }
diff --git a/config/cache.php b/config/cache.php
@@ -89,7 +89,7 @@
         'translations' => [
             'driver' => env('TRANSLATIONS_CACHE_DRIVER', 'file'),
             'path' => storage_path('framework/cache/data/translations'),
-        ]
+        ],
 
     ],
 

diff --git a/config/logging.php b/config/logging.php
@@ -44,13 +44,13 @@
         'single' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'daily' => [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
             'days' => 14,
         ],
 
@@ -59,12 +59,12 @@
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
             'emoji' => ':boom:',
-            'level' => 'critical',
+            'level' => env('LOG_LEVEL', 'critical'),
         ],
 
         'papertrail' => [
             'driver' => 'monolog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
             'handler' => SyslogUdpHandler::class,
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
@@ -83,12 +83,12 @@
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'null' => [

diff --git a/config/queue.php b/config/queue.php
@@ -81,7 +81,7 @@
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: php
     php:
-      - 7.2
       - 7.3
       - 7.4
@@ Expand Down @@