Merge branch 'develop' into patch-1

Author: noplanman

CHANGELOG.md

@@ -4,8 +4,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 Exclamation symbols (:exclamation:) note something of importance e.g. breaking changes. Click them to learn more.
 
 ## [Unreleased]
+:exclamation: After updating to this version, you will need to execute the [SQL migration script][unreleased-sql-migration] on your database.
 ### Added
+- Bot API 4.0 (without Passport)
 ### Changed
+- [:exclamation:][unreleased-bc-move-animation-out-of-games-namespace] Move Animation entity out of Games namespace.
 ### Deprecated
 ### Removed
 ### Fixed
@@ -217,6 +220,8 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Deprecated
 - Move `hideKeyboard` to `removeKeyboard`.
 
+[unreleased-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.54.0-unreleased.sql
+[unreleased-bc-move-animation-out-of-games-namespace]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#move-animation-out-of-games-namespace
 [0.54.0-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.53.0-0.54.0.sql
 [0.54.0-bc-rename-constants]: https://github.com/php-telegram-bot/core/wiki/Breaking-backwards-compatibility#rename-constants
 [0.53.0-sql-migration]: https://github.com/php-telegram-bot/core/tree/master/utils/db-schema-update/0.52.0-0.53.0.sql

README.md

@@ -364,7 +364,7 @@ $result = Request::sendPhoto([
 ]);
 ```
 
-*sendAudio*, *sendDocument*, *sendSticker*, *sendVideo*, *sendVoice* and *sendVideoNote* all work in the same way, just check the [API documentation](https://core.telegram.org/bots/api#sendphoto) for the exact usage.
+*sendAudio*, *sendDocument*, *sendAnimation*, *sendSticker*, *sendVideo*, *sendVoice* and *sendVideoNote* all work in the same way, just check the [API documentation](https://core.telegram.org/bots/api#sendphoto) for the exact usage.
 See the [*ImageCommand.php*][ImageCommand.php] for a full example.
 
 #### Send Chat Action

composer.lock

@@ -829,15 +829,15 @@ public static function insertMessageRequest(Message $message)
                 (
                     `id`, `user_id`, `chat_id`, `date`, `forward_from`, `forward_from_chat`, `forward_from_message_id`,
                     `forward_date`, `reply_to_chat`, `reply_to_message`, `media_group_id`, `text`, `entities`, `audio`, `document`,
-                    `game`, `photo`, `sticker`, `video`, `voice`, `video_note`, `caption`, `contact`,
+                    `animation`, `game`, `photo`, `sticker`, `video`, `voice`, `video_note`, `caption`, `contact`,
                     `location`, `venue`, `new_chat_members`, `left_chat_member`,
                     `new_chat_title`,`new_chat_photo`, `delete_chat_photo`, `group_chat_created`,
                     `supergroup_chat_created`, `channel_chat_created`,
                     `migrate_from_chat_id`, `migrate_to_chat_id`, `pinned_message`, `connected_website`
                 ) VALUES (
                     :message_id, :user_id, :chat_id, :date, :forward_from, :forward_from_chat, :forward_from_message_id,
                     :forward_date, :reply_to_chat, :reply_to_message, :media_group_id, :text, :entities, :audio, :document,
-                    :game, :photo, :sticker, :video, :voice, :video_note, :caption, :contact,
+                    :animation, :game, :photo, :sticker, :video, :voice, :video_note, :caption, :contact,
                     :location, :venue, :new_chat_members, :left_chat_member,
                     :new_chat_title, :new_chat_photo, :delete_chat_photo, :group_chat_created,
                     :supergroup_chat_created, :channel_chat_created,
@@ -881,6 +881,7 @@ public static function insertMessageRequest(Message $message)
             $sth->bindValue(':entities', $t = self::entitiesArrayToJson($message->getEntities(), null));
             $sth->bindValue(':audio', $message->getAudio());
             $sth->bindValue(':document', $message->getDocument());
+            $sth->bindValue(':animation', $message->getAnimation());
             $sth->bindValue(':game', $message->getGame());
             $sth->bindValue(':photo', $t = self::entitiesArrayToJson($message->getPhoto(), null));
             $sth->bindValue(':sticker', $message->getSticker());

src/DB.php

@@ -8,9 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Longman\TelegramBot\Entities\Games;
-
-use Longman\TelegramBot\Entities\Entity;
+namespace Longman\TelegramBot\Entities;
 
 /**
  * Class Animation
@@ -20,6 +18,9 @@
  * @link https://core.telegram.org/bots/api#animation
  *
  * @method string    getFileId()   Unique file identifier
+ * @method int       getWidth()    Video width as defined by sender
+ * @method int       getHeight()   Video height as defined by sender
+ * @method int       getDuration() Duration of the video in seconds as defined by sender
  * @method PhotoSize getThumb()    Optional. Animation thumbnail as defined by sender
  * @method string    getFileName() Optional. Original animation filename as defined by sender
  * @method string    getMimeType() Optional. MIME type of the file as defined by sender

src/Entities/Games/Animation.php renamed to src/Entities/Animation.php

@@ -15,14 +15,23 @@
  *
  * @link https://core.telegram.org/bots/api#audio
  *
- * @method string getFileId()    Unique identifier for this file
- * @method int    getDuration()  Duration of the audio in seconds as defined by sender
- * @method string getPerformer() Optional. Performer of the audio as defined by sender or by audio tags
- * @method string getTitle()     Optional. Title of the audio as defined by sender or by audio tags
- * @method string getMimeType()  Optional. MIME type of the file as defined by sender
- * @method int    getFileSize()  Optional. File size
+ * @method string    getFileId()    Unique identifier for this file
+ * @method int       getDuration()  Duration of the audio in seconds as defined by sender
+ * @method string    getPerformer() Optional. Performer of the audio as defined by sender or by audio tags
+ * @method string    getTitle()     Optional. Title of the audio as defined by sender or by audio tags
+ * @method string    getMimeType()  Optional. MIME type of the file as defined by sender
+ * @method int       getFileSize()  Optional. File size
+ * @method PhotoSize getThumb()     Optional. Thumbnail of the album cover to which the music file belongs
  */
 class Audio extends Entity
 {
-
+    /**
+     * {@inheritdoc}
+     */
+    protected function subEntities()
+    {
+        return [
+            'thumb' => PhotoSize::class,
+        ];
+    }
 }

src/Entities/Audio.php

@@ -19,6 +19,7 @@
  * @method string getFirstName()   Contact's first name
  * @method string getLastName()    Optional. Contact's last name
  * @method int    getUserId()      Optional. Contact's user identifier in Telegram
+ * @method string getVcard()       Optional. Additional data about the contact in the form of a vCard
  */
 class Contact extends Entity
 {

src/Entities/Contact.php

@@ -10,8 +10,10 @@
 
 namespace Longman\TelegramBot\Entities\Games;
 
+use Longman\TelegramBot\Entities\Animation;
 use Longman\TelegramBot\Entities\Entity;
 use Longman\TelegramBot\Entities\MessageEntity;
+use Longman\TelegramBot\Entities\PhotoSize;
 
 /**
  * Class Game
@@ -45,7 +47,7 @@ protected function subEntities()
      * This method overrides the default getPhoto method
      * and returns a nice array of PhotoSize objects.
      *
-     * @return null|PhotoSize[]
+     * @return null|\Longman\TelegramBot\Entities\PhotoSize[]
      */
     public function getPhoto()
     {
@@ -60,7 +62,7 @@ public function getPhoto()
      * This method overrides the default getTextEntities method
      * and returns a nice array of MessageEntity objects.
      *
-     * @return null|MessageEntity[]
+     * @return null|\Longman\TelegramBot\Entities\MessageEntity[]
      */
     public function getTextEntities()
     {

src/Entities/Games/Game.php

@@ -11,6 +11,7 @@
 namespace Longman\TelegramBot\Entities\Games;
 
 use Longman\TelegramBot\Entities\Entity;
+use Longman\TelegramBot\Entities\User;
 
 /**
  * Class GameHighScore

src/Entities/Games/GameHighScore.php

@@ -37,6 +37,7 @@
  * @method string               getPhoneNumber()         Contact's phone number
  * @method string               getFirstName()           Contact's first name
  * @method string               getLastName()            Optional. Contact's last name
+ * @method string               getVcard()               Optional. Additional data about the contact in the form of a vCard, 0-2048 bytes
  * @method InlineKeyboard       getReplyMarkup()         Optional. Inline keyboard attached to the message
  * @method InputMessageContent  getInputMessageContent() Optional. Content of the message to be sent instead of the contact
  * @method string               getThumbUrl()            Optional. Url of the thumbnail for the result
@@ -47,6 +48,7 @@
  * @method $this setPhoneNumber(string $phone_number)                               Contact's phone number
  * @method $this setFirstName(string $first_name)                                   Contact's first name
  * @method $this setLastName(string $last_name)                                     Optional. Contact's last name
+ * @method $this setVcard(string $vcard)                                            Optional. Additional data about the contact in the form of a vCard, 0-2048 bytes
  * @method $this setReplyMarkup(InlineKeyboard $reply_markup)                       Optional. Inline keyboard attached to the message
  * @method $this setInputMessageContent(InputMessageContent $input_message_content) Optional. Content of the message to be sent instead of the contact
  * @method $this setThumbUrl(string $thumb_url)                                     Optional. Url of the thumbnail for the result