Major Refactoring

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

View file

@ -46,7 +46,7 @@
{
$object = new self();
$object->type = $data['type'];
$object->type = $data['type'] ?? null;
return $object;
}
@ -60,7 +60,9 @@
public static function fromMenuButton(MenuButton $menuButton): MenuButtonCommands
{
$object = new self();
$object->type = $menuButton->getType();
return $object;
}
}

View file

@ -46,7 +46,7 @@
{
$object = new self();
$object->type = $data['type'];
$object->type = $data['type'] ?? null;
return $object;
}

View file

@ -1,6 +1,8 @@
<?php /** @noinspection PhpMissingFieldTypeInspection */
<?php
namespace TgBotLib\Objects\MenuButton;
/** @noinspection PhpMissingFieldTypeInspection */
namespace TgBotLib\Objects\MenuButton;
use TgBotLib\Interfaces\ObjectTypeInterface;
use TgBotLib\Objects\MenuButton;
@ -65,7 +67,7 @@ namespace TgBotLib\Objects\MenuButton;
return [
'type' => $this->type,
'text' => $this->text,
'web_app' => ($this->web_app instanceof WebAppInfo) ? $this->web_app->toArray() : null
'web_app' => ($this->web_app instanceof ObjectTypeInterface) ? $this->web_app->toArray() : null
];
}
@ -79,8 +81,8 @@ namespace TgBotLib\Objects\MenuButton;
{
$object = new self();
$object->type = $data['type'];
$object->text = $data['text'];
$object->type = $data['type'] ?? null;
$object->text = $data['text'] ?? null;
$object->web_app = isset($data['web_app']) ? WebAppInfo::fromArray($data['web_app']) : null;
return $object;