Merge pull request #10 from polidog/feat/php8-syntax

細かいSyntaxの修正
polidog · Aug 17, 2023 · 8bd3a27 · 8bd3a27
2 parents 8a5304c + 3f68931
commit 8bd3a27
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 36 deletions.
diff --git a/src/Api.php b/src/Api.php
@@ -10,22 +10,10 @@
 /**
  * Class ApiMethods.
  */
-class Api
+final class Api
 {
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var string
-     */
-    private $currentTeam;
-
-    public function __construct(ClientInterface $client, string $currentTeam)
+    public function __construct(private ClientInterface $client, private string $currentTeam)
     {
-        $this->client = $client;
-        $this->currentTeam = $currentTeam;
     }
 
     public function user(array $params = []): array

diff --git a/src/Client/Authorization.php b/src/Client/Authorization.php
@@ -9,16 +9,10 @@
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\RequestInterface;
 
-class Authorization
+final class Authorization
 {
-    /**
-     * @var string
-     */
-    private $accessToken;
-
-    public function __construct(string $accessToken)
+    public function __construct(private string $accessToken)
     {
-        $this->accessToken = $accessToken;
     }
 
     public function push(HandlerStack $stack): void

diff --git a/src/Client/Client.php b/src/Client/Client.php
@@ -11,16 +11,6 @@
 
 final class Client implements ClientInterface
 {
-    /**
-     * @var string
-     */
-    private $accessToken;
-
-    /**
-     * @var HttpClientInterface
-     */
-    private $httpClient;
-
     /**
      * @var array
      */
@@ -34,29 +24,29 @@ final class Client implements ClientInterface
         ],
     ];
 
-    public function __construct(HttpClientInterface $httpClient)
+    public function __construct(private HttpClientInterface $httpClient)
     {
-        $this->httpClient = $httpClient;
     }
 
     /**
      * @throws ClientException
      * @throws \RuntimeException
+     * @throws \JsonException
      */
     public function request(string $method, string $path, array $data = []): array
     {
         try {
             $response = $this->httpClient->request($method, $path, $data);
 
-            return json_decode($response->getBody()->getContents(), true);
+            return json_decode($response->getBody()->getContents(), true, 512, JSON_THROW_ON_ERROR);
         } catch (GuzzleException $e) {
             throw ClientException::newException($e, $method, $path, $data);
         }
     }
 
     public static function factory(string $accessToken, array $httpOptions = []): self
     {
-        $httpOptions = array_merge(static::$httpOptions, $httpOptions);
+        $httpOptions = array_merge(self::$httpOptions, $httpOptions);
         $authorization = new Authorization($accessToken);
 
         $httpOptions['handler'] = HandlerStack::create();

diff --git a/tests/Client/ClientTest.php b/tests/Client/ClientTest.php
@@ -42,6 +42,19 @@ public function testRequest(): void
         $client = new Client($httpClient->reveal());
         $client->request('GET', '/test', ['query' => ['a' => 'b']]);
         $httpClient->request('GET', '/test', ['query' => ['a' => 'b']]);
+
+
+        $stream->getContents()
+            ->willReturn(json_encode(['a' => 'b']))
+            ->shouldHaveBeenCalledOnce();
+
+        $response->getBody()
+            ->willReturn($stream->reveal())
+            ->shouldHaveBeenCalledOnce();
+
+        $httpClient->request(Argument::any(), Argument::any(), Argument::any())
+            ->willReturn($response->reveal())
+            ->shouldHaveBeenCalledOnce();
     }
 
     public function testRequestException(): void