Merge pull request #15 from scaytrase/feature/cleanup

scaytrase · web-flow · commit 00c875eba042 · 2017-04-13T15:43:32.000+03:00
Cleanup
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7
+  - 7.1
   - nightly
   - hhvm
 
diff --git a/IdGenerator/IdGeneratorInterface.php b/IdGenerator/IdGeneratorInterface.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-02
- * Time: 21:57
- */
 
 namespace ScayTrase\Api\IdGenerator;
 
diff --git a/IdGenerator/UuidGenerator.php b/IdGenerator/UuidGenerator.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-02
- * Time: 22:00
- */
 
 namespace ScayTrase\Api\IdGenerator;
 
diff --git a/JsonRpc/Exception/JsonRpcExceptionInterface.php b/JsonRpc/Exception/JsonRpcExceptionInterface.php
@@ -1,15 +1,9 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 13:12
- */
 
 namespace ScayTrase\Api\JsonRpc\Exception;
 
 use ScayTrase\Api\Rpc\Exception\RpcExceptionInterface;
 
 interface JsonRpcExceptionInterface extends RpcExceptionInterface
 {
-
 }
diff --git a/JsonRpc/Exception/JsonRpcProtocolException.php b/JsonRpc/Exception/JsonRpcProtocolException.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-04
- * Time: 12:05
- */
 
 namespace ScayTrase\Api\JsonRpc\Exception;
 
diff --git a/JsonRpc/Exception/ResponseParseException.php b/JsonRpc/Exception/ResponseParseException.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 13:13
- */
 
 namespace ScayTrase\Api\JsonRpc\Exception;
 
diff --git a/JsonRpc/JsonRpcClient.php b/JsonRpc/JsonRpcClient.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-02
- * Time: 21:41
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcError.php b/JsonRpc/JsonRpcError.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 10:46
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcErrorInterface.php b/JsonRpc/JsonRpcErrorInterface.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 10:49
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcNotification.php b/JsonRpc/JsonRpcNotification.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 10:55
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcNotificationResponse.php b/JsonRpc/JsonRpcNotificationResponse.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 23:22
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcRequest.php b/JsonRpc/JsonRpcRequest.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 11:02
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcRequestInterface.php b/JsonRpc/JsonRpcRequestInterface.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 10:55
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcResponseCollection.php b/JsonRpc/JsonRpcResponseCollection.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 12:52
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/JsonRpcResponseInterface.php b/JsonRpc/JsonRpcResponseInterface.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 13:15
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/RequestTransformation.php b/JsonRpc/RequestTransformation.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 13:00
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/ResponseBodyValidator.php b/JsonRpc/ResponseBodyValidator.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-04
- * Time: 11:55
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/SyncResponse.php b/JsonRpc/SyncResponse.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-02
- * Time: 22:15
- */
 
 namespace ScayTrase\Api\JsonRpc;
 
diff --git a/JsonRpc/Tests/AbstractJsonRpcClientTest.php b/JsonRpc/Tests/AbstractJsonRpcClientTest.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 22:40
- */
 
 namespace ScayTrase\Api\JsonRpc\Tests;
 
 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;
@@ -26,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();
     }
 
@@ -43,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]);
         }
 
@@ -71,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(),
+                                ],
+                            ],
+                        ]
                     )
                 )
             );
@@ -88,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,
+                            ],
+                        ]
                     )
                 )
             );
diff --git a/JsonRpc/Tests/JsonRpcClientTest.php b/JsonRpc/Tests/JsonRpcClientTest.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-03
- * Time: 22:16
- */
 
 namespace ScayTrase\Api\JsonRpc\Tests;
 
diff --git a/JsonRpc/Tests/MockHandler.php b/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();
+    }
+}
diff --git a/JsonRpc/Tests/ResponseBodyValidatorTest.php b/JsonRpc/Tests/ResponseBodyValidatorTest.php
@@ -1,9 +1,4 @@
 <?php
-/**
- * User: scaytrase
- * Date: 2016-01-04
- * Time: 13:13
- */
 
 namespace ScayTrase\Api\JsonRpc\Tests;
 
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   },
   "autoload": {
     "psr-4": {
-      "ScayTrase\\Api\\": "src/ScayTrase/Api/"
+      "ScayTrase\\Api\\": "./"
     }
   },
   "suggest": {
diff --git a/phpmd.xml b/phpmd.xml
diff --git a/phpunit.xml b/phpunit.xml

-Original file line number
+Diff line change
   - 5.5
   - 5.6
   - 7
 +  - 7.1
   - nightly
   - hhvm
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,9 @@`
`1`	`1`	`<?php`
`2`		`-/**`
`3`		`- * User: scaytrase`
`4`		`- * Date: 2016-01-03`
`5`		`- * Time: 13:12`
`6`		`- */`
`7`	`2`
`8`	`3`	`namespace ScayTrase\Api\JsonRpc\Exception;`
`9`	`4`
`10`	`5`	`use ScayTrase\Api\Rpc\Exception\RpcExceptionInterface;`
`11`	`6`
`12`	`7`	`interface JsonRpcExceptionInterface extends RpcExceptionInterface`
`13`	`8`	`{`
`14`		`-`
`15`	`9`	`}`