Merge branch '4.x' into develop

Author: daftspunk

.github/workflows/tests.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - 2.x
       - 3.x
+      - 4.x
       - develop
   pull_request:
 
@@ -14,7 +15,7 @@ jobs:
     strategy:
       max-parallel: 6
       matrix:
-        phpVersions: ['8.0', '8.1', '8.2', '8.3']
+        phpVersions: ['8.2', '8.3', '8.4']
       fail-fast: false
     name: PHP ${{ matrix.phpVersions }}
     steps:

src/Assetic/Factory/AssetFactory.php

@@ -51,7 +51,7 @@ class AssetFactory
      */
     public function __construct($root, $debug = false)
     {
-        $this->root = rtrim($root, '/');
+        $this->root = $root ? rtrim($root, '/') : '';
         $this->debug = $debug;
         $this->output = 'assetic/*';
     }

src/Database/DatabaseServiceProvider.php

@@ -1,5 +1,6 @@
 <?php namespace October\Rain\Database;
 
+use October\Rain\Database\Updater;
 use October\Rain\Database\Schema\Blueprint;
 use October\Rain\Database\Connectors\ConnectionFactory;
 use Illuminate\Database\DatabaseServiceProvider as DatabaseServiceProviderBase;
@@ -76,6 +77,10 @@ protected function registerConnectionServices()
         $this->app->singleton('db.dongle', function ($app) {
             return new Dongle($this->getDefaultDatabaseDriver(), $app['db']);
         });
+
+        $this->app->singleton('db.updater', function ($app) {
+            return new Updater;
+        });
     }
 
     /**

src/Database/MigrationServiceProvider.php

@@ -22,6 +22,6 @@ public function register()
      */
     public function provides()
     {
-        return ['flash'];
+        return ['flash', FlashBag::class];
     }
 }

src/Flash/FlashServiceProvider.php

@@ -328,9 +328,10 @@ public function registerConfiguredProviders()
     public function registerCoreContainerAliases()
     {
         $aliases = [
+            // These are introduced externally, for example, RainLab.User plugin
+            // 'auth' => [\Illuminate\Auth\AuthManager::class, \Illuminate\Contracts\Auth\Factory::class],
+            // 'auth.driver' => [\Illuminate\Contracts\Auth\Guard::class],
             'app' => [\October\Rain\Foundation\Application::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class],
-            'auth' => [\Illuminate\Auth\AuthManager::class, \Illuminate\Contracts\Auth\Factory::class],
-            'auth.driver' => [\Illuminate\Contracts\Auth\Guard::class],
             'blade.compiler' => [\Illuminate\View\Compilers\BladeCompiler::class],
             'cache' => [\Illuminate\Cache\CacheManager::class, \Illuminate\Contracts\Cache\Factory::class],
             'cache.store' => [\Illuminate\Cache\Repository::class, \Illuminate\Contracts\Cache\Repository::class, \Psr\SimpleCache\CacheInterface::class],

src/Foundation/Application.php

@@ -0,0 +1,28 @@
+<?php namespace October\Rain\Foundation\Bootstrap;
+
+use Config;
+use Illuminate\Foundation\Bootstrap\HandleExceptions as HandleExceptionsBase;
+
+/**
+ * HandleExceptions is a registration point for handling exceptions
+ */
+class HandleExceptions extends HandleExceptionsBase
+{
+    /**
+     * shouldIgnoreDeprecationErrors determine if deprecation errors should be ignored.
+     *
+     * The logic here used by Laravel is unsatisfactory since the MessageLogged event
+     * won't distinguish between exceptions and deprecations or the log driver used,
+     * so a custom configuration key is included as part of the core system.
+     *
+     * @return bool
+     */
+    protected function shouldIgnoreDeprecationErrors()
+    {
+        if (Config::get('system.log_deprecations', false) === false) {
+            return true;
+        }
+
+        return parent::shouldIgnoreDeprecationErrors();
+    }
+}

src/Foundation/Bootstrap/HandleExceptions.php

@@ -50,4 +50,34 @@ public function withExceptions(?callable $using = null)
 
         return $this;
     }
+
+    /**
+     * withMiddleware is a modifier to the parent logic to remove unwanted default middleware
+     */
+    public function withMiddleware(?callable $callback = null)
+    {
+        $nested = function($middleware) use ($callback) {
+            $middleware
+                ->remove([
+                    \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+                    \Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
+                ])
+                ->append([
+                    \October\Rain\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+                ])
+                ->removeFromGroup('web', [
+                    \Illuminate\Cookie\Middleware\EncryptCookies::class,
+                    \Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
+                ])
+                ->appendToGroup('web', [
+                    \October\Rain\Foundation\Http\Middleware\EncryptCookies::class,
+                ]);
+
+            if ($callback !== null) {
+                $callback($middleware);
+            }
+        };
+
+        return parent::withMiddleware($nested);
+    }
 }

