Merge branch 'develop' of https://github.com/akalongman/php-telegram-bot into fixes

Author: jacklul

.travis.yml

@@ -3,11 +3,7 @@ sudo: required
 language: php
 
 addons:
-  apt:
-    packages:
-      - mysql-server-5.6
-      - mysql-client-core-5.6
-      - mysql-client-5.6
+  mariadb: '10.1'
 
 cache:
   directories:

src/Commands/AdminCommands/SendtochannelCommand.php

@@ -97,7 +97,7 @@ public function execute()
                     $this->conversation->update();
 
                     $data['text']         = 'Insert the channel name: (@yourchannel)';
-                    $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                    $data['reply_markup'] = Keyboard::remove(['selective' => true]);
                     $result               = Request::sendMessage($data);
 
                     break;
@@ -142,7 +142,7 @@ public function execute()
                     $notes['state'] = 1;
                     $this->conversation->update();
 
-                    $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                    $data['reply_markup'] = Keyboard::remove(['selective' => true]);
                     $data['text']         = 'Insert the content you want to share: text, photo, audio...';
                     $result               = Request::sendMessage($data);
                     break;
@@ -184,7 +184,7 @@ public function execute()
                     $this->conversation->update();
 
                     $data['text']         = 'Insert caption:';
-                    $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                    $data['reply_markup'] = Keyboard::remove(['selective' => true]);
                     $result               = Request::sendMessage($data);
                     break;
                 }
@@ -227,7 +227,7 @@ public function execute()
                 $notes['last_message_id'] = $message->getMessageId();
             // no break
             case 5:
-                $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                $data['reply_markup'] = Keyboard::remove(['selective' => true]);
 
                 if ($notes['post_message']) {
                     $data['text'] = $this->publish(

src/Commands/UserCommands/CancelCommand.php

@@ -70,22 +70,22 @@ public function execute()
             $text = 'Conversation "' . $conversation_command . '" cancelled!';
         }
 
-        return $this->hideKeyboard($text);
+        return $this->removeKeyboard($text);
     }
 
     /**
-     * Hide the keyboard and output a text
+     * Remove the keyboard and output a text
      *
      * @param string $text
      *
      * @return \Longman\TelegramBot\Entities\ServerResponse
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
-    private function hideKeyboard($text)
+    private function removeKeyboard($text)
     {
         return Request::sendMessage(
             [
-                'reply_markup' => Keyboard::hide(['selective' => true]),
+                'reply_markup' => Keyboard::remove(['selective' => true]),
                 'chat_id'      => $this->getMessage()->getChat()->getId(),
                 'text'         => $text,
             ]
@@ -100,6 +100,6 @@ private function hideKeyboard($text)
      */
     public function executeNoDb()
     {
-        return $this->hideKeyboard('Nothing to cancel.');
+        return $this->removeKeyboard('Nothing to cancel.');
     }
 }

src/Commands/UserCommands/SurveyCommand.php

@@ -105,7 +105,7 @@ public function execute()
                     $this->conversation->update();
 
                     $data['text']         = 'Type your name:';
-                    $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                    $data['reply_markup'] = Keyboard::remove(['selective' => true]);
 
                     $result = Request::sendMessage($data);
                     break;
@@ -238,7 +238,7 @@ public function execute()
                 }
 
                 $data['photo']        = $notes['photo_id'];
-                $data['reply_markup'] = Keyboard::hide(['selective' => true]);
+                $data['reply_markup'] = Keyboard::remove(['selective' => true]);
                 $data['caption']      = $out_text;
                 $this->conversation->stop();
 

src/Entities/Keyboard.php

@@ -20,11 +20,11 @@
  * @link https://core.telegram.org/bots/api#replykeyboardmarkup
  *
  * @method bool getResizeKeyboard()  Optional. Requests clients to resize the keyboard vertically for optimal fit (e.g., make the keyboard smaller if there are just two rows of buttons). Defaults to false, in which case the custom keyboard is always of the same height as the app's standard keyboard.
