Merge pull request clue#37 from clue-labs/travis

First class support for PHP 5.3 through PHP 7 and HHVM

Author: clue

.travis.yml

@@ -1,11 +1,20 @@
 language: php
+
 php:
   - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - 7
   - hhvm
+
 services:
   - redis-server
-before_script:
-  - composer install --prefer-source --no-interaction
+
+sudo: false
+
+install:
+  - composer install --no-interaction
+
 script:
   - phpunit --coverage-text

composer.json

@@ -20,5 +20,8 @@
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Redis\\": "src/" }
+    },
+    "require-dev": {
+        "clue/block-react": "^1.1"
     }
 }

tests/FunctionalTest.php

@@ -1,27 +1,28 @@
 <?php
 
 use React\Stream\Stream;
-
 use React\Stream\ReadableStream;
-
 use Clue\React\Redis\Factory;
-
 use Clue\React\Redis\StreamingClient;
+use React\Promise\Deferred;
+use Clue\React\Block;
 
 class FunctionalTest extends TestCase
 {
-    protected static $loop;
-    protected static $factory;
+    private $loop;
+    private $factory;
+    private $client;
 
-    public static function setUpBeforeClass()
+    public function setUp()
     {
-        self::$loop = new React\EventLoop\StreamSelectLoop();
-        self::$factory = new Factory(self::$loop);
+        $this->loop = new React\EventLoop\StreamSelectLoop();
+        $this->factory = new Factory($this->loop);
+        $this->client = $this->createClient();
     }
 
     public function testPing()
     {
-        $client = $this->createClient();
+        $client = $this->client;
 
         $promise = $client->ping();
         $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
@@ -36,7 +37,7 @@ public function testPing()
 
     public function testMgetIsNotInterpretedAsSubMessage()
     {
-        $client = $this->createClient();
+        $client = $this->client;
 
         $client->mset('message', 'message', 'channel', 'channel', 'payload', 'payload');
 
@@ -46,14 +47,9 @@ public function testMgetIsNotInterpretedAsSubMessage()
         $this->waitFor($client);
     }
 
-    /**
-     *
-     * @param StreamingClient $client
-     * @depends testPing
-     */
-    public function testPipeline(StreamingClient $client)
+    public function testPipeline()
     {
-        $this->assertFalse($client->isBusy());
+        $client = $this->client;
 
         $client->set('a', 1)->then($this->expectCallableOnce('OK'));
         $client->incr('a')->then($this->expectCallableOnce(2));
@@ -63,46 +59,27 @@ public function testPipeline(StreamingClient $client)
         $this->assertTrue($client->isBusy());
 
         $this->waitFor($client);
-
-        return $client;
     }
 
-    /**
-     *
-     * @param StreamingClient $client
-     * @depends testPipeline
-     */
-    public function testInvalidCommand(StreamingClient $client)
+    public function testInvalidCommand()
     {
-        $client->doesnotexist(1, 2, 3)->then($this->expectCallableNever());
-
-        $this->waitFor($client);
+        $this->client->doesnotexist(1, 2, 3)->then($this->expectCallableNever());
 
-        return $client;
+        $this->waitFor($this->client);
     }
 
-    /**
-     *
-     * @param StreamingClient $client
-     * @depends testInvalidCommand
-     */
-    public function testMultiExecEmpty(StreamingClient $client)
+    public function testMultiExecEmpty()
     {
-        $client->multi()->then($this->expectCallableOnce('OK'));
-        $client->exec()->then($this->expectCallableOnce(array()));
-
-        $this->waitFor($client);
+        $this->client->multi()->then($this->expectCallableOnce('OK'));
+        $this->client->exec()->then($this->expectCallableOnce(array()));
 
-        return $client;
+        $this->waitFor($this->client);
     }
 
-    /**
-     *
-     * @param StreamingClient $client
-     * @depends testMultiExecEmpty
-     */
-    public function testMultiExecQueuedExecHasValues(StreamingClient $client)
+    public function testMultiExecQueuedExecHasValues()
     {
+        $client = $this->client;
+
         $client->multi()->then($this->expectCallableOnce('OK'));
         $client->set('b', 10)->then($this->expectCallableOnce('QUEUED'));
         $client->expire('b', 20)->then($this->expectCallableOnce('QUEUED'));
@@ -111,17 +88,12 @@ public function testMultiExecQueuedExecHasValues(StreamingClient $client)
         $client->exec()->then($this->expectCallableOnce(array('OK', 1, 12, 20)));
 
         $this->waitFor($client);
-
-        return $client;
     }
 
-    /**
-     *
-     * @param StreamingClient $client
-     * @depends testPipeline
-     */
-    public function testMonitorPing(StreamingClient $client)
+    public function testMonitorPing()
     {
+        $client = $this->client;
+
         $client->on('monitor', $this->expectCallableOnce());
 
         $client->monitor()->then($this->expectCallableOnce('OK'));
@@ -132,29 +104,33 @@ public function testMonitorPing(StreamingClient $client)
 
     public function testPubSub()
     {
-        $consumer = $this->createClient();
+        $consumer = $this->client;
         $producer = $this->createClient();
 
-        $that = $this;
+        $channel = 'channel:test:' . mt_rand();
 
-        $producer->publish('channel:test', 'nobody sees this')->then($this->expectCallableOnce(0));
+        // consumer receives a single message
+        $deferred = new Deferred();
+        $consumer->on('message', $this->expectCallableOnce());
+        $consumer->on('message', array($deferred, 'resolve'));
+        $consumer->subscribe($channel)->then($this->expectCallableOnce());
+        $this->waitFor($consumer);
 
+        // producer sends a single message
+        $producer->publish($channel, 'hello world')->then($this->expectCallableOnce());
         $this->waitFor($producer);
 
-        $consumer->subscribe('channel:test')->then(function () {
-            // ?
-        });
+        // expect "message" event to take no longer than 0.1s
+        Block\await($deferred->promise(), $this->loop, 0.1);
     }
 
     public function testClose()
     {
-        $client = $this->createClient();
+        $this->client->get('willBeCanceledAnyway')->then(null, $this->expectCallableOnce());
 
-        $client->get('willBeCanceledAnyway')->then(null, $this->expectCallableOnce());
+        $this->client->close();
 
-        $client->close();
-
-        $client->get('willBeRejectedRightAway')->then(null, $this->expectCallableOnce());
+        $this->client->get('willBeRejectedRightAway')->then(null, $this->expectCallableOnce());
     }
 
     public function testInvalidProtocol()
@@ -186,24 +162,7 @@ public function testInvalidServerRepliesWithDuplicateMessages()
      */
     protected function createClient()
     {
-        $client = null;
-        $exception = null;
-
-        self::$factory->createClient()->then(function ($c) use (&$client) {
-            $client = $c;
-        }, function($error) use (&$exception) {
-            $exception = $error;
-        });
-
-        while ($client === null && $exception === null) {
-            self::$loop->tick();
-        }
-
-        if ($exception !== null) {
-            throw $exception;
-        }
-
-        return $client;
+        return Block\await($this->factory->createClient(), $this->loop);
     }
 
     protected function createClientResponse($response)
@@ -212,7 +171,7 @@ protected function createClientResponse($response)
         fwrite($fp, $response);
         fseek($fp, 0);
 
-        $stream = new Stream($fp, self::$loop);
+        $stream = new Stream($fp, $this->loop);
 
         return new StreamingClient($stream);
     }
@@ -229,7 +188,7 @@ protected function waitFor(StreamingClient $client)
         $this->assertTrue($client->isBusy());
 
         while ($client->isBusy()) {
-            self::$loop->tick();
+            $this->loop->tick();
         }
     }
 }

