diff --git a/openapitools.json b/openapitools.json index 6f7db3e..f052220 100644 --- a/openapitools.json +++ b/openapitools.json @@ -2,6 +2,6 @@ "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", "spaces": 2, "generator-cli": { - "version": "7.12.0" + "version": "7.17.0" } } diff --git a/src/Api/CategoriesApi.php b/src/Api/CategoriesApi.php index ba5f77d..c2417c7 100644 --- a/src/Api/CategoriesApi.php +++ b/src/Api/CategoriesApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -192,36 +195,15 @@ public function getCategoriesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetCategoriesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetCategoriesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetCategoriesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetCategoriesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -236,34 +218,11 @@ public function getCategoriesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetCategoriesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetCategoriesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -273,8 +232,9 @@ public function getCategoriesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -509,4 +469,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/Api/FilesApi.php b/src/Api/FilesApi.php index 728f22c..3895164 100644 --- a/src/Api/FilesApi.php +++ b/src/Api/FilesApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -196,36 +199,15 @@ public function getFilesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFilesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFilesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFilesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFilesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -240,34 +222,11 @@ public function getFilesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFilesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFilesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -277,8 +236,9 @@ public function getFilesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -527,36 +487,15 @@ public function getModFileWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModFileResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModFileResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModFileResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -571,34 +510,11 @@ public function getModFileWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModFileResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -608,8 +524,9 @@ public function getModFileWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -880,36 +797,15 @@ public function getModFileChangelogWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -924,34 +820,11 @@ public function getModFileChangelogWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileChangelogResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -961,8 +834,9 @@ public function getModFileChangelogWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1233,36 +1107,15 @@ public function getModFileDownloadURLWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1277,34 +1130,11 @@ public function getModFileDownloadURLWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFileDownloadURLResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1314,8 +1144,9 @@ public function getModFileDownloadURLWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1614,36 +1445,15 @@ public function getModFilesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModFilesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModFilesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModFilesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFilesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1658,34 +1468,11 @@ public function getModFilesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModFilesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModFilesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1695,8 +1482,9 @@ public function getModFilesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -2026,4 +1814,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/Api/FingerprintsApi.php b/src/Api/FingerprintsApi.php index 4078476..29095e5 100644 --- a/src/Api/FingerprintsApi.php +++ b/src/Api/FingerprintsApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -193,36 +196,15 @@ public function getFingerprintFuzzyMatchesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -237,34 +219,11 @@ public function getFingerprintFuzzyMatchesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -274,8 +233,9 @@ public function getFingerprintFuzzyMatchesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -524,36 +484,15 @@ public function getFingerprintFuzzyMatchesByGameWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -568,34 +507,11 @@ public function getFingerprintFuzzyMatchesByGameWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintFuzzyMatchesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -605,8 +521,9 @@ public function getFingerprintFuzzyMatchesByGameWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -872,36 +789,15 @@ public function getFingerprintMatchesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -916,34 +812,11 @@ public function getFingerprintMatchesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -953,8 +826,9 @@ public function getFingerprintMatchesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1203,36 +1077,15 @@ public function getFingerprintMatchesByGameWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1247,34 +1100,11 @@ public function getFingerprintMatchesByGameWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFingerprintMatchesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1284,8 +1114,9 @@ public function getFingerprintMatchesByGameWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1507,4 +1338,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/Api/GamesApi.php b/src/Api/GamesApi.php index 09dfdb9..46d301e 100644 --- a/src/Api/GamesApi.php +++ b/src/Api/GamesApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -196,36 +199,15 @@ public function getGameWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetGameResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetGameResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetGameResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetGameResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -240,34 +222,11 @@ public function getGameWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetGameResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetGameResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -277,8 +236,9 @@ public function getGameWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -528,36 +488,15 @@ public function getGamesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetGamesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetGamesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetGamesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetGamesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -572,34 +511,11 @@ public function getGamesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetGamesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetGamesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -609,8 +525,9 @@ public function getGamesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -867,36 +784,15 @@ public function getVersionTypesWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetVersionTypesResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetVersionTypesResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetVersionTypesResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionTypesResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -911,34 +807,11 @@ public function getVersionTypesWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetVersionTypesResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionTypesResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -948,8 +821,9 @@ public function getVersionTypesWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1195,36 +1069,15 @@ public function getVersionsWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetVersionsResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetVersionsResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetVersionsResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionsResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1239,34 +1092,11 @@ public function getVersionsWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetVersionsResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionsResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1276,8 +1106,9 @@ public function getVersionsWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1523,36 +1354,15 @@ public function getVersionsV2WithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetVersionsV2Response', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetVersionsV2Response' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetVersionsV2Response', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionsV2Response', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1567,34 +1377,11 @@ public function getVersionsV2WithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetVersionsV2Response'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetVersionsV2Response', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1604,8 +1391,9 @@ public function getVersionsV2WithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1807,4 +1595,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/Api/MinecraftApi.php b/src/Api/MinecraftApi.php index d7f3512..4dcd99c 100644 --- a/src/Api/MinecraftApi.php +++ b/src/Api/MinecraftApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -197,36 +200,15 @@ public function getMinecraftModLoadersWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -241,34 +223,11 @@ public function getMinecraftModLoadersWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftModLoaderIndex', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -278,8 +237,9 @@ public function getMinecraftModLoadersWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -536,36 +496,15 @@ public function getMinecraftVersionsWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -580,34 +519,11 @@ public function getMinecraftVersionsWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfListOfMinecraftGameVersion', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -617,8 +533,9 @@ public function getMinecraftVersionsWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -859,36 +776,15 @@ public function getSpecificMinecraftModLoaderWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -903,34 +799,11 @@ public function getSpecificMinecraftModLoaderWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftModLoaderVersion', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -940,8 +813,9 @@ public function getSpecificMinecraftModLoaderWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1187,36 +1061,15 @@ public function getSpecificMinecraftVersionWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1231,34 +1084,11 @@ public function getSpecificMinecraftVersionWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ApiResponseOfMinecraftGameVersion', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1268,8 +1098,9 @@ public function getSpecificMinecraftVersionWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1471,4 +1302,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/Api/ModsApi.php b/src/Api/ModsApi.php index d1dfdcf..06455c9 100644 --- a/src/Api/ModsApi.php +++ b/src/Api/ModsApi.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -35,9 +35,12 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\RequestOptions; use GuzzleHttp\Promise\PromiseInterface; +use Psr\Http\Message\RequestInterface; +use Psr\Http\Message\ResponseInterface; use Aternos\CurseForgeApi\ApiException; use Aternos\CurseForgeApi\Configuration; use Aternos\CurseForgeApi\HeaderSelector; +use Aternos\CurseForgeApi\FormDataProcessor; use Aternos\CurseForgeApi\ObjectSerializer; /** @@ -196,36 +199,15 @@ public function getFeaturedModsWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -240,34 +222,11 @@ public function getFeaturedModsWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetFeaturedModsResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -277,8 +236,9 @@ public function getFeaturedModsWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -523,36 +483,15 @@ public function getModWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -567,34 +506,11 @@ public function getModWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -604,8 +520,9 @@ public function getModWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -863,36 +780,15 @@ public function getModDescriptionWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\ModDescriptionResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\ModDescriptionResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\ModDescriptionResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ModDescriptionResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -907,34 +803,11 @@ public function getModDescriptionWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\ModDescriptionResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\ModDescriptionResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -944,8 +817,9 @@ public function getModDescriptionWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1239,36 +1113,15 @@ public function getModsWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\GetModsResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\GetModsResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\GetModsResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModsResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1283,34 +1136,11 @@ public function getModsWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\GetModsResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\GetModsResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1320,8 +1150,9 @@ public function getModsWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -1634,36 +1465,15 @@ public function searchModsWithHttpInfo( $statusCode = $response->getStatusCode(); - switch($statusCode) { case 200: - if (in_array('\Aternos\CurseForgeApi\Model\SearchModsResponse', ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ('\Aternos\CurseForgeApi\Model\SearchModsResponse' !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, '\Aternos\CurseForgeApi\Model\SearchModsResponse', []), - $response->getStatusCode(), - $response->getHeaders() - ]; + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\SearchModsResponse', + $request, + $response, + ); } + if ($statusCode < 200 || $statusCode > 299) { throw new ApiException( @@ -1678,34 +1488,11 @@ public function searchModsWithHttpInfo( ); } - $returnType = '\Aternos\CurseForgeApi\Model\SearchModsResponse'; - if (in_array($returnType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { - $content = $response->getBody(); //stream goes to serializer - } else { - $content = (string) $response->getBody(); - if ($returnType !== 'string') { - try { - $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); - } catch (\JsonException $exception) { - throw new ApiException( - sprintf( - 'Error JSON decoding server response (%s)', - $request->getUri() - ), - $statusCode, - $response->getHeaders(), - $content - ); - } - } - } - - return [ - ObjectSerializer::deserialize($content, $returnType, []), - $response->getStatusCode(), - $response->getHeaders() - ]; - + return $this->handleResponseWithDataType( + '\Aternos\CurseForgeApi\Model\SearchModsResponse', + $request, + $response, + ); } catch (ApiException $e) { switch ($e->getCode()) { case 200: @@ -1715,8 +1502,9 @@ public function searchModsWithHttpInfo( $e->getResponseHeaders() ); $e->setResponseObject($data); - break; + throw $e; } + throw $e; } } @@ -2191,4 +1979,47 @@ protected function createHttpClientOption(): array return $options; } + + private function handleResponseWithDataType( + string $dataType, + RequestInterface $request, + ResponseInterface $response, + ): array { + if (in_array($dataType, ['\SplFileObject', '\Psr\Http\Message\StreamInterface'])) { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($dataType !== 'string') { + try { + $content = json_decode($content, false, 512, JSON_THROW_ON_ERROR); + } catch (\JsonException $exception) { + throw new ApiException( + sprintf( + 'Error JSON decoding server response (%s)', + $request->getUri() + ), + $response->getStatusCode(), + $response->getHeaders(), + $content + ); + } + } + } + + return [ + ObjectSerializer::deserialize($content, $dataType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + private function responseWithinRangeCode( + string $rangeCode, + int $statusCode, + ): bool { + $left = (int) ($rangeCode[0].'00'); + $right = (int) ($rangeCode[0].'99'); + + return $statusCode >= $left && $statusCode <= $right; + } } diff --git a/src/ApiException.php b/src/ApiException.php index 1dd2b67..3a284fe 100644 --- a/src/ApiException.php +++ b/src/ApiException.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Configuration.php b/src/Configuration.php index e15ba1b..0c3fdbc 100644 --- a/src/Configuration.php +++ b/src/Configuration.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/FormDataProcessor.php b/src/FormDataProcessor.php new file mode 100644 index 0000000..9421a30 --- /dev/null +++ b/src/FormDataProcessor.php @@ -0,0 +1,240 @@ + $values the value of the form parameter + * + * @return array [key => value] of formdata + */ + public function prepare(array $values): array + { + $this->has_file = false; + $result = []; + + foreach ($values as $k => $v) { + if ($v === null) { + continue; + } + + $result[$k] = $this->makeFormSafe($v); + } + + return $result; + } + + /** + * Flattens a multi-level array of data and generates a single-level array + * compatible with formdata - a single-level array where the keys use bracket + * notation to signify nested data. + * + * credit: https://github.com/FranBar1966/FlatPHP + */ + public static function flatten(array $source, string $start = ''): array + { + $opt = [ + 'prefix' => '[', + 'suffix' => ']', + 'suffix-end' => true, + 'prefix-list' => '[', + 'suffix-list' => ']', + 'suffix-list-end' => true, + ]; + + if ($start === '') { + $currentPrefix = ''; + $currentSuffix = ''; + $currentSuffixEnd = false; + } elseif (array_is_list($source)) { + $currentPrefix = $opt['prefix-list']; + $currentSuffix = $opt['suffix-list']; + $currentSuffixEnd = $opt['suffix-list-end']; + } else { + $currentPrefix = $opt['prefix']; + $currentSuffix = $opt['suffix']; + $currentSuffixEnd = $opt['suffix-end']; + } + + $currentName = $start; + $result = []; + + foreach ($source as $key => $val) { + $currentName .= $currentPrefix . $key; + + if (is_array($val) && !empty($val)) { + $currentName .= $currentSuffix; + $result += self::flatten($val, $currentName); + } else { + if ($currentSuffixEnd) { + $currentName .= $currentSuffix; + } + + if (is_resource($val)) { + $result[$currentName] = $val; + } else { + $result[$currentName] = ObjectSerializer::toString($val); + } + } + + $currentName = $start; + } + + return $result; + } + + /** + * formdata must be limited to scalars or arrays of scalar values, + * or a resource for a file upload. Here we iterate through all available + * data and identify how to handle each scenario + * + * @param string|bool|array|DateTime|ArrayAccess|SplFileObject $value + */ + protected function makeFormSafe(mixed $value) + { + if ($value instanceof SplFileObject) { + return $this->processFiles([$value])[0]; + } + + if (is_resource($value)) { + $this->has_file = true; + + return $value; + } + + if ($value instanceof ModelInterface) { + return $this->processModel($value); + } + + if (is_array($value) || is_object($value)) { + $data = []; + + foreach ($value as $k => $v) { + $data[$k] = $this->makeFormSafe($v); + } + + return $data; + } + + return ObjectSerializer::toString($value); + } + + /** + * We are able to handle nested ModelInterface. We do not simply call + * json_decode(json_encode()) because any given model may have binary data + * or other data that cannot be serialized to a JSON string + */ + protected function processModel(ModelInterface $model): array + { + $result = []; + + foreach ($model::openAPITypes() as $name => $type) { + $value = $model->offsetGet($name); + + if ($value === null) { + continue; + } + + if (str_contains($type, '\SplFileObject')) { + $file = is_array($value) ? $value : [$value]; + $result[$name] = $this->processFiles($file); + + continue; + } + + if ($value instanceof ModelInterface) { + $result[$name] = $this->processModel($value); + + continue; + } + + if (is_array($value) || is_object($value)) { + $result[$name] = $this->makeFormSafe($value); + + continue; + } + + $result[$name] = ObjectSerializer::toString($value); + } + + return $result; + } + + /** + * Handle file data + */ + protected function processFiles(array $files): array + { + $this->has_file = true; + + $result = []; + + foreach ($files as $i => $file) { + if (is_array($file)) { + $result[$i] = $this->processFiles($file); + + continue; + } + + if ($file instanceof StreamInterface) { + $result[$i] = $file; + + continue; + } + + if ($file instanceof SplFileObject) { + $result[$i] = $this->tryFopen($file); + } + } + + return $result; + } + + private function tryFopen(SplFileObject $file) + { + return Utils::tryFopen($file->getRealPath(), 'rb'); + } +} diff --git a/src/HeaderSelector.php b/src/HeaderSelector.php index a3dda45..3cc4921 100644 --- a/src/HeaderSelector.php +++ b/src/HeaderSelector.php @@ -15,7 +15,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/AffiliationServiceType.php b/src/Model/AffiliationServiceType.php index eb41923..236346a 100644 --- a/src/Model/AffiliationServiceType.php +++ b/src/Model/AffiliationServiceType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ApiResponseOfListOfMinecraftGameVersion.php b/src/Model/ApiResponseOfListOfMinecraftGameVersion.php index f4ba877..0624ab3 100644 --- a/src/Model/ApiResponseOfListOfMinecraftGameVersion.php +++ b/src/Model/ApiResponseOfListOfMinecraftGameVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ApiResponseOfListOfMinecraftModLoaderIndex.php b/src/Model/ApiResponseOfListOfMinecraftModLoaderIndex.php index 53eb479..9dd3a6a 100644 --- a/src/Model/ApiResponseOfListOfMinecraftModLoaderIndex.php +++ b/src/Model/ApiResponseOfListOfMinecraftModLoaderIndex.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ApiResponseOfMinecraftGameVersion.php b/src/Model/ApiResponseOfMinecraftGameVersion.php index 632884a..d46fffb 100644 --- a/src/Model/ApiResponseOfMinecraftGameVersion.php +++ b/src/Model/ApiResponseOfMinecraftGameVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ApiResponseOfMinecraftModLoaderVersion.php b/src/Model/ApiResponseOfMinecraftModLoaderVersion.php index 5d1219a..74e0288 100644 --- a/src/Model/ApiResponseOfMinecraftModLoaderVersion.php +++ b/src/Model/ApiResponseOfMinecraftModLoaderVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/Category.php b/src/Model/Category.php index 8e47c4a..86db178 100644 --- a/src/Model/Category.php +++ b/src/Model/Category.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/CoreApiStatus.php b/src/Model/CoreApiStatus.php index fc44dc4..630a3f4 100644 --- a/src/Model/CoreApiStatus.php +++ b/src/Model/CoreApiStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/CoreStatus.php b/src/Model/CoreStatus.php index 6092afa..a4839af 100644 --- a/src/Model/CoreStatus.php +++ b/src/Model/CoreStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FeaturedModsResponse.php b/src/Model/FeaturedModsResponse.php index 69dc406..7418117 100644 --- a/src/Model/FeaturedModsResponse.php +++ b/src/Model/FeaturedModsResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/File.php b/src/Model/File.php index 44e6e06..3161902 100644 --- a/src/Model/File.php +++ b/src/Model/File.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileDependency.php b/src/Model/FileDependency.php index 37877dc..bc6b1f6 100644 --- a/src/Model/FileDependency.php +++ b/src/Model/FileDependency.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileHash.php b/src/Model/FileHash.php index a123564..5cf90ab 100644 --- a/src/Model/FileHash.php +++ b/src/Model/FileHash.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileIndex.php b/src/Model/FileIndex.php index a75907c..41fb81f 100644 --- a/src/Model/FileIndex.php +++ b/src/Model/FileIndex.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileModule.php b/src/Model/FileModule.php index 636b745..fb042c5 100644 --- a/src/Model/FileModule.php +++ b/src/Model/FileModule.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileRelationType.php b/src/Model/FileRelationType.php index c20c074..93c102f 100644 --- a/src/Model/FileRelationType.php +++ b/src/Model/FileRelationType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileReleaseType.php b/src/Model/FileReleaseType.php index 610346f..f72ff1d 100644 --- a/src/Model/FileReleaseType.php +++ b/src/Model/FileReleaseType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FileStatus.php b/src/Model/FileStatus.php index 0f9ce85..cb4316f 100644 --- a/src/Model/FileStatus.php +++ b/src/Model/FileStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FingerprintFuzzyMatch.php b/src/Model/FingerprintFuzzyMatch.php index 3185db5..6738cb8 100644 --- a/src/Model/FingerprintFuzzyMatch.php +++ b/src/Model/FingerprintFuzzyMatch.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FingerprintFuzzyMatchResult.php b/src/Model/FingerprintFuzzyMatchResult.php index 6b434ea..3fc1e77 100644 --- a/src/Model/FingerprintFuzzyMatchResult.php +++ b/src/Model/FingerprintFuzzyMatchResult.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FingerprintMatch.php b/src/Model/FingerprintMatch.php index dd65357..d456e2e 100644 --- a/src/Model/FingerprintMatch.php +++ b/src/Model/FingerprintMatch.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FingerprintMatchesResult.php b/src/Model/FingerprintMatchesResult.php index 19ebe54..194d836 100644 --- a/src/Model/FingerprintMatchesResult.php +++ b/src/Model/FingerprintMatchesResult.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/FolderFingerprint.php b/src/Model/FolderFingerprint.php index 9fc5271..7c5ce36 100644 --- a/src/Model/FolderFingerprint.php +++ b/src/Model/FolderFingerprint.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/Game.php b/src/Model/Game.php index 276cc7b..22282c6 100644 --- a/src/Model/Game.php +++ b/src/Model/Game.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameAssets.php b/src/Model/GameAssets.php index d5c3dc4..6697494 100644 --- a/src/Model/GameAssets.php +++ b/src/Model/GameAssets.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersion.php b/src/Model/GameVersion.php index b1aee40..f9b131b 100644 --- a/src/Model/GameVersion.php +++ b/src/Model/GameVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersionStatus.php b/src/Model/GameVersionStatus.php index 23e5df5..8ba44f2 100644 --- a/src/Model/GameVersionStatus.php +++ b/src/Model/GameVersionStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersionType.php b/src/Model/GameVersionType.php index 040bf87..83db0e4 100644 --- a/src/Model/GameVersionType.php +++ b/src/Model/GameVersionType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersionTypeStatus.php b/src/Model/GameVersionTypeStatus.php index 85463da..a7ed561 100644 --- a/src/Model/GameVersionTypeStatus.php +++ b/src/Model/GameVersionTypeStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersionsByType.php b/src/Model/GameVersionsByType.php index 2f73da4..574b309 100644 --- a/src/Model/GameVersionsByType.php +++ b/src/Model/GameVersionsByType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GameVersionsByTypeV2.php b/src/Model/GameVersionsByTypeV2.php index b425b92..a3bb957 100644 --- a/src/Model/GameVersionsByTypeV2.php +++ b/src/Model/GameVersionsByTypeV2.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetCategoriesResponse.php b/src/Model/GetCategoriesResponse.php index 3aee400..4a2d6b3 100644 --- a/src/Model/GetCategoriesResponse.php +++ b/src/Model/GetCategoriesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFeaturedModsRequestBody.php b/src/Model/GetFeaturedModsRequestBody.php index 52e8492..aa7ef27 100644 --- a/src/Model/GetFeaturedModsRequestBody.php +++ b/src/Model/GetFeaturedModsRequestBody.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFeaturedModsResponse.php b/src/Model/GetFeaturedModsResponse.php index c034c65..69df96c 100644 --- a/src/Model/GetFeaturedModsResponse.php +++ b/src/Model/GetFeaturedModsResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFilesResponse.php b/src/Model/GetFilesResponse.php index 1bb56e4..f74abcd 100644 --- a/src/Model/GetFilesResponse.php +++ b/src/Model/GetFilesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFingerprintFuzzyMatchesResponse.php b/src/Model/GetFingerprintFuzzyMatchesResponse.php index 6544e51..6d017c0 100644 --- a/src/Model/GetFingerprintFuzzyMatchesResponse.php +++ b/src/Model/GetFingerprintFuzzyMatchesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFingerprintMatchesRequestBody.php b/src/Model/GetFingerprintMatchesRequestBody.php index e34cf76..03d4314 100644 --- a/src/Model/GetFingerprintMatchesRequestBody.php +++ b/src/Model/GetFingerprintMatchesRequestBody.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFingerprintMatchesResponse.php b/src/Model/GetFingerprintMatchesResponse.php index 4ee84f4..bd51317 100644 --- a/src/Model/GetFingerprintMatchesResponse.php +++ b/src/Model/GetFingerprintMatchesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetFuzzyMatchesRequestBody.php b/src/Model/GetFuzzyMatchesRequestBody.php index 6c145a1..982019d 100644 --- a/src/Model/GetFuzzyMatchesRequestBody.php +++ b/src/Model/GetFuzzyMatchesRequestBody.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetGameResponse.php b/src/Model/GetGameResponse.php index 2ffd763..1599c4c 100644 --- a/src/Model/GetGameResponse.php +++ b/src/Model/GetGameResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetGamesResponse.php b/src/Model/GetGamesResponse.php index abc0c0b..5788275 100644 --- a/src/Model/GetGamesResponse.php +++ b/src/Model/GetGamesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModFileChangelogResponse.php b/src/Model/GetModFileChangelogResponse.php index be13dde..1713afc 100644 --- a/src/Model/GetModFileChangelogResponse.php +++ b/src/Model/GetModFileChangelogResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModFileDownloadURLResponse.php b/src/Model/GetModFileDownloadURLResponse.php index 80972c4..d855ee0 100644 --- a/src/Model/GetModFileDownloadURLResponse.php +++ b/src/Model/GetModFileDownloadURLResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModFileResponse.php b/src/Model/GetModFileResponse.php index 6892e11..1caada0 100644 --- a/src/Model/GetModFileResponse.php +++ b/src/Model/GetModFileResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModFilesRequestBody.php b/src/Model/GetModFilesRequestBody.php index 7e53012..bd10734 100644 --- a/src/Model/GetModFilesRequestBody.php +++ b/src/Model/GetModFilesRequestBody.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModFilesResponse.php b/src/Model/GetModFilesResponse.php index 58cb9be..cb4c427 100644 --- a/src/Model/GetModFilesResponse.php +++ b/src/Model/GetModFilesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModResponse.php b/src/Model/GetModResponse.php index e8ff65f..f89b772 100644 --- a/src/Model/GetModResponse.php +++ b/src/Model/GetModResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModsByIdsListRequestBody.php b/src/Model/GetModsByIdsListRequestBody.php index 7291748..4296df9 100644 --- a/src/Model/GetModsByIdsListRequestBody.php +++ b/src/Model/GetModsByIdsListRequestBody.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetModsResponse.php b/src/Model/GetModsResponse.php index 10515c4..da39431 100644 --- a/src/Model/GetModsResponse.php +++ b/src/Model/GetModsResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetVersionTypesResponse.php b/src/Model/GetVersionTypesResponse.php index 07eed94..c9a22dd 100644 --- a/src/Model/GetVersionTypesResponse.php +++ b/src/Model/GetVersionTypesResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetVersionsResponse.php b/src/Model/GetVersionsResponse.php index 8fe41ed..b2ec052 100644 --- a/src/Model/GetVersionsResponse.php +++ b/src/Model/GetVersionsResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/GetVersionsV2Response.php b/src/Model/GetVersionsV2Response.php index 0a8f22d..41e8536 100644 --- a/src/Model/GetVersionsV2Response.php +++ b/src/Model/GetVersionsV2Response.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/HashAlgo.php b/src/Model/HashAlgo.php index 6841fab..a21d2a3 100644 --- a/src/Model/HashAlgo.php +++ b/src/Model/HashAlgo.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/MinecraftGameVersion.php b/src/Model/MinecraftGameVersion.php index c58dbd4..b52f78b 100644 --- a/src/Model/MinecraftGameVersion.php +++ b/src/Model/MinecraftGameVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/MinecraftModLoaderIndex.php b/src/Model/MinecraftModLoaderIndex.php index 94c58a4..bd2bb70 100644 --- a/src/Model/MinecraftModLoaderIndex.php +++ b/src/Model/MinecraftModLoaderIndex.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/MinecraftModLoaderVersion.php b/src/Model/MinecraftModLoaderVersion.php index 3c9c387..d2451c6 100644 --- a/src/Model/MinecraftModLoaderVersion.php +++ b/src/Model/MinecraftModLoaderVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/Mod.php b/src/Model/Mod.php index 9d71b28..f0918c0 100644 --- a/src/Model/Mod.php +++ b/src/Model/Mod.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModAsset.php b/src/Model/ModAsset.php index 5f810b5..6061a15 100644 --- a/src/Model/ModAsset.php +++ b/src/Model/ModAsset.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModAuthor.php b/src/Model/ModAuthor.php index 8f97c79..bf571a2 100644 --- a/src/Model/ModAuthor.php +++ b/src/Model/ModAuthor.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModDescriptionResponse.php b/src/Model/ModDescriptionResponse.php index e598f88..a4c0134 100644 --- a/src/Model/ModDescriptionResponse.php +++ b/src/Model/ModDescriptionResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModLinks.php b/src/Model/ModLinks.php index b361e1c..99d29fc 100644 --- a/src/Model/ModLinks.php +++ b/src/Model/ModLinks.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModLoaderInstallMethod.php b/src/Model/ModLoaderInstallMethod.php index 5cfff9d..0d8e78e 100644 --- a/src/Model/ModLoaderInstallMethod.php +++ b/src/Model/ModLoaderInstallMethod.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModLoaderType.php b/src/Model/ModLoaderType.php index 7ec1641..4c2b637 100644 --- a/src/Model/ModLoaderType.php +++ b/src/Model/ModLoaderType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModSearchSortField.php b/src/Model/ModSearchSortField.php index 6b1e227..181cdaa 100644 --- a/src/Model/ModSearchSortField.php +++ b/src/Model/ModSearchSortField.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModStatus.php b/src/Model/ModStatus.php index d45a618..232cef7 100644 --- a/src/Model/ModStatus.php +++ b/src/Model/ModStatus.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ModelInterface.php b/src/Model/ModelInterface.php index 1d77904..d8aec1d 100644 --- a/src/Model/ModelInterface.php +++ b/src/Model/ModelInterface.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/Pagination.php b/src/Model/Pagination.php index 5055752..1c77d00 100644 --- a/src/Model/Pagination.php +++ b/src/Model/Pagination.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/PlatformType.php b/src/Model/PlatformType.php index 8161449..ecc6484 100644 --- a/src/Model/PlatformType.php +++ b/src/Model/PlatformType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/PremiumType.php b/src/Model/PremiumType.php index b97da76..d055dce 100644 --- a/src/Model/PremiumType.php +++ b/src/Model/PremiumType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/RatingDetails.php b/src/Model/RatingDetails.php index 56e0a70..e6f0d9f 100644 --- a/src/Model/RatingDetails.php +++ b/src/Model/RatingDetails.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/RatingScore.php b/src/Model/RatingScore.php index ddb1f38..e60eeb9 100644 --- a/src/Model/RatingScore.php +++ b/src/Model/RatingScore.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/SearchModsResponse.php b/src/Model/SearchModsResponse.php index a7e5585..e3c5447 100644 --- a/src/Model/SearchModsResponse.php +++ b/src/Model/SearchModsResponse.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/ServerAffiliation.php b/src/Model/ServerAffiliation.php index 82c5927..c17e96a 100644 --- a/src/Model/ServerAffiliation.php +++ b/src/Model/ServerAffiliation.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/SocialLink.php b/src/Model/SocialLink.php index e05a4da..c101437 100644 --- a/src/Model/SocialLink.php +++ b/src/Model/SocialLink.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/SocialLinkType.php b/src/Model/SocialLinkType.php index 47a2465..1ab770b 100644 --- a/src/Model/SocialLinkType.php +++ b/src/Model/SocialLinkType.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/SortOrder.php b/src/Model/SortOrder.php index 94703fe..ef991a1 100644 --- a/src/Model/SortOrder.php +++ b/src/Model/SortOrder.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/Model/SortableGameVersion.php b/src/Model/SortableGameVersion.php index e996911..b8451f7 100644 --- a/src/Model/SortableGameVersion.php +++ b/src/Model/SortableGameVersion.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** diff --git a/src/ObjectSerializer.php b/src/ObjectSerializer.php index b61cd25..613fcad 100644 --- a/src/ObjectSerializer.php +++ b/src/ObjectSerializer.php @@ -16,7 +16,7 @@ * * The version of the OpenAPI document: 1.0.0 * @generated Generated by: https://openapi-generator.tech - * Generator version: 7.12.0 + * Generator version: 7.17.0 */ /** @@ -324,24 +324,6 @@ public static function toHeaderValue(string $value): string return self::toString($value); } - /** - * Take value and turn it into a string suitable for inclusion in - * the http body (form parameter). If it's a string, pass through unchanged - * If it's a datetime object, format it in ISO8601 - * - * @param string|\SplFileObject $value the value of the form parameter - * - * @return string the form string - */ - public static function toFormValue(string|\SplFileObject $value): string - { - if ($value instanceof \SplFileObject) { - return $value->getRealPath(); - } else { - return self::toString($value); - } - } - /** * Take value and turn it into a string suitable for inclusion in * the parameter. If it's a string, pass through unchanged @@ -605,6 +587,6 @@ public static function buildQuery(array $params, $encoding = PHP_QUERY_RFC3986): } } - return $qs ? (string) substr($qs, 0, -1) : ''; + return $qs ? substr($qs, 0, -1) : ''; } }