Error handling fixes

This commit is contained in:
2024-03-01 21:21:09 +01:00
parent 9bd53062b0
commit c4f3e8ae50
2 changed files with 11 additions and 12 deletions

View File

@ -29,16 +29,16 @@ class Message implements JsonSerializable
private array $messageData;
public function __construct(string $messageType, array $messageData = [], ?string $uuid = null)
public function __construct(string $messageType, array $messageData = [], null|string|false $uuid = null)
{
$this->uuid = $uuid ?? (string)Uuid::v7();
$this->uuid = ($uuid===null) ? (string)Uuid::v7() : $uuid;
$this->messageType = $messageType;
$this->messageData = $messageData;
}
public function getUuid(): string
{
return $this->uuid;
return $this->uuid ? $this->uuid : "";
}
public function getType(): string
@ -63,7 +63,7 @@ class Message implements JsonSerializable
if (!$json || empty($json['msg'])) {
throw new MessageException("Invalid data");
}
return new Message($json['msg'], $json['data'], $json['uuid']??"");
return new Message($json['msg'], $json['data'], $json['uuid']??false);
}
public function asResult($result): Message