Fix php 7.2 test error

Author: Pavel Batanov

JsonRpc/Tests/AbstractJsonRpcClientTest.php

@@ -5,7 +5,6 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use ScayTrase\Api\JsonRpc\JsonRpcNotification;
@@ -21,14 +20,16 @@ abstract class AbstractJsonRpcClientTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->queue = null;
+        $this->queue  = null;
         $this->client = null;
         parent::setUp();
     }
 
     protected function tearDown()
     {
-        self::assertEquals(0, $this->getQueue()->count());
+        if (null !== $this->queue) {
+            self::assertEquals(0, $this->getQueue()->count());
+        }
         parent::tearDown();
     }
 
@@ -38,14 +39,15 @@ protected function getQueue()
         if (null === $this->queue) {
             $this->queue = new MockHandler();
         }
+
         return $this->queue;
     }
 
     /** @return ClientInterface */
     protected function getClient()
     {
         if (null === $this->client) {
-            $handler = HandlerStack::create($this->getQueue());
+            $handler      = HandlerStack::create($this->getQueue());
             $this->client = new Client(['handler' => $handler]);
         }
 
@@ -66,14 +68,16 @@ protected function createRequestForSingleInvocation($method, array $parameters,
                     200,
                     [],
                     json_encode(
-                        [[
-                            'jsonrpc' => '2.0',
-                            'id' => $hash,
-                            'error' => [
-                                'code' => $result->getCode(),
-                                'message' => $result->getMessage()
-                            ]
-                        ]]
+                        [
+                            [
+                                'jsonrpc' => '2.0',
+                                'id'      => $hash,
+                                'error'   => [
+                                    'code'    => $result->getCode(),
+                                    'message' => $result->getMessage(),
+                                ],
+                            ],
+                        ]
                     )
                 )
             );
@@ -83,11 +87,13 @@ protected function createRequestForSingleInvocation($method, array $parameters,
                     200,
                     [],
                     json_encode(
-                        [[
-                            'jsonrpc' => '2.0',
-                            'id' => $hash,
-                            'result' => $result
-                        ]]
+                        [
+                            [
+                                'jsonrpc' => '2.0',
+                                'id'      => $hash,
+                                'result'  => $result,
+                            ],
+                        ]
                     )
                 )
             );

JsonRpc/Tests/MockHandler.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace ScayTrase\Api\JsonRpc\Tests;
+
+use GuzzleHttp\Handler\MockHandler as GuzzleMockHandler;
+
+class MockHandler extends GuzzleMockHandler
+{
+    private $append = false;
+
+    /**
+     * Prevent empty queue being countable (PHP 7.2)
+     *
+     * @see https://github.com/guzzle/guzzle/pull/1809
+     */
+    public function append()
+    {
+        $this->append = true;
+
+        return call_user_func_array(['parent', 'append'], func_get_args());
+    }
+
+    public function count()
+    {
+        if (!$this->append) {
+            return 0;
+        }
+
+        return parent::count();
+    }
+}