Merge pull request #236 from swooletw/develop

Develop

Author: albertcht

src/HttpServiceProvider.php

@@ -4,10 +4,8 @@
 
 use SwooleTW\Http\Helpers\FW;
 use Illuminate\Queue\QueueManager;
-use Illuminate\Contracts\Http\Kernel;
 use Swoole\Http\Server as HttpServer;
 use Illuminate\Support\ServiceProvider;
-use SwooleTW\Http\Middleware\AccessLog;
 use SwooleTW\Http\Server\Facades\Server;
 use Illuminate\Database\DatabaseManager;
 use SwooleTW\Http\Coroutine\MySqlConnection;
@@ -62,11 +60,18 @@ public function register()
     abstract protected function registerManager();
 
     /**
-     * Boot routes.
+     * Boot websocket routes.
      *
      * @return void
      */
-    abstract protected function bootRoutes();
+    abstract protected function bootWebsocketRoutes();
+
+    /**
+     * Register access log middleware to container.
+     *
+     * @return void
+     */
+    abstract protected function pushAccessLogMiddleware();
 
     /**
      * Boot the service provider.
@@ -88,7 +93,7 @@ public function boot()
         }
 
         if ($config->get('swoole_http.server.access_log')) {
-            $this->app->make(Kernel::class)->pushMiddleware(AccessLog::class);
+            $this->pushAccessLogMiddleware();
         }
     }
 

src/LaravelServiceProvider.php

@@ -3,6 +3,8 @@
 namespace SwooleTW\Http;
 
 use SwooleTW\Http\Server\Manager;
+use Illuminate\Contracts\Http\Kernel;
+use SwooleTW\Http\Middleware\AccessLog;
 
 /**
  * @codeCoverageIgnore
@@ -24,12 +26,22 @@ protected function registerManager()
     }
 
     /**
-     * Boot routes.
+     * Boot websocket routes.
      *
      * @return void
      */
-    protected function bootRoutes()
+    protected function bootWebsocketRoutes()
     {
         require __DIR__ . '/../routes/laravel_routes.php';
     }
+
+    /**
+     * Register access log middleware to container.
+     *
+     * @return void
+     */
+    protected function pushAccessLogMiddleware()
+    {
+        $this->app->make(Kernel::class)->pushMiddleware(AccessLog::class);
+    }
 }

src/LumenServiceProvider.php

@@ -3,6 +3,7 @@
 namespace SwooleTW\Http;
 
 use SwooleTW\Http\Server\Manager;
+use SwooleTW\Http\Middleware\AccessLog;
 
 /**
  * @codeCoverageIgnore
@@ -24,14 +25,15 @@ protected function registerManager()
     }
 
     /**
-     * Boot routes.
+     * Boot websocket routes.
      *
      * @return void
      */
-    protected function bootRoutes()
+    protected function bootWebsocketRoutes()
     {
         $app = $this->app;
 
+        // router only exists after lumen 5.5
         if (property_exists($app, 'router')) {
             $app->router->group(['namespace' => 'SwooleTW\Http\Controllers'], function ($app) {
                 require __DIR__ . '/../routes/lumen_routes.php';
@@ -42,4 +44,14 @@ protected function bootRoutes()
             });
         }
     }
+
+    /**
+     * Register access log middleware to container.
+     *
+     * @return void
+     */
+    protected function pushAccessLogMiddleware()
+    {
+        $this->app->middleware(AccessLog::class);
+    }
 }