fixed #2 issue

TelegramBot · Jun 30, 2015 · e3f4abb · e3f4abb
1 parent 56955fc
commit e3f4abb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/src/BaseType.php b/src/BaseType.php
@@ -41,7 +41,7 @@ public static function validate($data)
     public function map($data)
     {
         foreach (static::$map as $key => $item) {
-            if (isset($data[$key])) {
+            if (isset($data[$key]) && (!is_array($data[$key]) || (is_array($data[$key]) && !empty($data[$key])))) {
                 $method = 'set' . self::toCamelCase($key);
                 if ($item === true) {
                     $this->$method($data[$key]);
@@ -61,9 +61,9 @@ public function toJson($inner = false)
     {
         $output = array();
 
-        foreach (static::$map as $key => $item)  {
+        foreach (static::$map as $key => $item) {
             $property = lcfirst(self::toCamelCase($key));
-            if(!is_null($this->$property)) {
+            if (!is_null($this->$property)) {
                 $output[$key] = $item === true ? $this->$property : $this->$property->toJson(true);
             }
         }

diff --git a/src/Types/Document.php b/src/Types/Document.php
@@ -33,7 +33,7 @@ class Document extends BaseType implements TypeInterface
      *
      * @var array
      */
-    static protected $requiredParams = array('file_id', 'thumb');
+    static protected $requiredParams = array('file_id');
 
     /**
      * Unique identifier for this file

diff --git a/tests/DocumentTest.php b/tests/DocumentTest.php
@@ -146,17 +146,4 @@ public function testFromResponseException1()
             )
         ));
     }
-
-    /**
-     * @expectedException \TelegramBot\Api\InvalidArgumentException
-     */
-    public function testFromResponseException2()
-    {
-        $item = Document::fromResponse(array(
-            'file_id' => 'testFileId1',
-            'file_name' => 'testFileName',
-            'mime_type' => 'audio/mp3',
-            'file_size' => 3
-        ));
-    }
 }