Don’t autoload middleware

The middleware needs to be loaded right after te StartSession middleware. There is no way to do this automatically.

Author: ivanvermeyen

src/StageFrontServiceProvider.php

@@ -2,8 +2,6 @@
 
 namespace CodeZero\StageFront;
 
-use CodeZero\StageFront\Middleware\RedirectIfStageFrontIsEnabled;
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 
 class StageFrontServiceProvider extends ServiceProvider
@@ -25,7 +23,6 @@ public function boot()
         $this->loadRoutes();
         $this->loadViews();
         $this->loadTranslations();
-        $this->loadMiddleware();
         $this->registerPublishableFiles();
     }
 
@@ -69,20 +66,6 @@ protected function loadTranslations()
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', $this->name);
     }
 
-    /**
-     * Load package middleware.
-     *
-     * @return void
-     */
-    protected function loadMiddleware()
-    {
-        if (config('stagefront.enabled') === true) {
-            app(Kernel::class)->prependMiddleware(
-                RedirectIfStageFrontIsEnabled::class
-            );
-        }
-    }
-
     /**
      * Register the publishable files.
      *

tests/TestCase.php

@@ -2,7 +2,9 @@
 
 namespace CodeZero\StageFront\Tests;
 
+use CodeZero\StageFront\Middleware\RedirectIfStageFrontIsEnabled;
 use CodeZero\StageFront\StageFrontServiceProvider;
+use Illuminate\Contracts\Http\Kernel;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
@@ -15,6 +17,10 @@ public function setUp()
         parent::setUp();
 
         config()->set('app.key', str_random(32));
+
+        app(Kernel::class)->pushMiddleware(
+            RedirectIfStageFrontIsEnabled::class
+        );
     }
 
     /**