Nosial/tgbotlib
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases 6 Packages Wiki Activity Actions

Major Refactoring

Browse source
This commit is contained in:
Netkas 2023-02-14 17:35:16 -05:00
parent 3de87df2d9
commit 54a8a59ee8
83 changed files with 892 additions and 918 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/TgBotLib/Objects/PreCheckoutQuery.php
View file

@ -125,12 +125,12 @@
{
return [
'id' => $this->id,
'from' => ($this->from instanceof User) ? $this->from->toArray() : null,
'from' => ($this->from instanceof ObjectTypeInterface) ? $this->from->toArray() : null,
'currency' => $this->currency,
'total_amount' => $this->total_amount,
'invoice_payload' => $this->invoice_payload,
'shipping_option_id' => $this->shipping_option_id,
'order_info' => ($this->order_info instanceof OrderInfo) ? $this->order_info->toArray() : null
'order_info' => ($this->order_info instanceof ObjectTypeInterface) ? $this->order_info->toArray() : null
];
}
@ -143,13 +143,13 @@
public static function fromArray(array $data): ObjectTypeInterface
{
$object = new self();
$object->id = $data['id'];
$object->from = User::fromArray($data['from']);
$object->currency = $data['currency'];
$object->total_amount = $data['total_amount'];
$object->invoice_payload = $data['invoice_payload'];
$object->id = $data['id'] ?? null;
$object->from = isset($data['from']) && is_array($data['from']) ? User::fromArray($data['from']) : null;
$object->currency = $data['currency'] ?? null;
$object->total_amount = $data['total_amount'] ?? null;
$object->invoice_payload = $data['invoice_payload'] ?? null;
$object->shipping_option_id = $data['shipping_option_id'] ?? null;
$object->order_info = OrderInfo::fromArray($data['order_info']) ?? null;
$object->order_info = isset($data['order_info']) && is_array($data['order_info']) ? OrderInfo::fromArray($data['order_info']) : null;
return $object;
}
}