Test for command handler

src/Bot.php

@@ -11,6 +11,7 @@
 use WeStacks\TeleBot\Methods\SendMessageMethod;
 use WeStacks\TeleBot\Methods\SendPhotoMethod;
 use GuzzleHttp\Promise\PromiseInterface;
+use WeStacks\TeleBot\Handlers\CommandHandler;
 use WeStacks\TeleBot\Interfaces\UpdateHandler;
 use WeStacks\TeleBot\Methods\GetUpdatesMethod;
 use WeStacks\TeleBot\Objects\Update;
@@ -108,15 +109,6 @@ public function exceptions($exceptions = true)
         return $this;
     }
 
-    /**
-     * Get bot's update handlers
-     * @return (UpdateHandler|Closure)[] 
-     */
-    public function getHandlers()
-    {
-        return $this->properties['handlers'];
-    }
-
     /**
      * Add new update handler(s) to the bot instance
      * @param string|Closure|array $handler - string that representing `UpdateHandler` subclass resolution or closure function. You also may give an array to add multiple handlers.

src/Handlers/CommandHandler.php

@@ -3,6 +3,7 @@
 namespace WeStacks\TeleBot\Handlers;
 
 use WeStacks\TeleBot\Interfaces\UpdateHandler;
+use WeStacks\TeleBot\Objects\BotCommand;
 use WeStacks\TeleBot\Objects\Update;
 
 /**
@@ -11,42 +12,35 @@
  */
 abstract class CommandHandler extends UpdateHandler
 {
-    /**
-     * Bot command to trigger handler
-     * @var string|null
-     */
-    protected static $command = null;
-
     /**
      * Command aliases
      * @var string[]
      */
     protected static $aliases = [];
-
-    /**
-     * Command description
-     * @var string|null
-     */
-    protected static $description = null;
 
     /**
-     * Command help message
-     * @var string|null
+     * Command descriptioin
+     * @var string
      */
-    protected static $help = null;
+    protected static $description = null;
 
     /**
-     * Get array with command's `name`, `aliases`, `description` and `help` message
-     * @return array
+     * Get BotCommand foreach command `aliases` and `description`
+     * @return BotCommand[]
      */
-    public static function getComandData()
+    public static function getBotCommand()
     {
-        return [
-            'name' => static::$command,
-            'aliases' => static::$aliases,
-            'description' => static::$description,
-            'help' => static::$help
-        ];
+        $data = [];
+
+        foreach (static::$aliases as $name)
+        {
+            $data[] = new BotCommand([
+                'command' => $name,
+                'description' => static::$description
+            ]);
+        }
+
+        return $data;
     }
 
     public static function trigger(Update $update)
@@ -57,10 +51,9 @@ public static function trigger(Update $update)
         foreach ($entities as $entity)
         {
             if ($entity->type != 'bot_command') continue;
-            $aliases = array_merge(static::$aliases, [static::$command]);
 
             $command = substr($message->text, $entity->offset, $entity->length);
-            if (in_array($command, $aliases)) return true;
+            if (in_array($command, static::$aliases)) return true;
         }
 
         return false;

src/Helpers/TypeCaster.php

@@ -91,8 +91,8 @@ private static function castDirect($object, string $type)
 
         if(in_array($value_type, $simple) && in_array($type, $simple))
         {
-            settype($value, $type);
-            return $value;
+            settype($object, $type);
+            return $object;
         }
 
         if(class_exists($type)) return $type::create($object);

src/Methods/SendMessageMethod.php

@@ -22,7 +22,7 @@ protected function request()
     private function send()
     {
         $parameters = [
-            'chat_id'                   => 'string',
+            'chat_id'                   => 'integer',
             'text'                      => 'string',
             'parse_mode'                => 'string',
             'disable_web_page_preview'  => 'boolean',

tests/Feature/HandleUpdatesTest.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use WeStacks\TeleBot\Bot;
 use WeStacks\TeleBot\Objects\Update;
+use WeStacks\TeleBot\Tests\Helpers\StartCommandHandler;
 
 class HandleUpdatesTest extends TestCase
 {
@@ -20,20 +21,34 @@ protected function setUp(): void
 
     public function testHandleUpdates()
     {
+        // Using array just to test is it works
         $this->bot->addHandler([function (Update $update) {
+            // This should echo update's JSON object
             echo $update;
         }]);
 
         $updates = $this->bot->getUpdates();
 
         foreach ($updates as $update)
         {
-            // We will store out handler JSON output into the buffer and then validate is it the same update
+            // We will store our handler JSON output into the output buffer and then validate is it the same update
             ob_start();
             $this->bot->handleUpdate($update);
             $result = new Update(json_decode(ob_get_clean()));
 
             $this->assertEquals($update->update_id, $result->update_id);
         }
     }
+
+    public function testHandleUpdatesUsingObject()
+    {
+        $this->expectNotToPerformAssertions(); // Check telegram output. You should get "Hello, World!" from StartCommandHandler::class
+        $this->bot->addHandler(StartCommandHandler::class);
+
+        $updates = $this->bot->getUpdates([]);
+        foreach ($updates as $update)
+        {
+            $this->bot->handleUpdate($update);
+        }
+    }
 }

tests/Feature/SendMessageTest.php

@@ -42,6 +42,7 @@ public function testSendMessageAsync()
             'text' => 'Unit test message'
         ]);
 
+        // Should be wrong cos Telegram is not accept empty messages.
         $promises[] = $this->bot->async(true)->exceptions(false)->sendMessage([
             'chat_id' => getenv('TELEGRAM_USER_ID'),
             'text' => ''

tests/Helpers/StartCommandHandler.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace WeStacks\TeleBot\Tests\Helpers;
+
+use WeStacks\TeleBot\Handlers\CommandHandler;
+
+class StartCommandHandler extends CommandHandler
+{
+    protected static $aliases = [ '/start', '/s' ];
+    protected static $description = 'Send "/start" or "/s" to get "Hello, World!"';
+
+    public function handle()
+    {
+        $this->bot->sendMessage([
+            'chat_id' => $this->update->message->chat->id,
+            'text' => 'Hello, World!'
+        ]);
+    }
+}