diff --git a/src/TgBotLib/Objects/InaccessibleMessage.php b/src/TgBotLib/Objects/InaccessibleMessage.php index 03ba96e..b258e1e 100644 --- a/src/TgBotLib/Objects/InaccessibleMessage.php +++ b/src/TgBotLib/Objects/InaccessibleMessage.php @@ -44,10 +44,14 @@ class InaccessibleMessage extends MaybeInaccessibleMessage implements ObjectType /** * @inheritDoc */ - public static function fromArray(array $data): InaccessibleMessage + public static function fromArray(?array $data): ?InaccessibleMessage { - $object = new self(); + if($data === null) + { + return null; + } + $object = new self(); $object->chat = isset($data['chat']) ? Chat::fromArray($data['chat']) : null; $object->message_id = $data['message_id']; $object->date = $data['data']; diff --git a/src/TgBotLib/Objects/MaybeInaccessibleMessage.php b/src/TgBotLib/Objects/MaybeInaccessibleMessage.php index 0a9b030..b52eb34 100644 --- a/src/TgBotLib/Objects/MaybeInaccessibleMessage.php +++ b/src/TgBotLib/Objects/MaybeInaccessibleMessage.php @@ -27,8 +27,13 @@ abstract class MaybeInaccessibleMessage implements ObjectTypeInterface /** * @inheritDoc */ - public static function fromArray(array $data): MaybeInaccessibleMessage + public static function fromArray(?array $data): ?MaybeInaccessibleMessage { + if($data === null) + { + return null; + } + if(!isset($data['date'])) { throw new InvalidArgumentException('Expected date in message'); diff --git a/src/TgBotLib/Objects/Message.php b/src/TgBotLib/Objects/Message.php index 005c1e3..fb46c30 100644 --- a/src/TgBotLib/Objects/Message.php +++ b/src/TgBotLib/Objects/Message.php @@ -1088,10 +1088,14 @@ /** * @inheritDoc */ - public static function fromArray(array $data): Message + public static function fromArray(?array $data): ?Message { - $object = new self(); + if($data === null) + { + return null; + } + $object = new self(); $object->message_id = $data['message_id']; $object->message_thread_id = $data['message_thread_id'] ?? null; $object->from = isset($data['from']) ? User::fromArray($data['from']) : null;