Typings and optional steamid field

Author: DarkGL

composer.json

@@ -2,7 +2,7 @@
   "name": "simpaypl/simpay",
   "description": "Official SimPay API",
   "type": "library",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "license": "MIT",
   "minimum-stability": "stable",
   "require": {

lib/Adapter/Guzzle.php

@@ -10,11 +10,10 @@
 
 class Guzzle
 {
-
     private Client $client;
 
     private string $error;
-    private string $errorCode;
+    private int $errorCode;
 
     private string $errorApi;
 
@@ -24,28 +23,30 @@ public function __construct(Authorization $authorization)
     {
         $this->client = new Client([
             'base_uri' => 'https://api.simpay.pl',
-            'headers' => $authorization->getHeaders()
+            'headers' => $authorization->getHeaders(),
         ]);
     }
 
+    /**
+     * @param array<string, mixed>  $data
+     * @param array<string, string> $headers
+     *
+     * @return false|object|Collection
+     */
     public function request(string $method, string $uri, array $data = [], array $headers = [], bool $collect = false)
     {
-
         try {
-
             $response = $this->client->request($method, $uri, [
-                ($method === 'GET' ? 'query' : 'json') => $data,
+                ('GET' === $method ? 'query' : 'json') => $data,
                 'headers' => $headers,
-                'allow_redirects' => false
+                'allow_redirects' => false,
             ]);
 
             $response = $response->getBody()->getContents();
             $response = json_decode($response);
 
             $this->data = $response;
-
         } catch (ClientException $exception) {
-
             $response = $exception->getResponse()->getBody()->getContents();
             $json = json_decode($response);
 
@@ -57,26 +58,22 @@ public function request(string $method, string $uri, array $data = [], array $he
             $this->errorCode = $exception->getCode();
 
             return false;
-
         } catch (GuzzleException $exception) {
-
             $this->error = $exception->getMessage();
             $this->errorCode = $exception->getCode();
 
             return false;
-
         }
 
         return !$collect ? $response->data : new Collection($response->data);
-
     }
 
     public function getErrorMessage(): string
     {
         return $this->error;
     }
 
-    public function getErrorCode(): string
+    public function getErrorCode(): int
     {
         return $this->errorCode;
     }
@@ -86,9 +83,12 @@ public function getErrorApiMessage(): string
         return $this->errorApi;
     }
 
-    public function getPagination()
+    public function getPagination(): ?object
     {
+        if (!isset($this->data->pagination)) {
+            return null;
+        }
+
         return $this->data->pagination;
     }
-
-}
+}

lib/Authorization.php

@@ -4,7 +4,6 @@
 
 class Authorization
 {
-
     private string $apiKey;
     private string $apiPassword;
     private string $lang;
@@ -16,13 +15,15 @@ public function __construct(string $apiKey, string $apiPassword, string $lang =
         $this->lang = $lang;
     }
 
+    /**
+     * @return array<string, string>
+     */
     public function getHeaders(): array
     {
         return [
             'X-SIM-KEY' => $this->apiKey,
             'X-SIM-PASSWORD' => $this->apiPassword,
-            'X-SIM-LANG' => $this->lang
+            'X-SIM-LANG' => $this->lang,
         ];
     }
-
-}
+}

lib/Components/DirectBilling/GenerateResponse.php

@@ -4,30 +4,39 @@
 
 class GenerateResponse
 {
-
     private object $data;
 
-    public string $transactionId;
-    public string $redirectUrl;
+    public ?string $transactionId = null;
+    public ?string $redirectUrl = null;
 
     public function __construct(object $data)
     {
-
         $this->data = $data;
 
-        $this->transactionId = $data->transactionId;
-        $this->redirectUrl = $data->redirectUrl;
+        if (isset($data->transactionId)) {
+            $this->transactionId = $data->transactionId;
+        }
 
+        if (isset($data->redirectUrl)) {
+            $this->redirectUrl = $data->redirectUrl;
+        }
     }
 
-    public function getTransactionId()
+    public function getTransactionId(): ?string
     {
+        if (!isset($this->data->transactionId)) {
+            return null;
+        }
+
         return $this->data->transactionId;
     }
 
-    public function getRedirectUrl()
+    public function getRedirectUrl(): ?string
     {
+        if (!isset($this->data->redirectUrl)) {
+            return null;
+        }
+
         return $this->data->redirectUrl;
     }
-
-}
+}

lib/Components/Pagination.php

@@ -4,53 +4,86 @@
 
 class Pagination
 {
-
     private object $pagination;
 
     public function __construct(object $pagination)
     {
         $this->pagination = $pagination;
-        return $this;
     }
 
-    public function getTotal(): int
+    public function getTotal(): ?int
     {
+        if (!isset($this->pagination->total)) {
+            return null;
+        }
+
         return $this->pagination->total;
     }
 
-    public function getCount(): int
+    public function getCount(): ?int
     {
+        if (!isset($this->pagination->count)) {
+            return null;
+        }
+
         return $this->pagination->count;
     }
 
-    public function getPerPage(): int
+    public function getPerPage(): ?int
     {
+        if (!isset($this->pagination->per_page)) {
+            return null;
+        }
+
         return $this->pagination->per_page;
     }
 
-    public function getCurrentPage(): int
+    public function getCurrentPage(): ?int
     {
+        if (!isset($this->pagination->current_page)) {
+            return null;
+        }
+
         return $this->pagination->current_page;
     }
 
-    public function getTotalPages(): int
+    public function getTotalPages(): ?int
     {
+        if (!isset($this->pagination->total_pages)) {
+            return null;
+        }
+
         return $this->pagination->total_pages;
     }
 
-    public function hasNextPage(): bool
+    public function hasNextPage(): ?bool
     {
-        return $this->pagination->links->next_page !== null;
+        if (!isset($this->pagination->links)) {
+            return null;
+        }
+
+        if (!isset($this->pagination->links->next_page)) {
+            return null;
+        }
+
+        return null !== $this->pagination->links->next_page;
     }
 
-    public function hasPrevPage(): bool
+    public function hasPrevPage(): ?bool
     {
-        return $this->pagination->links->prev_page !== null;
+        if (!isset($this->pagination->links)) {
+            return null;
+        }
+
+        if (!isset($this->pagination->links->prev_page)) {
+            return null;
+        }
+
+        return null !== $this->pagination->links->prev_page;
     }
 
     public function getObject(): object
     {
         return $this->pagination;
     }
-
-}
+}