Merge pull request #5 from polidog/exception

エラー処理の変更

src/Client.php

@@ -3,9 +3,11 @@
 namespace Polidog\Esa;
 
 use GuzzleHttp\ClientInterface as HttpClientInterface;
+use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Response;
+use Polidog\Esa\Exception\ApiErrorException;
 use Psr\Http\Message\RequestInterface;
 
 final class Client
@@ -51,12 +53,22 @@ public function __construct($accessToken, $currentTeam, HttpClientInterface $htt
         $this->apiMethods = new ApiMethods($httpClient, $currentTeam);
     }
 
+    /**
+     * @param $name
+     * @param $args
+     * @return mixed
+     *
+     * @throws ApiErrorException
+     */
     public function __call($name, $args)
     {
-        /** @var Response $response */
-        $response = call_user_func_array([$this->apiMethods, $name], $args);
-        if ($response->getStatusCode() == 200) {
-            return json_decode($response->getBody()->getContents(), true);
+        try {
+            /** @var Response $response */
+            $response = call_user_func_array([$this->apiMethods, $name], $args);
+            $data = json_decode($response->getBody()->getContents(), true);
+            return $data;
+        } catch (\Exception $exception) {
+            throw ApiErrorException::newException($exception, $name, $args);
         }
     }
 

src/Exception/ApiErrorException.php

@@ -0,0 +1,48 @@
+<?php
+namespace Polidog\Esa\Exception;
+
+use GuzzleHttp\Exception\ClientException;
+
+class ApiErrorException extends \RuntimeException
+{
+    /**
+     * @var string
+     */
+    private $apiMethodName;
+
+    /**
+     * @var array
+     */
+    private $args;
+
+    /**
+     * @return string
+     */
+    public function getApiMethodName()
+    {
+        return $this->apiMethodName;
+    }
+
+    /**
+     * @return array
+     */
+    public function getArgs()
+    {
+        return $this->args;
+    }
+
+    /**
+     * @param \Exception $e
+     * @param            $name
+     * @param array      $args
+     * @return ApiErrorException
+     */
+    public static function newException(\Exception $e, $name, array $args)
+    {
+        $self = new self(sprintf("Api method error: %s", $name), $e->getCode(), $e);
+        $self->apiMethodName = $name;
+        $self->args = $args;
+        return $self;
+    }
+
+}

tests/ClientTest.php

@@ -19,16 +19,12 @@ public function callApi()
         Phake::when($httpClient)->request('GET', 'teams')
             ->thenReturn($response);
 
-        Phake::when($response)->getStatusCode()
-            ->thenReturn(200);
-
         Phake::when($response)->getBody()
             ->thenReturn($stream);
 
         $client = new Client('token', 'polidog', $httpClient);
         $client->teams();
 
-        Phake::verify($response)->getStatusCode();
         Phake::verify($response)->getBody();
         Phake::verify($stream)->getContents();
     }