tests/StreamingClientTest.php

@@ -9,7 +9,7 @@
 use Clue\React\Redis\Client;
 use Clue\Redis\Protocol\Model\StatusReply;
 
-class ClientTest extends TestCase
+class StreamingClientTest extends TestCase
 {
     private $stream;
     private $parser;
@@ -112,29 +112,30 @@ public function testMonitor()
 
         $this->expectPromiseResolve($promise);
         $promise->then($this->expectCallableOnce('OK'));
-
-        return $this->client;
     }
 
-    /**
-     * @depends testMonitor
-     * @param StreamingClient $client
-     */
-    public function testMonitorEvent(StreamingClient $client)
+    public function testMonitorEventFromOtherConnection()
     {
-        $client->on('monitor', $this->expectCallableOnce());
+        // enter MONITOR mode
+        $client = $this->client;
+        $client->monitor();
+        $client->handleMessage(new StatusReply('OK'));
 
+        // expect a single "monitor" event when a matching status reply comes in
+        $client->on('monitor', $this->expectCallableOnce());
         $client->handleMessage(new StatusReply('1409171800.312243 [0 127.0.0.1:58542] "ping"'));
     }
 
-    /**
-     * @depends testMonitor
-     * @param StreamingClient $client
-     */
-    public function testMonitorPing(StreamingClient $client)
+    public function testMonitorEventFromPingMessage()
     {
-        $client->on('monitor', $this->expectCallableOnce());
+        // enter MONITOR mode
+        $client = $this->client;
+        $client->monitor();
+        $client->handleMessage(new StatusReply('OK'));
 
+        // expect a single "monitor" event when a matching status reply comes in
+        // ignore the status reply for the command executed (ping)
+        $client->on('monitor', $this->expectCallableOnce());
         $client->ping();
         $client->handleMessage(new StatusReply('1409171800.312243 [0 127.0.0.1:58542] "ping"'));
         $client->handleMessage(new StatusReply('PONG'));