Merge pull request #290 from swooletw/develop

Develop

Author: albertcht

src/Concerns/InteractsWithWebsocket.php

@@ -280,8 +280,11 @@ protected function prepareWebsocket()
      */
     protected function isServerWebsocket(int $fd): bool
     {
-        return (bool) $this->container->make(Server::class)
-            ->connection_info($fd)['websocket_status'] ?? false;
+        return array_key_exists(
+            'websocket_status',
+            $this->container->make(Server::class)
+                ->connection_info($fd)
+        );
     }
 
     /**
@@ -354,7 +357,7 @@ protected function createRoom(string $class, array $settings): RoomContract
      */
     protected function bindRoom(): void
     {
-        $this->app->singleton(RoomContract::class, function (Container $app) {
+        $this->app->singleton(RoomContract::class, function () {
             return $this->websocketRoom;
         });
 

src/HttpServiceProvider.php

@@ -38,14 +38,35 @@ abstract class HttpServiceProvider extends ServiceProvider
     protected static $server;
 
     /**
-     * Register the service provider.
+     * Boot the service provider.
      *
      * @return void
      */
-    public function register()
+    public function boot()
     {
+        $this->publishFiles();
+        $this->loadConfigs();
         $this->mergeConfigs();
         $this->setIsWebsocket();
+
+        $config = $this->app->make('config');
+
+        if ($config->get('swoole_http.websocket.enabled')) {
+            $this->bootWebsocketRoutes();
+        }
+
+        if ($config->get('swoole_http.server.access_log')) {
+            $this->pushAccessLogMiddleware();
+        }
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
         $this->registerServer();
         $this->registerManager();
         $this->registerCommands();
@@ -76,27 +97,23 @@ abstract protected function bootWebsocketRoutes();
     abstract protected function pushAccessLogMiddleware();
 
     /**
-     * Boot the service provider.
-     *
-     * @return void
+     * Publish files of this package.
      */
-    public function boot()
+    protected function publishFiles()
     {
         $this->publishes([
             __DIR__ . '/../config/swoole_http.php' => base_path('config/swoole_http.php'),
             __DIR__ . '/../config/swoole_websocket.php' => base_path('config/swoole_websocket.php'),
             __DIR__ . '/../routes/websocket.php' => base_path('routes/websocket.php'),
         ], 'laravel-swoole');
+    }
 
-        $config = $this->app->make('config');
-
-        if ($config->get('swoole_http.websocket.enabled')) {
-            $this->bootWebsocketRoutes();
-        }
-
-        if ($config->get('swoole_http.server.access_log')) {
-            $this->pushAccessLogMiddleware();
-        }
+    /**
+     * Load configurations.
+     */
+    protected function loadConfigs()
+    {
+        // do nothing
     }
 
     /**

src/LumenServiceProvider.php

@@ -10,6 +10,15 @@
  */
 class LumenServiceProvider extends HttpServiceProvider
 {
+    /**
+     * Load configurations.
+     */
+    protected function loadConfigs()
+    {
+        $this->app->configure('swoole_http');
+        $this->app->configure('swoole_websocket');
+    }
+
     /**
      * Register manager.
      *