Merge pull request #19 from clue-labs/php

First class support for PHP 5.3 through PHP 7 and HHVM

Author: clue

.travis.yml

@@ -1,14 +1,23 @@
 language: php
+
 php:
   - 5.3
+  - 5.4
+  - 5.5
   - 5.6
+  - 7
   - hhvm
+
+sudo: true
+
 env:
   - QUASSEL_HOST=127.0.0.1:4242
+
 install:
   - sudo apt-get -qq update && sudo apt-get --no-install-recommends -qq install -y quassel-core
-  - composer install --prefer-source --no-interaction
+  - composer install --no-interaction
+
 script:
   - sudo /etc/init.d/quasselcore status || sudo /etc/init.d/quasselcore start
   - sudo /etc/init.d/quasselcore status || sleep 2
-  - phpunit --coverage-text
+  - vendor/bin/phpunit --coverage-text

composer.json

@@ -22,6 +22,7 @@
         "clue/qdatastream": "~0.5.0"
     },
     "require-dev": {
-        "clue/block-react": "~0.3.0"
+        "clue/block-react": "^1.1",
+        "phpunit/phpunit": "^4.8"
     }
 }

tests/FunctionalTest.php

@@ -48,7 +48,7 @@ public function testCreateClient()
         $factory = new Factory(self::$loop);
         $promise = $factory->createClient(self::$host);
 
-        $client = Block\await($promise, self::$loop);
+        $client = Block\await($promise, self::$loop, 10.0);
 
         return $client;
     }
@@ -102,6 +102,9 @@ public function testSendClientLogin(Client $client, $message)
         $message = $this->awaitMessage($client);
         $this->assertEquals('ClientLoginAck', $message['MsgType']);
 
+        $message = $this->awaitMessage($client);
+        $this->assertEquals('SessionInit', $message['MsgType']);
+
         return $message;
     }
 
@@ -127,7 +130,7 @@ public function testSendHeartBeat(Client $client)
 
         $client->sendHeartBeatRequest($time);
 
-        $received = Block\await($promise, self::$loop);
+        $received = Block\await($promise, self::$loop, 10.0);
 
         $this->assertEquals($time, $received);
     }
@@ -143,7 +146,7 @@ public function testClose(Client $client)
 
         $client->close();
 
-        return Block\await($promise, self::$loop);
+        return Block\await($promise, self::$loop, 10.0);
     }
 
     private function awaitMessage(Client $client)
@@ -153,6 +156,6 @@ private function awaitMessage(Client $client)
 
             $client->once('error', $reject);
             $client->once('close', $reject);
-        }), self::$loop);
+        }), self::$loop, 10.0);
     }
 }