new types

madmagestelegram · May 2, 2021 · 820af21 · 820af21
1 parent 96a9e4e
commit 820af21
Show file tree

Hide file tree

Showing 111 changed files with 5,359 additions and 917 deletions.
diff --git a/src/Client.php b/src/Client.php
diff --git a/src/Type/AbstractInlineQueryResult.php b/src/Type/AbstractInlineQueryResult.php
@@ -2,4 +2,4 @@
 
 namespace MadmagesTelegram\Types\Type;
 
-abstract class AbstractInlineQueryResult {}
+abstract class AbstractInlineQueryResult extends AbstractType {}
diff --git a/src/Type/AbstractInputMedia.php b/src/Type/AbstractInputMedia.php
@@ -2,4 +2,4 @@
 
 namespace MadmagesTelegram\Types\Type;
 
-abstract class AbstractInputMedia {}
+abstract class AbstractInputMedia extends AbstractType {}
diff --git a/src/Type/AbstractInputMessageContent.php b/src/Type/AbstractInputMessageContent.php
@@ -2,4 +2,4 @@
 
 namespace MadmagesTelegram\Types\Type;
 
-abstract class AbstractInputMessageContent {}
+abstract class AbstractInputMessageContent extends AbstractType {}
diff --git a/src/Type/AbstractPassportElementError.php b/src/Type/AbstractPassportElementError.php
@@ -2,4 +2,4 @@
 
 namespace MadmagesTelegram\Types\Type;
 
-abstract class AbstractPassportElementError {}
+abstract class AbstractPassportElementError extends AbstractType {}
diff --git a/src/Type/AbstractType.php b/src/Type/AbstractType.php
@@ -16,6 +16,15 @@ abstract public static function _getPropertyNames(): array;
      *
      * @return array
      */
-    abstract public function _getRawData(): array;
+    abstract public function _getData(): array;
+
+    protected function normalizeData(array $data):array {
+        array_filter($data);
+        array_walk_recursive($data, static function(&$item){
+            $item = $item instanceof AbstractType ? $item->_getData(): $item;
+        });
+
+        return $data;
+    }
 
 }
diff --git a/src/Type/Animation.php b/src/Type/Animation.php
@@ -45,7 +45,7 @@ public static function _getPropertyNames(): array
      *
      * @return array
      */
-    public function _getRawData(): array
+    public function _getData(): array
     {
         $result = [
             'file_id' => $this->getFileId(),
@@ -59,10 +59,7 @@ public function _getRawData(): array
             'file_size' => $this->getFileSize(),
         ];
 
-        $result = array_filter($result, static function($item){ return $item!==null; });
-        return array_map(static function(&$item){
-            return is_object($item) ? $item->_getRawData():$item;
-        }, $result);
+        return parent::normalizeData($result);
     }
 
     /**

diff --git a/src/Type/Audio.php b/src/Type/Audio.php
@@ -33,6 +33,7 @@ public static function _getPropertyNames(): array
             'duration',
             'performer',
             'title',
+            'file_name',
             'mime_type',
             'file_size',
             'thumb',
@@ -44,23 +45,21 @@ public static function _getPropertyNames(): array
      *
      * @return array
      */
-    public function _getRawData(): array
+    public function _getData(): array
     {
         $result = [
             'file_id' => $this->getFileId(),
             'file_unique_id' => $this->getFileUniqueId(),
             'duration' => $this->getDuration(),
             'performer' => $this->getPerformer(),
             'title' => $this->getTitle(),
+            'file_name' => $this->getFileName(),
             'mime_type' => $this->getMimeType(),
             'file_size' => $this->getFileSize(),
             'thumb' => $this->getThumb(),
         ];
 
-        $result = array_filter($result, static function($item){ return $item!==null; });
-        return array_map(static function(&$item){
-            return is_object($item) ? $item->_getRawData():$item;
-        }, $result);
+        return parent::normalizeData($result);
     }
 
     /**
@@ -116,6 +115,17 @@ public function _getRawData(): array
      */
     protected $title;
 
+    /**
+     * Optional. Original filename as defined by sender 
+     *
+     * @var string|null
+     * @SkipWhenEmpty
+     * @SerializedName("file_name")
+     * @Accessor(getter="getFileName",setter="setFileName")
+     * @Type("string")
+     */
+    protected $fileName;
+
     /**
      * Optional. MIME type of the file as defined by sender 
      *
@@ -245,6 +255,25 @@ public function getTitle(): ?string
         return $this->title;
     }
 
+    /**
+     * @param string $fileName
+     * @return static
+     */
+    public function setFileName(string $fileName): self
+    {
+        $this->fileName = $fileName;
+
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getFileName(): ?string
+    {
+        return $this->fileName;
+    }
+
     /**
      * @param string $mimeType
      * @return static

diff --git a/src/Type/BotCommand.php b/src/Type/BotCommand.php
@@ -38,17 +38,14 @@ public static function _getPropertyNames(): array
      *
      * @return array
      */
-    public function _getRawData(): array
+    public function _getData(): array
     {
         $result = [
             'command' => $this->getCommand(),
             'description' => $this->getDescription(),
         ];
 
-        $result = array_filter($result, static function($item){ return $item!==null; });
-        return array_map(static function(&$item){
-            return is_object($item) ? $item->_getRawData():$item;
-        }, $result);
+        return parent::normalizeData($result);
     }
 
     /**

diff --git a/src/Type/CallbackQuery.php b/src/Type/CallbackQuery.php
@@ -13,7 +13,8 @@
  * https://core.telegram.org/bots/api#callbackquery
  *
  * This object represents an incoming callback query from a callback button in an inline keyboard. If the button that originated the query was attached to a message sent by the bot, the field 
- * message will be present. If the button was attached to a message sent via the bot (in inline mode), the field inline_message_id will be present. Exactly one of the fields data or 
+ * message will be present. If the button was attached to a message sent via the bot (in inline 
+ * mode), the field inline_message_id will be present. Exactly one of the fields data or 
  * game_short_name will be present. 
  *
  * @ExclusionPolicy("none")
@@ -45,7 +46,7 @@ public static function _getPropertyNames(): array
      *
      * @return array
      */
-    public function _getRawData(): array
+    public function _getData(): array
     {
         $result = [
             'id' => $this->getId(),
@@ -57,10 +58,7 @@ public function _getRawData(): array
             'game_short_name' => $this->getGameShortName(),
         ];
 
-        $result = array_filter($result, static function($item){ return $item!==null; });
-        return array_map(static function(&$item){
-            return is_object($item) ? $item->_getRawData():$item;
-        }, $result);
+        return parent::normalizeData($result);
     }
 
     /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		namespace MadmagesTelegram\Types\Type;

		abstract class AbstractInlineQueryResult {}
		abstract class AbstractInlineQueryResult extends AbstractType {}