Fix support for Laravel maintenance mode

Fixes wintercms/winter#917

Author: LukeTowers

src/Foundation/Console/DownCommand.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Winter\Storm\Foundation\Console;
+
+use Illuminate\Foundation\Console\DownCommand as BaseCommand;
+use Illuminate\Foundation\Exceptions\RegisterErrorViewPaths;
+use Illuminate\Support\Facades\View;
+
+class DownCommand extends BaseCommand
+{
+    /**
+     * Get the payload to be placed in the "down" file.
+     *
+     * @return array
+     */
+    protected function getDownFilePayload()
+    {
+        return [
+            'except' => $this->excludedPaths(),
+            'redirect' => $this->redirectPath(),
+            'retry' => $this->getRetryTime(),
+            'refresh' => $this->option('refresh'),
+            'secret' => $this->option('secret'),
+            'status' => (int) $this->option('status', 503),
+            'template' => $this->prerenderView(),
+        ];
+    }
+
+    /**
+     * Prerender the specified view so that it can be rendered even before loading Composer.
+     *
+     * @return string|null
+     */
+    protected function prerenderView()
+    {
+        (new RegisterErrorViewPaths)();
+
+        $selectedView = $this->option('render');
+        if ($selectedView === 'false') {
+            return null;
+        }
+
+        // Check if there is a project level view to override the system one
+        View::addNamespace('base', base_path());
+        if (View::exists('base::maintenance')) {
+            $defaultView = 'base::maintenance';
+        } else {
+            $defaultView = 'system::maintenance';
+        }
+
+        return view($selectedView ?? $defaultView, [
+            'message' => false,
+            'wentDownAt' => false,
+            'retryAfter' => $this->option('retry'),
+            'willBeAvailableAt' => false,
+        ])->render();
+    }
+}

src/Foundation/Http/Middleware/CheckForMaintenanceMode.php

@@ -3,9 +3,8 @@
 namespace Winter\Storm\Foundation\Http\Middleware;
 
 use Closure;
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
+use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
 use Illuminate\Support\Facades\Lang;
-use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Response;
 
 class CheckForMaintenanceMode extends Middleware
@@ -21,28 +20,13 @@ class CheckForMaintenanceMode extends Middleware
      */
     public function handle($request, Closure $next)
     {
-        try {
-            return parent::handle($request, $next);
-        } catch (\Illuminate\Foundation\Http\Exceptions\MaintenanceModeException $ex) {
-            // Smoothly handle AJAX requests
-            if (request()->ajax()) {
-                return Response::make(Lang::get('system::lang.page.maintenance.help') . "\r\n" . $ex->getMessage(), 503);
-            }
-
-            // Check if there is a project level view to override the system one
-            View::addNamespace('base', base_path());
-            if (View::exists('base::maintenance')) {
-                $view = 'base::maintenance';
-            } else {
-                $view = 'system::maintenance';
-            }
-
-            return Response::make(View::make($view, [
-                'message'           => $ex->getMessage(),
-                'wentDownAt'        => $ex->wentDownAt,
-                'retryAfter'        => $ex->retryAfter,
-                'willBeAvailableAt' => $ex->willBeAvailableAt,
-            ]), 503);
+        if ($this->app->maintenanceMode()->active() && request()->ajax()) {
+            return Response::make(
+                Lang::get('system::lang.page.maintenance.help'),
+                503
+            );
         }
+
+        return parent::handle($request, $next);
     }
 }

src/Foundation/Providers/ArtisanServiceProvider.php

@@ -20,7 +20,7 @@ class ArtisanServiceProvider extends ArtisanServiceProviderBase
         'ClearCompiled'         => \Winter\Storm\Foundation\Console\ClearCompiledCommand::class,
         'ConfigCache'           => \Winter\Storm\Foundation\Console\ConfigCacheCommand::class,
         'ConfigClear'           => \Winter\Storm\Foundation\Console\ConfigClearCommand::class,
-        'Down'                  => \Illuminate\Foundation\Console\DownCommand::class,
+        'Down'                  => \Winter\Storm\Foundation\Console\DownCommand::class,
         'Environment'           => \Illuminate\Foundation\Console\EnvironmentCommand::class,
         'EventCache'            => \Illuminate\Foundation\Console\EventCacheCommand::class,
         'EventClear'            => \Illuminate\Foundation\Console\EventClearCommand::class,