From 0395f3d32a96b01f4c94849f1218c8834c486343 Mon Sep 17 00:00:00 2001 From: netkas Date: Thu, 3 Oct 2024 21:18:35 -0400 Subject: [PATCH] Moved InlineKeyboardMarkup & InlineKeyboardButton --- .../Inline/InlineQueryResult/InlineQueryResultArticle.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultAudio.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultContact.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultDocument.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultGame.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultGif.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultLocation.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultMpeg4Gif.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultPhoto.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultVenue.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultVideo.php | 2 +- .../Inline/InlineQueryResult/InlineQueryResultVoice.php | 2 +- src/TgBotLib/Objects/{Inline => }/InlineKeyboardButton.php | 5 +---- src/TgBotLib/Objects/{Inline => }/InlineKeyboardMarkup.php | 2 +- src/TgBotLib/Objects/Message.php | 1 - 15 files changed, 14 insertions(+), 18 deletions(-) rename src/TgBotLib/Objects/{Inline => }/InlineKeyboardButton.php (98%) rename src/TgBotLib/Objects/{Inline => }/InlineKeyboardMarkup.php (98%) diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultArticle.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultArticle.php index 842f312..d469a03 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultArticle.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultArticle.php @@ -6,9 +6,9 @@ use TgBotLib\Classes\Validate; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; class InlineQueryResultArticle extends InlineQueryResult implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultAudio.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultAudio.php index 49d6fd3..ca6df9c 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultAudio.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultAudio.php @@ -6,9 +6,9 @@ use TgBotLib\Classes\Validate; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultAudio extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultContact.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultContact.php index 29e9b5d..272e298 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultContact.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultContact.php @@ -9,9 +9,9 @@ use TgBotLib\Classes\Validate; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; class InlineQueryResultContact extends InlineQueryResult implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultDocument.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultDocument.php index 5bbb22f..fc54c25 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultDocument.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultDocument.php @@ -9,10 +9,10 @@ use TgBotLib\Classes\Validate; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; use TgBotLib\Objects\Inline\InputMessageContent\InputVenueMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultDocument extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGame.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGame.php index 7c90cb3..a30fb6d 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGame.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGame.php @@ -7,8 +7,8 @@ use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; + use TgBotLib\Objects\InlineKeyboardMarkup; class InlineQueryResultGame extends InlineQueryResult implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGif.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGif.php index c429590..822021c 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGif.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultGif.php @@ -10,9 +10,9 @@ use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Enums\Types\ThumbnailMimeType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultGif extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultLocation.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultLocation.php index 53a2d82..7807082 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultLocation.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultLocation.php @@ -7,10 +7,10 @@ use InvalidArgumentException; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; use TgBotLib\Objects\Inline\InputMessageContent\InputContactMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; class InlineQueryResultLocation extends InlineQueryResult implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultMpeg4Gif.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultMpeg4Gif.php index 2acd2dd..1a84402 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultMpeg4Gif.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultMpeg4Gif.php @@ -7,10 +7,10 @@ use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; use TgBotLib\Objects\Inline\InputMessageContent\InputVenueMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultMpeg4Gif extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultPhoto.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultPhoto.php index 4c48651..9003eaa 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultPhoto.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultPhoto.php @@ -8,10 +8,10 @@ use InvalidArgumentException; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; use TgBotLib\Objects\Inline\InputMessageContent\InputTextMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultPhoto extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVenue.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVenue.php index 8b10583..625951d 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVenue.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVenue.php @@ -6,10 +6,10 @@ use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; use TgBotLib\Objects\Inline\InputMessageContent\InputVenueMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; class InlineQueryResultVenue extends InlineQueryResult implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVideo.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVideo.php index 11eeead..9d62f71 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVideo.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVideo.php @@ -8,9 +8,9 @@ use InvalidArgumentException; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultVideo extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVoice.php b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVoice.php index 286f41d..f60b425 100644 --- a/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVoice.php +++ b/src/TgBotLib/Objects/Inline/InlineQueryResult/InlineQueryResultVoice.php @@ -8,9 +8,9 @@ use InvalidArgumentException; use TgBotLib\Enums\Types\InlineQueryResultType; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; use TgBotLib\Objects\Inline\InlineQueryResult; use TgBotLib\Objects\Inline\InputMessageContent; + use TgBotLib\Objects\InlineKeyboardMarkup; use TgBotLib\Objects\MessageEntity; class InlineQueryResultVoice extends InlineQueryResult implements ObjectTypeInterface diff --git a/src/TgBotLib/Objects/Inline/InlineKeyboardButton.php b/src/TgBotLib/Objects/InlineKeyboardButton.php similarity index 98% rename from src/TgBotLib/Objects/Inline/InlineKeyboardButton.php rename to src/TgBotLib/Objects/InlineKeyboardButton.php index 9008282..462fa71 100644 --- a/src/TgBotLib/Objects/Inline/InlineKeyboardButton.php +++ b/src/TgBotLib/Objects/InlineKeyboardButton.php @@ -2,14 +2,11 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace TgBotLib\Objects\Inline; + namespace TgBotLib\Objects; use InvalidArgumentException; use TgBotLib\Classes\Validate; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\CallbackGame; - use TgBotLib\Objects\LoginUrl; - use TgBotLib\Objects\WebAppInfo; class InlineKeyboardButton implements ObjectTypeInterface { diff --git a/src/TgBotLib/Objects/Inline/InlineKeyboardMarkup.php b/src/TgBotLib/Objects/InlineKeyboardMarkup.php similarity index 98% rename from src/TgBotLib/Objects/Inline/InlineKeyboardMarkup.php rename to src/TgBotLib/Objects/InlineKeyboardMarkup.php index 19c6757..3c0bcc6 100644 --- a/src/TgBotLib/Objects/Inline/InlineKeyboardMarkup.php +++ b/src/TgBotLib/Objects/InlineKeyboardMarkup.php @@ -2,7 +2,7 @@ /** @noinspection PhpMissingFieldTypeInspection */ - namespace TgBotLib\Objects\Inline; + namespace TgBotLib\Objects; use TgBotLib\Interfaces\ObjectTypeInterface; diff --git a/src/TgBotLib/Objects/Message.php b/src/TgBotLib/Objects/Message.php index 4450cba..0afee9f 100644 --- a/src/TgBotLib/Objects/Message.php +++ b/src/TgBotLib/Objects/Message.php @@ -5,7 +5,6 @@ namespace TgBotLib\Objects; use TgBotLib\Interfaces\ObjectTypeInterface; - use TgBotLib\Objects\Inline\InlineKeyboardMarkup; class Message extends MaybeInaccessibleMessage implements ObjectTypeInterface {