Tweak service provider to work correctly

Author: mikebronner

src/Providers/LaravelCaffeineService.php

@@ -1,7 +1,6 @@
 <?php namespace GeneaLabs\LaravelCaffeine\Providers;
 
 use GeneaLabs\LaravelCaffeine\Http\Middleware\LaravelCaffeineDripMiddleware;
-use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 
 class LaravelCaffeineService extends ServiceProvider
@@ -10,44 +9,39 @@ class LaravelCaffeineService extends ServiceProvider
 
     public function boot()
     {
-        $router = new Route();
-
-        if (! $this->app->routesAreCached()) {
-            $router::group([
-                'middleware' => $this->middlewareGroupIfExists('web'),
-            ], function () {
+        app('router')->group($this->middlewareGroupExists('web')
+            ? ['middleware' => 'web']
+            : [], function () {
                 require __DIR__ . '/../../routes/web.php';
             });
-        }
 
         $this->publishes([__DIR__ . '/../../config/genealabs-laravel-caffeine.php' => config_path('genealabs-laravel-caffeine.php')], 'genealabs-laravel-caffeine');
     }
 
     public function register()
     {
         $this->mergeConfigFrom(__DIR__ . '/../../config/genealabs-laravel-caffeine.php', 'genealabs-laravel-caffeine');
-        app('Illuminate\Contracts\Http\Kernel')->pushMiddleware(LaravelCaffeineDripMiddleware::class);
+
+        app('Illuminate\Contracts\Http\Kernel')->pushMiddleware('\GeneaLabs\LaravelCaffeine\Http\Middleware\LaravelCaffeineDripMiddleware');
     }
 
-    /**
-     * @return array
-     */
-    public function provides()
+    public function provides() : array
     {
         return ['genealabs-laravel-caffeine'];
     }
 
-    private function middlewareGroupIfExists(string $group) : string
+    private function middlewareGroupExists(string $group) : bool
     {
-        $routes = collect(Route::getRoutes()->getRoutes());
+        $routes = collect(app('router')->getRoutes()->getRoutes());
 
         return $routes->reduce(function ($carry, $route) use ($group) {
+            $carry = $carry ?? false;
             $actions = (array) $route->getAction();
 
             if (array_key_exists('middleware', $actions)
                 && in_array($group, (array) $actions['middleware'])
             ) {
-                return $group;
+                return true;
             }
 
             return $carry;