Merge pull request #59 from pwsdotru/issue-54

Fix issue for call toJson on a non-object
TelegramBot · Apr 14, 2017 · 71e9c7e · 71e9c7e
2 parents d6f8383 + 178dda6
commit 71e9c7e
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 1 deletion.
diff --git a/src/BaseType.php b/src/BaseType.php
@@ -68,7 +68,16 @@ public function toJson($inner = false)
         foreach (static::$map as $key => $item) {
             $property = lcfirst(self::toCamelCase($key));
             if (!is_null($this->$property)) {
-                $output[$key] = $item === true ? $this->$property : $this->$property->toJson(true);
+                if (is_array($this->$property)) {
+                    $output[$key] = array_map(
+                        function ($v) {
+                            return is_object($v) ? $v->toJson(true) : $v;
+                        },
+                        $this->$property
+                    );
+                } else {
+                    $output[$key] = $item === true ? $this->$property : $this->$property->toJson(true);
+                }
             }
         }
 

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -797,4 +797,57 @@ public function testGetMigrateFromChatId()
 
         $this->assertEquals(3, $item->getMigrateFromChatId());
     }
+
+    public function testToJson1()
+    {
+        $data = array(
+            'message_id' => 1,
+            'from' => array(
+                'first_name' => 'Ilya',
+                'last_name' => 'Gusev',
+                'id' => 123456,
+                'username' => 'iGusev'
+            ),
+            'date' => 2,
+            'chat' => array(
+                'id' => 1,
+                'type' => 'group',
+                'title' => 'test chat'
+            ),
+            'migrate_from_chat_id' => 3
+        );
+
+        $item = Message::fromResponse($data);
+        $this->assertJson(json_encode($data), $item->toJson());
+    }
+
+    public function testToJson2()
+    {
+        $data = array(
+            'message_id' => 1,
+            'from' => array(
+                'first_name' => 'Ilya',
+                'last_name' => 'Gusev',
+                'id' => 123456,
+                'username' => 'iGusev'
+            ),
+            'date' => 2,
+            'chat' => array(
+                'id' => 1,
+                'type' => 'group',
+                'title' => 'test chat'
+            ),
+            'entities' => array(
+                array(
+                    "type" => "bot_command",
+                    "offset" => 0,
+                    "length" => 7,
+                )
+            ),
+            'migrate_from_chat_id' => 3
+        );
+
+        $item = Message::fromResponse($data);
+        $this->assertJson(json_encode($data), $item->toJson());
+    }
 }