chore: sdk update

Author: algirdasci

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "hostinger/api-php-sdk",
-    "version": "0.0.27",
+    "version": "0.0.28",
     "description": "Hostinger API PHP SDK",
     "keywords": [
         "hostinger",
@@ -24,7 +24,8 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^7.4.5",
-        "guzzlehttp/psr7": "^2.0"
+        "guzzlehttp/psr7": "^2.0",
+        "symfony/serializer-pack": "^1.3"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.5",

src/Api/BillingCatalogApi.php

@@ -1,4 +1,5 @@
 <?php
+/** @noinspection PhpFullyQualifiedNameUsageInspection */
 
 /**
  * Hostinger API PHP SDK
@@ -12,17 +13,18 @@
 
 namespace Hostinger\Api;
 
-use InvalidArgumentException;
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\RequestOptions;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
+use Symfony\Component\Serializer\SerializerInterface;
 use Hostinger\ApiException;
 use Hostinger\Configuration;
-use Hostinger\HeaderSelector;
 use Hostinger\ObjectSerializer;
 
 class BillingCatalogApi
@@ -31,16 +33,15 @@ class BillingCatalogApi
 
     protected Configuration $config;
 
-    protected HeaderSelector $headerSelector;
+    protected SerializerInterface $serializer;
 
     public function __construct(
-        ?ClientInterface $client = null,
         ?Configuration $config = null,
-        ?HeaderSelector $selector = null,
+        ?ClientInterface $client = null,
     ) {
-        $this->client = $client ?: new Client();
         $this->config = $config ?: Configuration::getDefaultConfiguration();
-        $this->headerSelector = $selector ?: new HeaderSelector();
+        $this->client = $client ?: new Client();
+        $this->serializer = ObjectSerializer::getSerializer();
     }
 
     public function getConfig(): Configuration
@@ -49,83 +50,68 @@ public function getConfig(): Configuration
     }
 
     /**
-     * Operation getCatalogItemListV1
-     *
-     * Get catalog item list
-     *
-     * @return \Hostinger\Model\BillingV1CatalogCatalogItemCollection|\Hostinger\Model\InlineObject1|\Hostinger\Model\InlineObject
-     * @throws ApiException on non-2xx response or if the response body is not in the expected format
-     * @throws InvalidArgumentException
-     * @throws GuzzleException
-     */
-    public function getCatalogItemListV1(?string $category = null, ?string $name = null, ): \Hostinger\Model\BillingV1CatalogCatalogItemCollection|\Hostinger\Model\InlineObject1|\Hostinger\Model\InlineObject
+    * @throws ExceptionInterface
+    * @throws ApiException
+    * @throws GuzzleException
+    */
+    public function getCatalogItemListV1(?string $category = null, ?string $name = null): \Hostinger\Model\BillingV1CatalogCatalogItemCollection
     {
-        $request = $this->getCatalogItemListV1Request($category, $name, );
+        $query = http_build_query(
+            array_filter([
+                'category' => $category,
+            ])
+        );
+
+        $query = http_build_query(
+            array_filter([
+                ', '
+                'name' => $name,
+            ])
+        );
+
+        $request = new Request(
+            method: 'GET',
+            uri: '/api/billing/v1/catalog' . $query . $query,
+            headers: $this->getHeaders(),
+        );
 
         try {
             $response = $this->client->send($request, $this->createHttpClientOption());
         } catch (RequestException $e) {
-            if ($this->config->shouldThrowException()) {
-                throw ApiException::fromRequestException($e);
-            } else {
-                $response = $e->getResponse();
-            }
+            throw ApiException::fromRequestException($e);
         } catch (ConnectException $e) {
             throw ApiException::fromConnectException($e);
         }
 
-        $statusCode = $response->getStatusCode();
-        $returnType = null;
-
-        switch ($statusCode) {
-            case 200:
-                $returnType = '\Hostinger\Model\BillingV1CatalogCatalogItemCollection';
-                break;
-            case 401:
-                $returnType = '\Hostinger\Model\InlineObject1';
-                break;
-            case 500:
-                $returnType = '\Hostinger\Model\InlineObject';
-                break;
+        return $this->serializer->deserialize($response->getBody()->getContents(), \Hostinger\Model\BillingV1CatalogCatalogItemCollection::class, JsonEncoder::FORMAT);
+    }
+
+    private function buildResourcePath(string $path, ...$values): string
+    {
+        foreach ($values as $value) {
+            if (is_array($value)) {
+                $value = implode(',', $value);
+            }
+
+            $path = str_replace('{' . 'BillingCatalog' . '}', $value, $path);
         }
 
-        return ObjectSerializer::deserialize($response->getBody()->getContents(), $returnType);
+        return $path;
     }
 
     /**
-     * Create request for operation 'getCatalogItemListV1'
-     *
-     * @throws InvalidArgumentException
+     * @return array<string, string>
      */
-    protected function getCatalogItemListV1Request(?string $category = null,?string $name = null,): Request
+    private function getHeaders(): array
     {
-        $resourcePath = '/api/billing/v1/catalog';
-
-        $body = null;
-        $query = ObjectSerializer::toQueryValue(
-            $category,
-            'category', // param base name
-            'string', // openApiType
-            'form', // style
-            true, // explode
-            false // required
-        );
-        $query = ObjectSerializer::toQueryValue(
-            $name,
-            'name', // param base name
-            'string', // openApiType
-            'form', // style
-            true, // explode
-            false // required
-        );
-
-        return $this->buildRequest('GET', $resourcePath, $body, $query);
+        return [
+            'Authorization' => 'Bearer ' . $this->config->getAccessToken(),
+            'Content-Type' => 'application/json',
+            'User-Agent' => $this->config->getUserAgent(),
+        ];
     }
 
-    /**
-     * @return array<string, mixed>
-     */
-    protected function createHttpClientOption(): array
+    private function createHttpClientOption(): array
     {
         $options = [];
         if ($this->config->getDebug()) {
@@ -137,36 +123,4 @@ protected function createHttpClientOption(): array
 
         return $options;
     }
-
-    /**
-     * @param array<string, string> $query
-     */
-    protected function buildRequest(
-        string $httpMethod,
-        string $resourcePath,
-        ?string $body = null,
-        array $query = [],
-        string $contentType = 'application/json',
-    ): Request {
-        $headers = $this->headerSelector->selectHeaders(
-            accept: ['application/json'],
-            contentType: $contentType,
-            isMultipart: false
-        );
-        $headers['User-Agent'] = $this->config->getUserAgent();
-
-        // this endpoint requires Bearer authentication (access token)
-        if (!empty($this->config->getAccessToken())) {
-            $headers['Authorization'] = 'Bearer ' . $this->config->getAccessToken();
-        }
-
-        $query = ObjectSerializer::buildQuery($query);
-
-        return new Request(
-            $httpMethod,
-            $this->config->getHost() . $resourcePath . ($query ? "?$query" : ''),
-            $headers,
-            $body
-        );
-    }
 }