Merge pull request #97 from clue-labs/php7.4

Run tests on PHP 7.4 and simplify test matrix

Author: clue

.travis.yml

@@ -1,25 +1,25 @@
 language: php
 
-php:
-# - 5.3 # requires old distro, see below
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3
-  - hhvm # ignore errors, see below
-
 # lock distro so new future defaults will not break the build
 dist: trusty
 
 matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4
+    - php: hhvm-3.18
+      install:
+        - composer require phpunit/phpunit:^5 --dev --no-interaction # requires legacy phpunit
   allow_failures:
-    - php: hhvm
+    - php: hhvm-3.18
 
 services:
   - redis-server

src/Factory.php

@@ -116,7 +116,7 @@ function ($error) use ($client) {
         $promise->then(array($deferred, 'resolve'), array($deferred, 'reject'));
 
         // use timeout from explicit ?timeout=x parameter or default to PHP's default_socket_timeout (60)
-        $timeout = (float) isset($parts['timeout']) ? $parts['timeout'] : ini_get("default_socket_timeout");
+        $timeout = isset($parts['timeout']) ? $parts['timeout'] : (int) ini_get("default_socket_timeout");
         if ($timeout < 0) {
             return $deferred->promise();
         }
@@ -194,7 +194,7 @@ private function parseUrl($target)
             }
 
             if (isset($args['timeout'])) {
-                $ret['timeout'] = $args['timeout'];
+                $ret['timeout'] = (float) $args['timeout'];
             }
         }
 

tests/FactoryStreamingClientTest.php

@@ -324,13 +324,13 @@ public function testCreateClientWithNegativeTimeoutParameterWillNotStartTimer()
 
     public function testCreateClientWithoutTimeoutParameterWillStartTimerWithDefaultTimeoutFromIni()
     {
-        $this->loop->expects($this->once())->method('addTimer')->with(1.5, $this->anything());
+        $this->loop->expects($this->once())->method('addTimer')->with(42, $this->anything());
 
         $deferred = new Deferred();
         $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:2')->willReturn($deferred->promise());
 
         $old = ini_get('default_socket_timeout');
-        ini_set('default_socket_timeout', '1.5');
+        ini_set('default_socket_timeout', '42');
         $this->factory->createClient('redis://127.0.0.1:2');
         ini_set('default_socket_timeout', $old);
     }