Fix http test

Author: polidog

.gitignore

@@ -5,4 +5,5 @@ composer.lock
 .php_cs.cache
 /demo.php
 .phpunit.result.cache
+.php-cs-fixer.cache
 .php-cs-fixer.php

.php-cs-fixer.cache

@@ -27,11 +27,13 @@ final class Client implements ClientInterface
      * @param HttpClientInterface $httpClient
      */
     public function __construct(
-        HttpClientInterface $httpClient,
         string $chatworkToken,
-        string $apiVersion
+        string $apiVersion,
+        ?HttpClientInterface $httpClient = null
     ) {
-        $httpClient->getConfig('handler')->push(Middleware::mapRequest(fn (RequestInterface $request) => $request->withHeader('X-ChatWorkToken', $chatworkToken)));
+        if ($httpClient === null) {
+            $httpClient = ClientFactory::createHttpClient($chatworkToken);
+        }
         $this->apiVersion = $apiVersion;
         $this->httpClient = $httpClient;
     }
@@ -80,9 +82,11 @@ private function request(string $method, string $path, array $options = []): arr
     {
         $path = sprintf('/%s/%s', $this->apiVersion, $path);
         try {
-            return json_decode($this->httpClient->request($method, $path, $options)->getBody()->getContents(), true);
+            return json_decode($this->httpClient->request($method, $path, $options)->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
         } catch (GuzzleException $e) {
             throw new ClientException(sprintf('request error. method = %s, path = %s', $method, $path), $e->getCode(), $e);
+        } catch (\JsonException $e) {
+            throw new ClientException(sprintf('json parse error. method = %s, path = %s', $method, $path), $e->getCode(), $e);
         }
     }
 }

src/Client/Client.php

@@ -4,6 +4,10 @@
 
 namespace Polidog\Chatwork\Client;
 
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;
+use Psr\Http\Message\RequestInterface;
+
 final class ClientFactory
 {
     /**
@@ -23,10 +27,32 @@ final class ClientFactory
         ],
     ];
 
+    /**
+     * @deprecated
+     *
+     * @param string $token
+     * @param string $version
+     * @param array $httpOptions
+     * @return ClientInterface
+     */
     public static function create(string $token, string $version, array $httpOptions = []): ClientInterface
     {
         $httpOptions = array_merge(self::$httpOptions, $httpOptions);
 
-        return new Client(new \GuzzleHttp\Client($httpOptions), $token, $version);
+        return new Client($token, $version, new \GuzzleHttp\Client($httpOptions));
+    }
+
+    public static function createHttpClient(string $chatworkToken, array $middlewares = []): \GuzzleHttp\Client
+    {
+        $stack = new HandlerStack();
+        $stack->push(Middleware::mapRequest(static fn (RequestInterface $request) => $request->withHeader('X-ChatWorkToken', $chatworkToken)));
+        foreach ($middlewares as $middleware) {
+            $stack->push($middleware);
+        }
+
+        $options = array_merge(self::$httpOptions, [
+          'handler' => $stack,
+        ]);
+        return new \GuzzleHttp\Client($options);
     }
 }

src/Client/ClientFactory.php

@@ -4,10 +4,9 @@
 
 namespace Polidog\Chatwork\Client;
 
-use GuzzleHttp\HandlerStack;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 
 class ClientTest extends TestCase
@@ -20,7 +19,7 @@ public function testGet(): void
         $stream->getContents()
             ->willReturn('[]');
 
-        $response = $this->prophesize(RequestInterface::class);
+        $response = $this->prophesize(ResponseInterface::class);
         $response->getBody()
             ->willReturn($stream);
 
@@ -31,9 +30,7 @@ public function testGet(): void
             ],
         ])->willReturn($response);
 
-        $httpClient->getConfig('handler')->willReturn(HandlerStack::create());
-
-        $client = new Client($httpClient->reveal(), 'test token', 'v2');
+        $client = new Client('test token', 'v2', $httpClient->reveal());
         $client->get('a/b', ['s' => 'test']);
 
         $httpClient->request('get', '/v2/a/b', [