apply changes to develnext-bundle

Author: TsSaltan

package.php.yml

@@ -33,7 +33,7 @@ config:
   - /LICENSE
 
 develnext-bundle:
-  version: 1.0.0
+  version: 1.1.0
   name: Telegram Bot API
   author: broelik
   icon: "develnext/bundle/telegram/icon32.png"

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/TelegramBotApi.php

@@ -17,6 +17,7 @@
 use php\net\URLConnection;
 use telegram\exception\TelegramError;
 use telegram\exception\TelegramException;
+use telegram\query\TAnswerCallbackQuery;
 use telegram\query\TForwardMessageQuery;
 use telegram\query\TGetFileQuery;
 use telegram\query\TGetMeQuery;
@@ -163,6 +164,13 @@ function getUpdates(){
         return new TGetUpdatesQuery($this);
     }
 
+    /**
+     * @return TAnswerCallbackQuery
+     */
+    function answerCallbackQuery(){
+        return new TAnswerCallbackQuery($this);
+    }
+
 
     function setProxy(?Proxy $proxy){
         $this->proxy = $proxy;
@@ -196,10 +204,14 @@ function query($method, array $args = [], bool $multipart = false){
             else{
                 $connection->getOutputStream()->write($this->json->format($args));
             }
+
             if($connection->responseCode != 200){
-                throw new TelegramException("Server response invalid status code {$connection->responseCode}");
+                $rawResponse = $connection->getErrorStream()->readFully();
+                if(strlen($rawResponse) == 0) throw new TelegramException("Server response invalid status code {$connection->responseCode}");
+            } else {
+                $rawResponse = $connection->getInputStream()->readFully();
             }
-            $rawResponse = $connection->getInputStream()->readFully();
+
             $connection->disconnect();
             $response = $this->json->parse($rawResponse);
             if(!$response->ok){

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/TMarkup.php

@@ -0,0 +1,38 @@
+<?php
+namespace telegram\object;
+
+use telegram\object\markup\TForceReply;
+use telegram\object\markup\TInlineKeyboard;
+use telegram\object\markup\TReplyKeyboard;
+use telegram\object\markup\TReplyKeyboardRemove;
+
+class TMarkup
+{	
+	/**
+	 * @return TReplyKeyboard
+	 */
+	public static function replyKeyboard(){
+		return new TReplyKeyboard;
+	}
+
+	/**
+	 * @return TInlineKeyboard
+	 */
+	public static function inlineKeyboard(){
+		return new TInlineKeyboard;
+	}
+
+	/**
+	 * @return TForceReply
+	 */
+	public static function forceReply(){
+		return new TForceReply;
+	}
+
+	/**
+	 * @return TReplyKeyboardRemove
+	 */
+	public static function removeKeyboard(){
+		return new TReplyKeyboardRemove;
+	}
+}

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/markup/AbstractMarkup.php

@@ -0,0 +1,13 @@
+<?php
+namespace telegram\object\markup;
+
+class AbstractMarkup {
+	/**
+	 * @var array
+	 */
+	protected $markup = [];
+
+	public function getMarkup(): array {
+		return $this->markup;
+	}
+}

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/markup/TForceReply.php

@@ -0,0 +1,25 @@
+<?php
+namespace telegram\object\markup;
+
+/**
+ * --EN--
+ * Shows reply interface to the user, as if they manually selected the bot‘s message and tapped 'Reply'
+ * 
+ * @see https://core.telegram.org/bots/api#forcereply
+ */
+class TForceReply extends AbstractMarkup {
+	public function __construct(){
+		$this->markup['force_reply'] = true;
+	}
+
+	/**
+	 * --EN--
+	 * Use this parameter if you want to force reply from 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.
+	 * 
+	 * @param bool $value 
+	 */
+	public function setSelective(bool $value){
+		$this->markup['selective'] = $value;
+		return $this;
+	}
+}

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/markup/TInlineKeyboard.php

@@ -0,0 +1,61 @@
+<?php
+namespace telegram\object\markup;
+
+use telegram\exception\TelegramException;
+
+/**
+ * --EN--
+ * This object represents an inline keyboard that appears right next to the message it belongs to.
+ *
+ * --RU--
+ * Отображает клавиатуру сразу под отправленным сообщением
+ * 
+ * @see https://core.telegram.org/bots/api#inlinekeyboardmarkup
+ */
+class TInlineKeyboard extends TReplyKeyboard {
+	/**
+	 * Callback data limit
+	 */
+	const MAX_CBDATA_LENGTH = 64;
+
+	/**
+	 * Добавить кнопку
+	 * @param  string   $text	Текст кнопки
+	 * @param  string 	$data 	Данные, которые будут возвращены при нажатии или ссылка для перехода
+	 * @return TInlineKeyboard
+	 */
+	public function button(string $text){
+		$btn = ['text' => $text];
+
+		if(func_num_args() < 2){
+			throw new TelegramException('Parameter callback_data required for InlineKeyboard buttons');
+		} else {
+			$data = func_get_arg(1);
+		}
+
+		if(!is_string($data)){
+			throw new TelegramException('Parameter callback_data should be a string');
+		}
+
+		if(strpos($data, 'http:') === 0 || strpos($data, 'https:') === 0 || strpos($data, 'tg:') === 0){
+			$btn['url'] = $data;
+		} else {
+			if(strlen($data) > self::MAX_CBDATA_LENGTH){
+				throw new TelegramException('Parameter callback_data should be a string no more than ' . MAX_CBDATA_LENGTH . ' bytes in size');
+			}
+			
+			$btn['callback_data'] = $data;
+		}
+
+		$this->buttons[$this->row][] = $btn;
+		
+		return $this;
+	}
+
+	public function getMarkup(): array {
+		$markup = $this->params;
+		$markup['inline_keyboard'] = $this->buttons;
+
+		return $markup;
+	}
+}

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/markup/TReplyKeyboard.php

@@ -0,0 +1,99 @@
+<?php
+namespace telegram\object\markup;
+
+/**
+ * --EN--
+ * This object represents a custom keyboard with reply options 
+ *
+ * --RU--
+ * Отображает клавиатуру возле поля для ввода сообщения
+ * 
+ * @see https://core.telegram.org/bots/api#replykeyboardmarkup
+ */
+class TReplyKeyboard extends AbstractMarkup {
+
+	/**
+	 * @var array
+	 */
+	protected $params = [];
+
+	/**
+	 * Кнопки
+	 * @var array
+	 */
+	protected $buttons = [];
+
+	/**
+	 * Указатель текущей строки в кнопках
+	 * @var int
+	 */
+	protected $row = -1;
+
+	public function __construct(array $params = []){
+		$this->params = $params;
+		$this->row();
+	}
+
+	/**
+     * Добавить новую строку в панель кнопок
+	 * @return TReplyKeyboard
+	 */
+	public function row(){
+		$this->row++;
+		if(!isset($this->buttons[$this->row])) $this->buttons[$this->row] = [];
+
+		return $this;
+	}
+
+	/**
+	 * Добавить кнопку
+	 * @param  string      $text     			Текст кнопки
+	 * @return TReplyKeyboard
+	 */
+	public function button(string $text){
+		$this->buttons[$this->row][] = ['text' => $text];
+		
+		return $this;
+	}
+
+	/**
+	 * Указывает клиенту подогнать высоту клавиатуры под количество кнопок 
+	 * (сделать её меньше, если кнопок мало и наоборот)
+	 * @param bool $value 
+	 * @return TReplyKeyboard
+	 */
+	public function setResize(bool $value){
+		$this->params['resize_keyboard'] = $value;
+		return $this;
+	}
+
+	/**
+	 * Указывает клиенту скрыть клавиатуру после использования (после нажатия на кнопку). 
+	 * Её по-прежнему можно будет открыть через иконку в поле ввода сообщения.  
+	 * @param bool $value 
+	 * @return TReplyKeyboard
+	 */
+	public function setOneTime(bool $value){
+		$this->params['one_time_keyboard'] = $value;
+		return $this;
+	}
+
+	/**
+	 * @param bool $value 
+	 * @return TReplyKeyboard
+	 */
+	public function setSelective(bool $value){
+		$this->params['selective'] = $value;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getMarkup(): array {
+		$markup = $this->params;
+		$markup['keyboard'] = $this->buttons;
+
+		return $markup;
+	}
+}

src-bundle/vendor/develnext.bundle.telegram.TelegramBotAPIBundle/telegram/object/markup/TReplyKeyboardRemove.php

@@ -0,0 +1,25 @@
+<?php
+namespace telegram\object\markup;
+
+/**
+ * --EN--
+ * Upon receiving a message with this object, Telegram clients will remove the current custom keyboard and display the default letter-keyboard. By default, custom keyboards are displayed until a new keyboard is sent by a bot. An exception is made for one-time keyboards that are hidden immediately after the user presses a button
+ * 
+ * @see https://core.telegram.org/bots/api#replykeyboardremove
+ */
+class TReplyKeyboardRemove extends AbstractMarkup {
+	public function __construct(){
+		$this->markup['remove_keyboard'] = true;
+	}
+
+	/**
+	 * --EN--
+	 * Use this parameter if you want to force reply from 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.
+	 * 
+	 * @param bool $value 
+	 */
+	public function setSelective(bool $value){
+		$this->markup['selective'] = $value;
+		return $this;
+	}
+}