Skip to content

Commit 07c9fbf

Browse files
pavogpavog
authored
Merge pull request #5 from aternosorg/update-generator-7-17-0
Rerun with openapi-generator on v7.17.0
2 parents ada7aff + d0dd4f1 commit 07c9fbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2318
-4433
lines changed

‎lib/Api/APIKeysApi.php‎

Lines changed: 112 additions & 221 deletions
Large diffs are not rendered by default.

‎lib/Api/AuthenticationApi.php‎

Lines changed: 83 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* AuthenticationApi
4-
* PHP version 7.4
4+
* PHP version 8.1
55
*
66
* @category Class
77
* @package Aternos\HangarApi
@@ -16,7 +16,7 @@
1616
*
1717
* The version of the OpenAPI document: 1.0
1818
* Generated by: https://openapi-generator.tech
19-
* Generator version: 7.11.0
19+
* Generator version: 7.17.0
2020
*/
2121

2222
/**
@@ -34,8 +34,11 @@
3434
use GuzzleHttp\Psr7\MultipartStream;
3535
use GuzzleHttp\Psr7\Request;
3636
use GuzzleHttp\RequestOptions;
37+
use Psr\Http\Message\RequestInterface;
38+
use Psr\Http\Message\ResponseInterface;
3739
use Aternos\HangarApi\ApiException;
3840
use Aternos\HangarApi\Configuration;
41+
use Aternos\HangarApi\FormDataProcessor;
3942
use Aternos\HangarApi\HeaderSelector;
4043
use Aternos\HangarApi\ObjectSerializer;
4144

@@ -181,88 +184,27 @@ public function authenticateWithHttpInfo($api_key, string $contentType = self::c
181184

182185
switch($statusCode) {
183186
case 200:
184-
if ('\Aternos\HangarApi\Model\ApiSession' === '\SplFileObject') {
185-
$content = $response->getBody(); //stream goes to serializer
186-
} else {
187-
$content = (string) $response->getBody();
188-
if ('\Aternos\HangarApi\Model\ApiSession' !== 'string') {
189-
try {
190-
$content = json_decode($content, false, 512, JSON_THROW_ON_ERROR);
191-
} catch (\JsonException $exception) {
192-
throw new ApiException(
193-
sprintf(
194-
'Error JSON decoding server response (%s)',
195-
$request->getUri()
196-
),
197-
$statusCode,
198-
$response->getHeaders(),
199-
$content
200-
);
201-
}
202-
}
203-
}
204-
205-
return [
206-
ObjectSerializer::deserialize($content, '\Aternos\HangarApi\Model\ApiSession', []),
207-
$response->getStatusCode(),
208-
$response->getHeaders()
209-
];
187+
return $this->handleResponseWithDataType(
188+
'\Aternos\HangarApi\Model\ApiSession',
189+
$request,
190+
$response,
191+
);
210192
case 400:
211-
if ('\Aternos\HangarApi\Model\ApiSession' === '\SplFileObject') {
212-
$content = $response->getBody(); //stream goes to serializer
213-
} else {
214-
$content = (string) $response->getBody();
215-
if ('\Aternos\HangarApi\Model\ApiSession' !== 'string') {
216-
try {
217-
$content = json_decode($content, false, 512, JSON_THROW_ON_ERROR);
218-
} catch (\JsonException $exception) {
219-
throw new ApiException(
220-
sprintf(
221-
'Error JSON decoding server response (%s)',
222-
$request->getUri()
223-
),
224-
$statusCode,
225-
$response->getHeaders(),
226-
$content
227-
);
228-
}
229-
}
230-
}
231-
232-
return [
233-
ObjectSerializer::deserialize($content, '\Aternos\HangarApi\Model\ApiSession', []),
234-
$response->getStatusCode(),
235-
$response->getHeaders()
236-
];
193+
return $this->handleResponseWithDataType(
194+
'\Aternos\HangarApi\Model\ApiSession',
195+
$request,
196+
$response,
197+
);
237198
case 401:
238-
if ('\Aternos\HangarApi\Model\ApiSession' === '\SplFileObject') {
239-
$content = $response->getBody(); //stream goes to serializer
240-
} else {
241-
$content = (string) $response->getBody();
242-
if ('\Aternos\HangarApi\Model\ApiSession' !== 'string') {
243-
try {
244-
$content = json_decode($content, false, 512, JSON_THROW_ON_ERROR);
245-
} catch (\JsonException $exception) {
246-
throw new ApiException(
247-
sprintf(
248-
'Error JSON decoding server response (%s)',
249-
$request->getUri()
250-
),
251-
$statusCode,
252-
$response->getHeaders(),
253-
$content
254-
);
255-
}
256-
}
257-
}
258-
259-
return [
260-
ObjectSerializer::deserialize($content, '\Aternos\HangarApi\Model\ApiSession', []),
261-
$response->getStatusCode(),
262-
$response->getHeaders()
263-
];
199+
return $this->handleResponseWithDataType(
200+
'\Aternos\HangarApi\Model\ApiSession',
201+
$request,
202+
$response,
203+
);
264204
}
265205

206+
207+
266208
if ($statusCode < 200 || $statusCode > 299) {
267209
throw new ApiException(
268210
sprintf(
@@ -276,34 +218,11 @@ public function authenticateWithHttpInfo($api_key, string $contentType = self::c
276218
);
277219
}
278220

279-
$returnType = '\Aternos\HangarApi\Model\ApiSession';
280-
if ($returnType === '\SplFileObject') {
281-
$content = $response->getBody(); //stream goes to serializer
282-
} else {
283-
$content = (string) $response->getBody();
284-
if ($returnType !== 'string') {
285-
try {
286-
$content = json_decode($content, false, 512, JSON_THROW_ON_ERROR);
287-
} catch (\JsonException $exception) {
288-
throw new ApiException(
289-
sprintf(
290-
'Error JSON decoding server response (%s)',
291-
$request->getUri()
292-
),
293-
$statusCode,
294-
$response->getHeaders(),
295-
$content
296-
);
297-
}
298-
}
299-
}
300-
301-
return [
302-
ObjectSerializer::deserialize($content, $returnType, []),
303-
$response->getStatusCode(),
304-
$response->getHeaders()
305-
];
306-
221+
return $this->handleResponseWithDataType(
222+
'\Aternos\HangarApi\Model\ApiSession',
223+
$request,
224+
$response,
225+
);
307226
} catch (ApiException $e) {
308227
switch ($e->getCode()) {
309228
case 200:
@@ -313,24 +232,26 @@ public function authenticateWithHttpInfo($api_key, string $contentType = self::c
313232
$e->getResponseHeaders()
314233
);
315234
$e->setResponseObject($data);
316-
break;
235+
throw $e;
317236
case 400:
318237
$data = ObjectSerializer::deserialize(
319238
$e->getResponseBody(),
320239
'\Aternos\HangarApi\Model\ApiSession',
321240
$e->getResponseHeaders()
322241
);
323242
$e->setResponseObject($data);
324-
break;
243+
throw $e;
325244
case 401:
326245
$data = ObjectSerializer::deserialize(
327246
$e->getResponseBody(),
328247
'\Aternos\HangarApi\Model\ApiSession',
329248
$e->getResponseHeaders()
330249
);
331250
$e->setResponseObject($data);
332-
break;
251+
throw $e;
333252
}
253+
254+
334255
throw $e;
335256
}
336257
}
@@ -517,6 +438,57 @@ protected function createHttpClientOption()
517438
}
518439
}
519440

441+
if ($this->config->getCertFile()) {
442+
$options[RequestOptions::CERT] = $this->config->getCertFile();
443+
}
444+
445+
if ($this->config->getKeyFile()) {
446+
$options[RequestOptions::SSL_KEY] = $this->config->getKeyFile();
447+
}
448+
520449
return $options;
521450
}
451+
452+
private function handleResponseWithDataType(
453+
string $dataType,
454+
RequestInterface $request,
455+
ResponseInterface $response
456+
): array {
457+
if ($dataType === '\SplFileObject') {
458+
$content = $response->getBody(); //stream goes to serializer
459+
} else {
460+
$content = (string) $response->getBody();
461+
if ($dataType !== 'string') {
462+
try {
463+
$content = json_decode($content, false, 512, JSON_THROW_ON_ERROR);
464+
} catch (\JsonException $exception) {
465+
throw new ApiException(
466+
sprintf(
467+
'Error JSON decoding server response (%s)',
468+
$request->getUri()
469+
),
470+
$response->getStatusCode(),
471+
$response->getHeaders(),
472+
$content
473+
);
474+
}
475+
}
476+
}
477+
478+
return [
479+
ObjectSerializer::deserialize($content, $dataType, []),
480+
$response->getStatusCode(),
481+
$response->getHeaders()
482+
];
483+
}
484+
485+
private function responseWithinRangeCode(
486+
string $rangeCode,
487+
int $statusCode
488+
): bool {
489+
$left = (int) ($rangeCode[0].'00');
490+
$right = (int) ($rangeCode[0].'99');
491+
492+
return $statusCode >= $left && $statusCode <= $right;
493+
}
522494
}

0 commit comments

Comments
 (0)