src/Foundation/Configuration/ApplicationBuilder.php

@@ -14,7 +14,7 @@ class Kernel extends ConsoleKernel
     protected $bootstrappers = [
         \Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables::class,
         \October\Rain\Foundation\Bootstrap\LoadConfiguration::class,
-        \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
+        \October\Rain\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \Illuminate\Foundation\Bootstrap\SetRequestForConsole::class,
         \October\Rain\Foundation\Bootstrap\RegisterOctober::class,

src/Foundation/Console/Kernel.php

@@ -18,67 +18,44 @@ class Kernel extends HttpKernel
     protected $bootstrappers = [
         \Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables::class,
         \October\Rain\Foundation\Bootstrap\LoadConfiguration::class,
-        \Illuminate\Foundation\Bootstrap\HandleExceptions::class,
+        \October\Rain\Foundation\Bootstrap\HandleExceptions::class,
         \Illuminate\Foundation\Bootstrap\RegisterFacades::class,
         \October\Rain\Foundation\Bootstrap\RegisterOctober::class,
         \October\Rain\Foundation\Bootstrap\RegisterProviders::class,
         \Illuminate\Foundation\Bootstrap\BootProviders::class,
     ];
+
     /**
-     * The application's global HTTP middleware stack.
-     *
-     * @var array
+     * @var array middleware is the application's global HTTP middleware stack.
      */
-    protected $middleware = [
-        \October\Rain\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-    ];
+    protected $middleware = [];
 
     /**
-     * The application's route middleware.
-     *
-     * @var array
+     * @var array routeMiddleware is the application's route middleware.
      */
-    protected $routeMiddleware = [
-        'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        // 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-    ];
+    protected $routeMiddleware = [];
 
     /**
-     * The application's route middleware groups.
-     *
-     * @var array
+     * @var array middlewareGroups is the application's route middleware groups.
      */
-    protected $middlewareGroups = [
-        'web' => [
-            \October\Rain\Foundation\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            // \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        ],
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
-    ];
+    protected $middlewareGroups = [];
 
     /**
-     * The priority-sorted list of middleware.
+     * @var array middlewarePriority is the priority-sorted list of middleware.
      *
      * Forces the listed middleware to always be in the given order.
-     *
-     * @var array
      */
     protected $middlewarePriority = [
+        \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
+        \October\Rain\Foundation\Http\Middleware\EncryptCookies::class,
+        \Illuminate\Cookie\Middleware\EncryptCookies::class,
+        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \Illuminate\Auth\Middleware\Authenticate::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
+        \Illuminate\Contracts\Auth\Middleware\AuthenticatesRequests::class,
+        \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        \Illuminate\Routing\Middleware\ThrottleRequestsWithRedis::class,
+        \Illuminate\Contracts\Session\Middleware\AuthenticatesSessions::class,
         \Illuminate\Routing\Middleware\SubstituteBindings::class,
         \Illuminate\Auth\Middleware\Authorize::class,
     ];