Update composer dependencies and regen Requests

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": {

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";

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

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

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

src/Requests/GetFacilities.php

@@ -17,7 +17,7 @@ class GetFacilities extends SwaggerRequest
 	public function sendWith(SwaggerClient $client)
 	{
 		return $client->make($this, [
-			'200' => ''
+			'200' => null
 		]);
 	}
 }

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);
 	}
 
 

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);
 	}
 
 

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);
 	}
 
 

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);
 	}
 
 

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);
 	}
 
 

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);
 	}
 
 

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);
 	}
 
 

src/Requests/SwaggerClient.php

@@ -9,7 +9,7 @@ interface SwaggerClient {
 	/**
 	 * @template T of SwaggerModel
 	 *
-	 * @param array<array-key, class-string<T>|''> $response_models
+	 * @param array<array-key, class-string<T>|null> $response_models
 	 * @return T|list<T>
 	 */
 	public function make(SwaggerRequest $swagger, array $response_models);

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);
 			}