From 90b778d7725b5ad1d4f7d3111b647c9cc0b3829e Mon Sep 17 00:00:00 2001 From: Craig McMahon Date: Tue, 28 Jul 2026 10:58:39 +0100 Subject: [PATCH] Update composer dependencies and regen Requests --- composer.json | 6 +++--- generate.php | 2 ++ src/Requests/DeleteContract.php | 2 +- src/Requests/DeleteMedia.php | 2 +- src/Requests/DeleteRoom.php | 2 +- src/Requests/GetFacilities.php | 2 +- src/Requests/PatchContract.php | 2 +- src/Requests/PatchProperty.php | 2 +- src/Requests/PatchRoom.php | 2 +- src/Requests/PutContract.php | 2 +- src/Requests/PutMedia.php | 2 +- src/Requests/PutProperty.php | 2 +- src/Requests/PutRoom.php | 2 +- src/Requests/SwaggerClient.php | 2 +- src/SturentsClient.php | 3 ++- 15 files changed, 19 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index ad409e3..e6a0948 100644 --- a/composer.json +++ b/composer.json @@ -10,15 +10,15 @@ ], "require": { "php": ">=7.4", - "guzzlehttp/guzzle": "^6.0 || ^7.0", - "netresearch/jsonmapper": "^1.4 || ^2.0 || ^3.0 || ^4.0 || ^5.0", + "guzzlehttp/guzzle": "^6.0 || ^7.0 || ^8.0", + "netresearch/jsonmapper": "1.4 || ^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0", "psr/http-message": "^1.1 || ^2.0", "ext-json": "*" }, "require-dev": { "roave/security-advisories": "dev-latest", "sturents/swagger-php-model-generator": "^0.3", - "vimeo/psalm": "^6.12" + "psalm/phar": "^6.16" }, "autoload": { "psr-4": { diff --git a/generate.php b/generate.php index 6b058fd..cb21e6a 100755 --- a/generate.php +++ b/generate.php @@ -3,6 +3,8 @@ use SwaggerGen\GenerateModels; use SwaggerGen\GenerateRequests; +// Ensure packages such as sturents/swagger-php-model-generator are upto date when generating +shell_exec('composer update'); require __DIR__.'/vendor/autoload.php'; $namespace = "SturentsLib\\Api"; diff --git a/src/Requests/DeleteContract.php b/src/Requests/DeleteContract.php index 47d748a..2117317 100644 --- a/src/Requests/DeleteContract.php +++ b/src/Requests/DeleteContract.php @@ -44,7 +44,7 @@ public function __construct($property_id, $contract_id) public function sendWith(SwaggerClient $client) { return $client->make($this, [ - '204' => '', + '204' => null, '401' => \SturentsLib\Api\Models\AuthError::class, '404' => \SturentsLib\Api\Models\Error::class, 'default' => \SturentsLib\Api\Models\Error::class diff --git a/src/Requests/DeleteMedia.php b/src/Requests/DeleteMedia.php index 8dbdf7c..6970a6f 100644 --- a/src/Requests/DeleteMedia.php +++ b/src/Requests/DeleteMedia.php @@ -42,7 +42,7 @@ public function __construct($property_id, $media_id) public function sendWith(SwaggerClient $client) { return $client->make($this, [ - '204' => '', + '204' => null, '401' => \SturentsLib\Api\Models\AuthError::class, '404' => \SturentsLib\Api\Models\Error::class, 'default' => \SturentsLib\Api\Models\Error::class diff --git a/src/Requests/DeleteRoom.php b/src/Requests/DeleteRoom.php index 50bdad6..9fcbaad 100644 --- a/src/Requests/DeleteRoom.php +++ b/src/Requests/DeleteRoom.php @@ -43,7 +43,7 @@ public function __construct($property_id, $room_id) public function sendWith(SwaggerClient $client) { return $client->make($this, [ - '204' => '', + '204' => null, '401' => \SturentsLib\Api\Models\AuthError::class, '404' => \SturentsLib\Api\Models\Error::class, 'default' => \SturentsLib\Api\Models\Error::class diff --git a/src/Requests/GetFacilities.php b/src/Requests/GetFacilities.php index 6a50675..100d8b4 100644 --- a/src/Requests/GetFacilities.php +++ b/src/Requests/GetFacilities.php @@ -17,7 +17,7 @@ class GetFacilities extends SwaggerRequest public function sendWith(SwaggerClient $client) { return $client->make($this, [ - '200' => '' + '200' => null ]); } } diff --git a/src/Requests/PatchContract.php b/src/Requests/PatchContract.php index 5d8de19..864ff10 100644 --- a/src/Requests/PatchContract.php +++ b/src/Requests/PatchContract.php @@ -35,7 +35,7 @@ class PatchContract extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\ContractCreation $contract) { - $this->body = json_encode($contract); + $this->body = json_encode($contract, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PatchProperty.php b/src/Requests/PatchProperty.php index 4149627..09aac31 100644 --- a/src/Requests/PatchProperty.php +++ b/src/Requests/PatchProperty.php @@ -26,7 +26,7 @@ class PatchProperty extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\Property $property) { - $this->body = json_encode($property); + $this->body = json_encode($property, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PatchRoom.php b/src/Requests/PatchRoom.php index a16a63c..3ce1538 100644 --- a/src/Requests/PatchRoom.php +++ b/src/Requests/PatchRoom.php @@ -35,7 +35,7 @@ class PatchRoom extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\Room $room) { - $this->body = json_encode($room); + $this->body = json_encode($room, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PutContract.php b/src/Requests/PutContract.php index 04f4318..33ee430 100644 --- a/src/Requests/PutContract.php +++ b/src/Requests/PutContract.php @@ -26,7 +26,7 @@ class PutContract extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\ContractCreation $contract) { - $this->body = json_encode($contract); + $this->body = json_encode($contract, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PutMedia.php b/src/Requests/PutMedia.php index 6840e47..3e1d6ef 100644 --- a/src/Requests/PutMedia.php +++ b/src/Requests/PutMedia.php @@ -26,7 +26,7 @@ class PutMedia extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\MediaUpload $mediaupload) { - $this->body = json_encode($mediaupload); + $this->body = json_encode($mediaupload, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PutProperty.php b/src/Requests/PutProperty.php index a17c735..634ca55 100644 --- a/src/Requests/PutProperty.php +++ b/src/Requests/PutProperty.php @@ -15,7 +15,7 @@ class PutProperty extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\PropertyCreation $property) { - $this->body = json_encode($property); + $this->body = json_encode($property, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/PutRoom.php b/src/Requests/PutRoom.php index 55b536a..89ff917 100644 --- a/src/Requests/PutRoom.php +++ b/src/Requests/PutRoom.php @@ -26,7 +26,7 @@ class PutRoom extends SwaggerRequest */ public function setBody(\SturentsLib\Api\Models\Room $room) { - $this->body = json_encode($room); + $this->body = json_encode($room, JSON_THROW_ON_ERROR); } diff --git a/src/Requests/SwaggerClient.php b/src/Requests/SwaggerClient.php index 83fc8f6..0782892 100644 --- a/src/Requests/SwaggerClient.php +++ b/src/Requests/SwaggerClient.php @@ -9,7 +9,7 @@ interface SwaggerClient { /** * @template T of SwaggerModel * - * @param array|''> $response_models + * @param array|null> $response_models * @return T|list */ public function make(SwaggerRequest $swagger, array $response_models); diff --git a/src/SturentsClient.php b/src/SturentsClient.php index 940922b..6b09c52 100644 --- a/src/SturentsClient.php +++ b/src/SturentsClient.php @@ -91,7 +91,8 @@ public function make(SwaggerRequest $swagger, array $response_models){ } catch (ClientException $e) { $this->debug_request_exception = $e; - if (!$e->hasResponse()){ + // In Guzzle 8 ClientException always has a ResponseInterface + if (method_exists($e, 'hasResponse') && !$e->hasResponse()){ throw new SturentsException("The StuRents API could not be reached. The client reported: {$e->getMessage()}", self::EX_CODE_RESPONSE); }