- * @method bool getOneTimeKeyboard() Optional. Requests clients to hide the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
+ * @method bool getOneTimeKeyboard() Optional. Requests clients to remove the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
  * @method bool getSelective()       Optional. Use this parameter if you want to show the keyboard to specific users only. Targets: 1) users that are @mentioned in the text of the Message object; 2) if the bot's message is a reply (has reply_to_message_id), sender of the original message.
  *
  * @method $this setResizeKeyboard(bool $resize_keyboard)    Optional. Requests clients to resize the keyboard vertically for optimal fit (e.g., make the keyboard smaller if there are just two rows of buttons). Defaults to false, in which case the custom keyboard is always of the same height as the app's standard keyboard.
- * @method $this setOneTimeKeyboard(bool $one_time_keyboard) Optional. Requests clients to hide the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
+ * @method $this setOneTimeKeyboard(bool $one_time_keyboard) Optional. Requests clients to remove the keyboard as soon as it's been used. The keyboard will still be available, but clients will automatically display the usual letter-keyboard in the chat – the user can press a special button in the input field to see the custom keyboard again. Defaults to false.
  * @method $this setSelective(bool $selective)               Optional. Use this parameter if you want to show the keyboard to specific users only. Targets: 1) users that are @mentioned in the text of the Message object; 2) if the bot's message is a reply (has reply_to_message_id), sender of the original message.
  */
 class Keyboard extends Entity
@@ -195,18 +195,18 @@ protected function validate()
     }
 
     /**
-     * Hide the current custom keyboard and display the default letter-keyboard.
+     * Remove the current custom keyboard and display the default letter-keyboard.
      *
-     * @link https://core.telegram.org/bots/api#replykeyboardhide
+     * @link https://core.telegram.org/bots/api/#replykeyboardremove
      *
      * @param array $data
      *
      * @return \Longman\TelegramBot\Entities\Keyboard
      * @throws \Longman\TelegramBot\Exception\TelegramException
      */
-    public static function hide(array $data = [])
+    public static function remove(array $data = [])
     {
-        return new static(array_merge(['keyboard' => [], 'hide_keyboard' => true, 'selective' => false], $data));
+        return new static(array_merge(['keyboard' => [], 'remove_keyboard' => true, 'selective' => false], $data));
     }
 
     /**

src/Telegram.php

@@ -30,7 +30,7 @@ class Telegram
      *
      * @var string
      */
-    protected $version = '0.35.0';
+    protected $version = '0.36.0';
 
     /**
      * Telegram API key

tests/unit/Entities/FileTest.php

@@ -103,19 +103,6 @@ public function testGetFilePath()
         $this->assertEquals($this->data['file_path'], $path);
     }
 
-   /**
-    *
-    * Testing without file id
-    *
-    * @expectedException Longman\TelegramBot\Exception\TelegramException
-    * 
-    */
-    public function testCreateInstanceWithoutFileId()
-    {
-        unset($this->data['file_id']);
-        new File($this->data);
-    }
-
     /**
     * 
     * Testing getFileSize without data

tests/unit/Entities/KeyboardTest.php

@@ -136,8 +136,8 @@ public function testKeyboardWithDataArray()
 
     public function testPredefinedKeyboards()
     {
-        $keyboard_hide = Keyboard::hide();
-        self::assertTrue($keyboard_hide->getProperty('hide_keyboard'));
+        $keyboard_remove = Keyboard::remove();
+        self::assertTrue($keyboard_remove->getProperty('remove_keyboard'));
 
         $keyboard_force_reply = Keyboard::forceReply();
         self::assertTrue($keyboard_force_reply->getProperty('force_reply'));

tests/unit/Entities/LocationTest.php

@@ -89,30 +89,4 @@ public function testGetLatitude()
         $this->assertInternalType('float', $lat);
         $this->assertEquals($this->coordinates['latitude'], $lat);
     }
-
-   /**
-    *
-    * Testing without longitude
-    *
-    * @expectedException Longman\TelegramBot\Exception\TelegramException
-    * 
-    */
-    public function testCreateInstanceWithoutLongitude()
-    {
-        unset($this->coordinates['longitude']);
-        new Location($this->coordinates);
-    }
-
-   /**
-    *
-    * Testing without latitude
-    *
-    * @expectedException Longman\TelegramBot\Exception\TelegramException
-    * 
-    */
-    public function testCreateInstanceWithoutLatitude()
-    {
-        unset($this->coordinates['latitude']);
-        new Location($this->coordinates);
-    }
 }