Add PHP 7.2 testing

.travis.yml

@@ -7,6 +7,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - nightly
   - hhvm
 
 before_script:
@@ -21,6 +22,7 @@ script: make test
 matrix:
   allow_failures:
     - php: hhvm
+    - php: nightly
   fast_finish: true
 
 before_deploy:

composer.json

@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "ext-curl": "*",
-        "phpunit/phpunit": "^4.0",
+        "phpunit/phpunit": "^4.0 || ^5.0",
         "psr/log": "^1.0"
     },
     "autoload": {

src/Handler/MockHandler.php

@@ -14,7 +14,7 @@
  */
 class MockHandler implements \Countable
 {
-    private $queue;
+    private $queue = [];
     private $lastRequest;
     private $lastOptions;
     private $onFulfilled;

tests/Cookie/CookieJarTest.php

@@ -37,6 +37,11 @@ public function testCreatesFromArray()
         $this->assertCount(2, $jar);
     }
 
+    public function testEmptyJarIsCountable()
+    {
+        $this->assertCount(0, new CookieJar());
+    }
+
     public function testGetsCookiesByName()
     {
         $cookies = $this->getTestCookies();

tests/Handler/MockHandlerTest.php

@@ -28,6 +28,11 @@ public function testIsCountable()
         $this->assertCount(2, $mock);
     }
 
+    public function testEmptyHandlerIsCountable()
+    {
+        $this->assertCount(0, new MockHandler());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */

tests/Handler/StreamHandlerTest.php

@@ -270,6 +270,8 @@ public function testAddsProxy()
     public function testAddsProxyByProtocol()
     {
         $url = str_replace('http', 'tcp', Server::$url);
+        // Workaround until #1823 is fixed properly
+        $url = rtrim($url, '/');
         $res = $this->getSendResult(['proxy' => ['http' => $url]]);
         $opts = stream_context_get_options($res->getBody()->detach());
         $this->assertEquals($url, $opts['http']['proxy']);