Merge pull request #273 from noplanman/improve_inline_keyboard_button

Improve inline keyboard button

src/Entities/InlineKeyboardButton.php

@@ -14,32 +14,38 @@ use Longman\TelegramBot\Exception\TelegramException;
 
 class InlineKeyboardButton extends Entity
 {
+    /**#@+
+     * @var string
+     */
     protected $text;
     protected $url;
     protected $callback_data;
     protected $switch_inline_query;
-
+    /**#@-*/
 
     /**
      * InlineKeyboardButton constructor.
      *
-     * @todo check if only one of 'url, callback_data, switch_inline_query' fields is set, documentation states that only one of these can be used
-     *
      * @param array $data
+     *
+     * @throws \Longman\TelegramBot\Exception\TelegramException
      */
-    public function __construct($data = array())
+    public function __construct(array $data = [])
     {
         $this->text = isset($data['text']) ? $data['text'] : null;
         if (empty($this->text)) {
             throw new TelegramException('text is empty!');
         }
 
-        $this->url = isset($data['url']) ? $data['url'] : null;
-        $this->callback_data = isset($data['callback_data']) ? $data['callback_data'] : null;
-        $this->switch_inline_query = isset($data['switch_inline_query']) ? $data['switch_inline_query'] : null;
-
-        if ($this->url === '' && $this->callback_data === '' && $this->switch_inline_query === '') {
-            throw new TelegramException('You must use at least one of these fields: url, callback_data, switch_inline_query!');
+        $num_params = 0;
+        foreach (['url', 'callback_data', 'switch_inline_query'] as $param) {
+            if (!empty($data[$param])) {
+                $this->$param = $data[$param];
+                $num_params++;
+            }
+        }
+        if ($num_params !== 1) {
+            throw new TelegramException('You must use only one of these fields: url, callback_data, switch_inline_query!');
         }
     }
 }

tests/Unit/Entities/InlineKeyboardButtonTest.php

+<?php
+/**
+ * This file is part of the TelegramBot package.
+ *
+ * (c) Avtandil Kikabidze aka LONGMAN <akalongman@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tests\Unit;
+
+use Longman\TelegramBot\Entities\InlineKeyboardButton;
+use Longman\TelegramBot\Exception\TelegramException;
+
+/**
+ * @package         TelegramTest
+ * @author          Avtandil Kikabidze <akalongman@gmail.com>
+ * @copyright       Avtandil Kikabidze <akalongman@gmail.com>
+ * @license         http://opensource.org/licenses/mit-license.php  The MIT License (MIT)
+ * @link            http://www.github.com/akalongman/php-telegram-bot
+ */
+class InlineKeyboardButtonTest extends TestCase
+{
+    /**
+     * @expectedException \Longman\TelegramBot\Exception\TelegramException
+     * @expectedExceptionMessage text is empty!
+     */
+    public function testInlineKeyboardButtonNoTextFail()
+    {
+        new InlineKeyboardButton([]);
+    }
+
+    /**
+     * @expectedException \Longman\TelegramBot\Exception\TelegramException
+     * @expectedExceptionMessage You must use only one of these fields: url, callback_data, switch_inline_query!
+     */
+    public function testInlineKeyboardButtonNoParameterFail()
+    {
+        new InlineKeyboardButton(['text' => 'message']);
+    }
+
+    /**
+     * @expectedException \Longman\TelegramBot\Exception\TelegramException
+     * @expectedExceptionMessage You must use only one of these fields: url, callback_data, switch_inline_query!
+     */
+    public function testInlineKeyboardButtonTooManyParametersFail()
+    {
+        new InlineKeyboardButton(['text' => 'message', 'url' => 'url_value', 'callback_data' => 'callback_data_value']);
+    }
+
+    public function testInlineKeyboardButtonSuccess()
+    {
+        new InlineKeyboardButton(['text' => 'message', 'url' => 'url_value']);
+        new InlineKeyboardButton(['text' => 'message', 'callback_data' => 'callback_data_value']);
+        new InlineKeyboardButton(['text' => 'message', 'switch_inline_query' => 'switch_inline_query_value']);
+    }
+}