Added Factory class and resolve method

Author: TiiFuchs

src/Entities/ChatMember/Factory.php

@@ -0,0 +1,15 @@
+<?php
+
+
+namespace Longman\TelegramBot\Entities\ChatMember;
+
+
+use Longman\TelegramBot\Entities\Entity;
+
+class Factory extends \Longman\TelegramBot\Entities\Factory
+{
+    public function make(array $data, string $bot_username): Entity
+    {
+        var_dump($data);
+    }
+}

src/Entities/ChatMemberUpdated.php

@@ -11,6 +11,9 @@
 
 namespace Longman\TelegramBot\Entities;
 
+use Longman\TelegramBot\Entities\ChatMember\ChatMember;
+use Longman\TelegramBot\Entities\ChatMember\Factory as ChatMemberFactory;
+
 /**
  * Class ChatMemberUpdated
  *
@@ -35,8 +38,8 @@ protected function subEntities(): array
         return [
             'chat'            => Chat::class,
             'from'            => User::class,
-            'old_chat_member' => ChatMember::class,
-            'new_chat_member' => ChatMember::class,
+            'old_chat_member' => ChatMemberFactory::class,
+            'new_chat_member' => ChatMemberFactory::class,
             'invite_link'     => ChatInviteLink::class,
         ];
     }

src/Entities/Entity.php

@@ -141,7 +141,7 @@ public function __call($method, $args)
                         return $this->makePrettyObjectArray(reset($class), $property_name);
                     }
 
-                    return new $class($property, $this->getProperty('bot_username'));
+                    return Factory::resolveEntityClass($class, $property, $this->getProperty('bot_username'));
                 }
 
                 return $property;
@@ -173,11 +173,12 @@ protected function makePrettyObjectArray(string $class, string $property): array
     {
         $new_objects = [];
 
+        $bot_username = $this->getProperty('bot_username');
         try {
             if ($objects = $this->getProperty($property)) {
                 foreach ($objects as $object) {
                     if (!empty($object)) {
-                        $new_objects[] = new $class($object);
+                        $new_objects[] = Factory::resolveEntityClass($class, $object, $bot_username);
                     }
                 }
             }

src/Entities/Factory.php

@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Longman\TelegramBot\Entities;
+
+
+abstract class Factory
+{
+    abstract public function make(array $data, string $bot_username): Entity;
+
+    public static function resolveEntityClass(string $class, array $property, string $bot_username = ''): Entity
+    {
+        if (is_subclass_of($class, Factory::class)) {
+            return $class->make($property, $bot_username);
+        }
+
+        return new $class($property, $bot_username);
+    }
+}

src/Entities/ServerResponse.php

@@ -9,6 +9,8 @@
 
 namespace Longman\TelegramBot\Entities;
 
+use Longman\TelegramBot\Entities\ChatMember\ChatMember;
+use Longman\TelegramBot\Entities\ChatMember\Factory as ChatMemberFactory;
 use Longman\TelegramBot\Entities\Games\GameHighScore;
 use Longman\TelegramBot\Request;
 
@@ -104,7 +106,7 @@ public function printError($return = false)
      * @param array  $result
      * @param string $bot_username
      *
-     * @return Chat|ChatMember|File|Message|User|UserProfilePhotos|WebhookInfo
+     * @return Chat|ChatMember|File|Message|User|UserProfilePhotos|WebhookInfo|Entity
      */
     private function createResultObject(array $result, string $bot_username)
     {
@@ -115,7 +117,7 @@ private function createResultObject(array $result, string $bot_username)
 
         $result_object_types = [
             'getChat'              => Chat::class,
-            'getChatMember'        => ChatMember::class,
+            'getChatMember'        => ChatMemberFactory::class,
             'getFile'              => File::class,
             'getMe'                => User::class,
             'getStickerSet'        => StickerSet::class,
@@ -125,7 +127,7 @@ private function createResultObject(array $result, string $bot_username)
 
         $object_class = array_key_exists($action, $result_object_types) ? $result_object_types[$action] : Message::class;
 
-        return new $object_class($result, $bot_username);
+        return Factory::resolveEntityClass($object_class, $result, $bot_username);
     }
 
     /**
@@ -143,7 +145,7 @@ private function createResultObjects(array $result, string $bot_username): array
 
         $result_object_types = [
             'getMyCommands'         => BotCommand::class,
-            'getChatAdministrators' => ChatMember::class,
+            'getChatAdministrators' => ChatMemberFactory::class,
             'getGameHighScores'     => GameHighScore::class,
             'sendMediaGroup'        => Message::class,
         ];
@@ -154,7 +156,7 @@ private function createResultObjects(array $result, string $bot_username): array
             // We don't need to save the raw_data of the response object!
             $data['raw_data'] = null;
 
-            $results[] = new $object_class($data, $bot_username);
+            $results[] = Factory::resolveEntityClass($object_class, $data, $bot_username);
         }
 
         return $results;