Merge pull request swooletw#261 from swooletw/develop

Develop

Author: albertcht

.travis.yml

@@ -4,24 +4,22 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.2
-      env: FRAMEWORK_VERSION=laravel/framework:5.4.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/framework:5.5.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/framework:5.6.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/framework:5.7.*
-    # - php: 7.2
-    #   env: FRAMEWORK_VERSION=laravel/framework:5.8.*
     - php: 7.2
-      env: FRAMEWORK_VERSION=laravel/lumen-framework:5.4.*
+      env: FRAMEWORK_VERSION=laravel/framework:5.8.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/lumen-framework:5.5.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/lumen-framework:5.6.*
     - php: 7.2
       env: FRAMEWORK_VERSION=laravel/lumen-framework:5.7.*
+    # - php: 7.2
+    #   env: FRAMEWORK_VERSION=laravel/lumen-framework:5.8.*
 
 before_install:
   - printf "\n" | pecl install swoole

routes/lumen_routes.php

@@ -11,10 +11,5 @@
 |
 */
 
-$app->get('socket.io', [
-    'as' => 'io.get', 'uses' => 'SocketIOController@upgrade',
-]);
-
-$app->post('socket.io', [
-    'as' => 'io.post', 'uses' => 'SocketIOController@reject',
-]);
+$router->get('socket.io', ['uses' => 'SocketIOController@upgrade']);
+$router->post('socket.io', ['uses' => 'SocketIOController@reject']);

src/Commands/HttpServerCommand.php

@@ -5,13 +5,14 @@
 use Throwable;
 use Swoole\Process;
 use Illuminate\Support\Arr;
+use SwooleTW\Http\Helpers\OS;
 use Illuminate\Console\Command;
 use SwooleTW\Http\Server\Manager;
 use Illuminate\Console\OutputStyle;
 use SwooleTW\Http\HotReload\FSEvent;
-use SwooleTW\Http\Server\AccessOutput;
 use SwooleTW\Http\HotReload\FSOutput;
 use SwooleTW\Http\HotReload\FSProcess;
+use SwooleTW\Http\Server\AccessOutput;
 use SwooleTW\Http\Middleware\AccessLog;
 use SwooleTW\Http\Server\Facades\Server;
 use Illuminate\Contracts\Container\Container;
@@ -372,20 +373,20 @@ protected function isDaemon(): bool
      */
     protected function checkEnvironment()
     {
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $this->error("Swoole extension doesn't support Windows OS yet.");
+        if (OS::is(OS::WIN)) {
+            $this->error('Swoole extension doesn\'t support Windows OS.');
 
             exit(1);
         }
 
         if (! extension_loaded('swoole')) {
-            $this->error("Can't detect Swoole extension installed.");
+            $this->error('Can\'t detect Swoole extension installed.');
 
             exit(1);
         }
 
-        if (! version_compare(swoole_version(), '4.0.0', 'ge')) {
-            $this->error("Your Swoole version must be higher than 4.0 to use coroutine.");
+        if (! version_compare(swoole_version(), '4.3.1', 'ge')) {
+            $this->error('Your Swoole version must be higher than `4.3.1`.');
 
             exit(1);
         }

src/Concerns/WithApplication.php

@@ -36,9 +36,7 @@ protected function bootstrap()
             if (method_exists($this->app, 'boot')) {
                 $this->app->boot();
             }
-            if (is_null(Facade::getFacadeApplication())) {
-                $this->app->withFacades();
-            }
+            $this->app->withFacades();
         }
 
         $this->preResolveInstances();

src/Helpers/Dumper.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace SwooleTW\Http\Helpers;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+class VarDumper
+{
+    protected static $cloner;
+
+    public static function dump(...$args)
+    {
+        if (! static::$cloner instanceOf VarCloner) {
+            static::$cloner = new VarCloner;
+        }
+
+        $dumper = static::getDumper();
+
+        foreach ($args as $arg) {
+            $dumper->dump(
+                static::$cloner->cloneVar($arg)
+            );
+        }
+
+        return true;
+    }
+
+    public static function getDumper()
+    {
+        $dumper = defined('IN_PHPUNIT') || ! config('swoole_http.ob_output')
+            ? CliDumper::class
+            : HtmlDumper::class;
+
+        return new $dumper;
+    }
+}

src/Helpers/FW.php

@@ -47,7 +47,7 @@ final class FW
      */
     public static function is(string ...$types): bool
     {
-        return \in_array(static::current(), $types, true);
+        return in_array(static::current(), $types, true);
     }
 
     /**

src/LumenServiceProvider.php

@@ -31,18 +31,10 @@ protected function registerManager()
      */
     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';
-            });
-        } else {
-            $app->group(['namespace' => 'App\Http\Controllers'], function ($app) {
+        $this->app->router
+            ->group(['namespace' => 'SwooleTW\Http\Controllers'], function ($router) {
                 require __DIR__ . '/../routes/lumen_routes.php';
             });
-        }
     }
 
     /**

src/Websocket/Pusher.php

@@ -212,18 +212,6 @@ public function shouldBroadcast(): bool
         return $this->broadcast && empty($this->descriptors) && ! $this->assigned;
     }
 
-    /**
-     * Check if it's a websocket fd.
-     *
-     * @param int $fd
-     *
-     * @return bool
-     */
-    public function isServerWebsocket(int $fd): bool
-    {
-        return (bool) $this->server->connection_info($fd)['websocket_status'] ?? false;
-    }
-
     /**
      * Returns all descriptors that are websocket
      *
@@ -234,7 +222,7 @@ public function isServerWebsocket(int $fd): bool
     protected function getWebsocketConnections(): array
     {
         return array_filter(iterator_to_array($this->server->connections), function ($fd) {
-            return $this->isServerWebsocket($fd);
+            return $this->server->isEstablished($fd);
         });
     }
 
@@ -245,7 +233,7 @@ protected function getWebsocketConnections(): array
      */
     public function shouldPushToDescriptor(int $fd): bool
     {
-        if (! $this->server->exist($fd)) {
+        if (! $this->server->isEstablished($fd)) {
             return false;
         }
 

tests/Server/ManagerTest.php

@@ -565,7 +565,7 @@ public function testPushMessage()
                ->andReturn(false);
 
         $server = m::mock('server');
-        $server->shouldReceive('exist')
+        $server->shouldReceive('isEstablished')
             ->andReturn(true);
         $server->shouldReceive('push')
                ->twice();

tests/Websocket/PusherTest.php

@@ -89,31 +89,23 @@ public function testHasDescriptor()
 
     public function testShouldBroadcast()
     {
-        $server = m::mock(Server::class);
-        $server->shouldReceive('connection_info')
-            ->with($fd = 1)
-            ->once()
-            ->andReturn([
-                'websocket_status' => true
-            ]);
-
         $pusher = Pusher::make([
             'opcode' => 1,
-            'sender' => 3,
+            'sender' => 1,
             'fds' => [],
             'broadcast' => true,
             'assigned' => false,
             'event' => 'event',
             'message' => 'message'
-        ], $server);
+        ], null);
 
-        $this->assertTrue($pusher->isServerWebsocket($fd));
+        $this->assertTrue($pusher->shouldBroadcast());
     }
 
     public function testShouldPushToDescriptor()
     {
         $server = m::mock(Server::class);
-        $server->shouldReceive('exist')
+        $server->shouldReceive('isEstablished')
             ->with($fd = 1)
             ->times(3)
             ->andReturn(true);