Global refactoring and improvements

TelegramBot · Jun 29, 2015 · 9807c9e · 9807c9e
1 parent c4740c0
commit 9807c9e
Show file tree

Hide file tree

Showing 15 changed files with 204 additions and 273 deletions.
diff --git a/src/BaseType.php b/src/BaseType.php
@@ -17,6 +17,13 @@ abstract class BaseType
      */
     protected static $requiredParams = array();
 
+    /**
+     * Map of input data
+     *
+     * @var array
+     */
+    protected static $map = array();
+
     /**
      * Validate input data
      *
@@ -30,4 +37,25 @@ public static function validate($data)
 
         throw new InvalidArgumentException();
     }
+
+    public function map($data)
+    {
+        foreach (static::$map as $key => $item) {
+            $method = 'set' . str_replace(" ", "", ucwords(str_replace("_", " ", $key)));
+            if ($item === true) {
+                $this->$method($data[$key]);
+            } else {
+                $this->$method($item::fromResponse($data[$key]));
+            }
+        }
+    }
+
+    public static function fromResponse($data)
+    {
+        self::validate($data);
+        $instance = new static();
+        $instance->map($data);
+
+        return $instance;
+    }
 }
diff --git a/src/Types/ArrayOfArrayOfPhotoSize.php b/src/Types/ArrayOfArrayOfPhotoSize.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace TelegramBot\Api\Types;
+
+abstract class ArrayOfArrayOfPhotoSize
+{
+    public static function fromResponse($data)
+    {
+        return array_map(function ($arrayOfPhotoSize) {
+            return ArrayOfPhotoSize::fromResponse($arrayOfPhotoSize);
+        }, $data);
+    }
+}
diff --git a/src/Types/ArrayOfPhotoSize.php b/src/Types/ArrayOfPhotoSize.php
@@ -2,7 +2,7 @@
 
 namespace TelegramBot\Api\Types;
 
-abstract class ArrayOfPhotoSize extends \ArrayObject
+abstract class ArrayOfPhotoSize
 {
     public static function fromResponse($data)
     {
@@ -13,4 +13,4 @@ public static function fromResponse($data)
 
         return $arrayOfPhotoSize;
     }
-}
+}
diff --git a/src/Types/Audio.php b/src/Types/Audio.php
@@ -21,6 +21,18 @@ class Audio extends BaseType implements TypeInterface
      */
     static protected $requiredParams = array('file_id', 'duration');
 
+    /**
+     * {@inheritdoc}
+     *
+     * @var array
+     */
+    static protected $map = array(
+        'file_id' => true,
+        'duration' => true,
+        'mime_type' => true,
+        'file_size' => true
+    );
+
     /**
      * Unique identifier for this file
      *
@@ -120,22 +132,4 @@ public function setMimeType($mimeType)
     {
         $this->mimeType = $mimeType;
     }
-
-    public static function fromResponse($data)
-    {
-        self::validate($data);
-        $instance = new self();
-
-        $instance->setFileId($data['file_id']);
-        $instance->setDuration($data['duration']);
-
-        if (isset($data['mime_type'])) {
-            $instance->setMimeType($data['mime_type']);
-        }
-        if (isset($data['file_size'])) {
-            $instance->setFileSize($data['file_size']);
-        }
-
-        return $instance;
-    }
 }
diff --git a/src/Types/Chat.php b/src/Types/Chat.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace TelegramBot\Api\Types;
+
+abstract class Chat
+{
+    public static function fromResponse($data)
+    {
+        return isset($data['title']) ? GroupChat::fromResponse($data) : User::fromResponse($data);
+    }
+}
diff --git a/src/Types/Contact.php b/src/Types/Contact.php
@@ -21,6 +21,18 @@ class Contact extends BaseType implements TypeInterface
      */
     static protected $requiredParams = array('phone_number', 'first_name');
 
+    /**
+     * {@inheritdoc}
+     *
+     * @var array
+     */
+    static protected $map = array(
+        'phone_number' => true,
+        'first_name' => true,
+        'last_name' => true,
+        'user_id' => true
+    );
+
     /**
      * Contact's phone number
      *
@@ -112,22 +124,4 @@ public function setUserId($userId)
     {
         $this->userId = $userId;
     }
-
-    public static function fromResponse($data)
-    {
-        self::validate($data);
-        $instance = new self();
-
-        $instance->setPhoneNumber($data['phone_number']);
-        $instance->setFirstName($data['first_name']);
-
-        if (isset($data['last_name'])) {
-            $instance->setLastName($data['last_name']);
-        }
-        if (isset($data['user_id'])) {
-            $instance->setUserId($data['user_id']);
-        }
-
-        return $instance;
-    }
 }
diff --git a/src/Types/Document.php b/src/Types/Document.php
@@ -15,6 +15,19 @@
  */
 class Document extends BaseType implements TypeInterface
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @var array
+     */
+    static protected $map = array(
+        'file_id' => true,
+        'thumb' => '\TelegramBot\Api\Types\PhotoSize',
+        'file_name' => true,
+        'mime_type' => true,
+        'file_size' => true
+    );
+
     /**
      * {@inheritdoc}
      *
@@ -140,25 +153,4 @@ public function setThumb(PhotoSize $thumb)
     {
         $this->thumb = $thumb;
     }
-
-    public static function fromResponse($data)
-    {
-        self::validate($data);
-        $instance = new self();
-
-        $instance->setFileId($data['file_id']);
-        $instance->setThumb(PhotoSize::fromResponse($data['thumb']));
-
-        if (isset($data['mime_type'])) {
-            $instance->setMimeType($data['mime_type']);
-        }
-        if (isset($data['file_name'])) {
-            $instance->setFileName($data['file_name']);
-        }
-        if (isset($data['file_size'])) {
-            $instance->setFileSize($data['file_size']);
-        }
-
-        return $instance;
-    }
 }
diff --git a/src/Types/GroupChat.php b/src/Types/GroupChat.php
@@ -21,6 +21,16 @@ class GroupChat extends BaseType implements TypeInterface
      */
     static protected $requiredParams = array('id', 'title');
 
+    /**
+     * {@inheritdoc}
+     *
+     * @var array
+     */
+    static protected $map = array(
+        'id' => true,
+        'title' => true
+    );
+
     /**
      * Unique identifier for this group chat
      *
@@ -70,15 +80,4 @@ public function setTitle($title)
     {
         $this->title = $title;
     }
-
-    public static function fromResponse($data)
-    {
-        self::validate($data);
-        $instance = new self();
-
-        $instance->setId($data['id']);
-        $instance->setTitle($data['title']);
-
-        return $instance;
-    }
 }
diff --git a/src/Types/Location.php b/src/Types/Location.php
@@ -21,6 +21,16 @@ class Location extends BaseType implements TypeInterface
      */
     static protected $requiredParams = array('latitude', 'longitude');
 
+    /**
+     * {@inheritdoc}
+     *
+     * @var array
+     */
+    static protected $map = array(
+        'latitude' => true,
+        'longitude' => true,
+    );
+
     /**
      * Longitude as defined by sender
      *
@@ -74,15 +84,4 @@ public function setLongitude($longitude)
             throw new InvalidArgumentException();
         }
     }
-
-    public static function fromResponse($data)
-    {
-        self::validate($data);
-        $instance = new self();
-
-        $instance->setLatitude($data['latitude']);
-        $instance->setLongitude($data['longitude']);
-
-        return $instance;
-    }
 }