Change client facotry

Author: polidog

src/Chatwork.php

@@ -8,6 +8,7 @@
 use Polidog\Chatwork\Api\Me;
 use Polidog\Chatwork\Api\My;
 use Polidog\Chatwork\Api\Rooms;
+use Polidog\Chatwork\Client\Client;
 use Polidog\Chatwork\Client\ClientFactory;
 use Polidog\Chatwork\Client\ClientInterface;
 use Polidog\Chatwork\Entity\Factory\RoomFactory;
@@ -50,8 +51,8 @@ public function rooms(): Rooms
         return new Api\Rooms($this->client, new RoomFactory());
     }
 
-    public static function create(string $token, string $version = 'v2', array $httpOptions = []): self
+    public static function create(string $token, string $version = 'v2'): self
     {
-        return new self(ClientFactory::create($token, $version, $httpOptions));
+        return new self(new Client($token, $version, null));
     }
 }

src/Client/Client.php

@@ -8,7 +8,6 @@
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Middleware;
 use Polidog\Chatwork\Exception\ClientException;
-use Psr\Http\Message\RequestInterface;
 
 final class Client implements ClientInterface
 {
@@ -29,10 +28,11 @@ final class Client implements ClientInterface
     public function __construct(
         string $chatworkToken,
         string $apiVersion,
-        ?HttpClientInterface $httpClient = null
+        ?HttpClientInterface $httpClient = null,
+        array $httpOptions = []
     ) {
         if ($httpClient === null) {
-            $httpClient = ClientFactory::createHttpClient($chatworkToken);
+            $httpClient = ClientFactory::createHttpClient($chatworkToken, [], $httpOptions);
         }
         $this->apiVersion = $apiVersion;
         $this->httpClient = $httpClient;

src/Client/ClientFactory.php

@@ -4,6 +4,7 @@
 
 namespace Polidog\Chatwork\Client;
 
+use GuzzleHttp\Handler\CurlHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use Psr\Http\Message\RequestInterface;
@@ -27,32 +28,16 @@ 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($token, $version, new \GuzzleHttp\Client($httpOptions));
-    }
-
     public static function createHttpClient(string $chatworkToken, array $middlewares = []): \GuzzleHttp\Client
     {
         $stack = new HandlerStack();
+        $stack->setHandler(new CurlHandler());
         $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,
-        ]);
+        $options = array_merge(self::$httpOptions, ['handler' => $stack]);
         return new \GuzzleHttp\Client($options);
     }
 }