Use type declarations

jeromegamez · Apr 15, 2021 · c50ed00 · c50ed00
1 parent a23348e
commit c50ed00
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 56 deletions.
diff --git a/src/Api/HttpApiClient.php b/src/Api/HttpApiClient.php
@@ -14,30 +14,11 @@
 
 final class HttpApiClient implements ApiClient
 {
-    /**
-     * @var string
-     */
-    private $apiScheme = 'https';
-
-    /**
-     * @var string
-     */
-    private $apiHost;
-
-    /**
-     * @var string
-     */
-    private $apiKey;
-
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @var RequestFactoryInterface
-     */
-    private $requestFactory;
+    private string $apiScheme = 'https';
+    private string $apiHost;
+    private string $apiKey;
+    private ClientInterface $client;
+    private RequestFactoryInterface $requestFactory;
 
     private function __construct()
     {
@@ -47,7 +28,7 @@ public static function with(string $accountName, string $apiKey, ClientInterface
     {
         $that = new self();
 
-        $that->apiHost = "{$accountName}.mite.yo.lk";
+        $that->apiHost = "$accountName}.mite.yo.lk";
         $that->apiKey = $apiKey;
         $that->client = $client;
         $that->requestFactory = $requestFactory;
@@ -84,7 +65,7 @@ public function delete(string $endpoint, array $params = null): ResponseInterfac
      * @param array<string, numeric|string>|null $params
      * @param array<string, numeric|string>|null $data
      */
-    private function request(string $method, string $endpoint, array $params = null, array $data = null): ResponseInterface
+    private function request(string $method, string $endpoint, array $params = null, ?array $data = null): ResponseInterface
     {
         $url = $this->createUrl($endpoint, $params);
 

diff --git a/src/Exception/ApiClientError.php b/src/Exception/ApiClientError.php
@@ -12,15 +12,8 @@
 
 final class ApiClientError extends RuntimeException implements MiteException
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var ResponseInterface|null
-     */
-    private $response;
+    private RequestInterface $request;
+    private ?ResponseInterface $response;
 
     public function __construct(RequestInterface $request, ?ResponseInterface $response, string $message = null, int $code = null, Throwable $previous = null)
     {
@@ -51,7 +44,7 @@ public static function fromRequestAndResponse(RequestInterface $request, Respons
         $code = $response->getStatusCode();
         try {
             $data = JSON::decode((string) $response->getBody(), true);
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             $data = [];
         }
         $message = $data['error'] ?? null;

diff --git a/src/Exception/InvalidArgument.php b/src/Exception/InvalidArgument.php
@@ -4,9 +4,10 @@
 
 namespace Gamez\Mite\Exception;
 
+use InvalidArgumentException;
 use Throwable;
 
-final class InvalidArgument extends \InvalidArgumentException implements MiteException
+final class InvalidArgument extends InvalidArgumentException implements MiteException
 {
     public static function because(string $reason, ?Throwable $previous = null): self
     {

diff --git a/src/SimpleApi.php b/src/SimpleApi.php
@@ -9,10 +9,7 @@
 
 final class SimpleApi
 {
-    /**
-     * @var ApiClient
-     */
-    private $client;
+    private ApiClient $client;
 
     private function __construct()
     {

diff --git a/src/SimpleTracker.php b/src/SimpleTracker.php
@@ -9,10 +9,7 @@
 
 final class SimpleTracker
 {
-    /**
-     * @var ApiClient
-     */
-    private $client;
+    private ApiClient $client;
 
     private function __construct()
     {

diff --git a/src/Support/JSON.php b/src/Support/JSON.php
@@ -5,6 +5,10 @@
 namespace Gamez\Mite\Support;
 
 use Gamez\Mite\Exception\InvalidArgument;
+use function json_decode;
+use function json_encode;
+use JsonException;
+use Throwable;
 
 /**
  * @internal
@@ -21,12 +25,11 @@ public static function encode($value, $options = null, $depth = null): string
         $options = $options ?? 0;
         $depth = $depth ?? 512;
 
-        $json = \json_encode($value, $options, $depth);
-        if (!is_string($json) || JSON_ERROR_NONE !== json_last_error()) {
-            throw new InvalidArgument('json_encode error: '.json_last_error_msg());
+        try {
+            return json_encode($value, JSON_THROW_ON_ERROR | $options, $depth) ?: '';
+        } catch (JsonException $e) {
+            throw new InvalidArgument('json decode error:'.$e->getMessage());
         }
-
-        return $json;
     }
 
     /**
@@ -38,12 +41,15 @@ public static function encode($value, $options = null, $depth = null): string
      */
     public static function decode(string $json, $assoc = null, $depth = null, $options = null)
     {
-        $data = \json_decode($json, $assoc ?? false, $depth ?? 512, $options ?? 0);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new InvalidArgument('json_decode error: '.json_last_error_msg());
-        }
+        $assoc = $assoc ?? false;
+        $depth = $depth ?? 512;
+        $options = $options ?? 0;
 
-        return $data;
+        try {
+            return json_decode($json, $assoc, $depth, JSON_THROW_ON_ERROR | $options);
+        } catch (JsonException $e) {
+            throw new InvalidArgument('json_decode error: '.$e->getMessage());
+        }
     }
 
     /**
@@ -59,7 +65,7 @@ public static function isValid($value): bool
             self::decode($value);
 
             return true;
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             return false;
         }
     }