Issue #1205

Add tests and update changed code

Author: sedovserge

src/Telegram.php

@@ -15,6 +15,7 @@
 defined('TB_BASE_COMMANDS_PATH') || define('TB_BASE_COMMANDS_PATH', TB_BASE_PATH . '/Commands');
 
 use Exception;
+use InvalidArgumentException;
 use Longman\TelegramBot\Commands\AdminCommand;
 use Longman\TelegramBot\Commands\Command;
 use Longman\TelegramBot\Commands\SystemCommand;
@@ -310,10 +311,11 @@ public function getCommandsList(): array
      *
      * @return string|null
      */
-    private function getCommandClassName(string $auth, string $command): ?string
+    public function getCommandClassName(string $auth, string $command): ?string
     {
         $command = mb_strtolower($command);
         $auth = $this->ucFirstUnicode($auth);
+
         if (!empty($this->commandsClasses[$auth][$command])) {
             $className = $this->commandsClasses[$auth][$command];
             if (class_exists($className)){
@@ -774,11 +776,15 @@ public function addCommandsClass(string $command, string $className, $auth = 'Us
     {
         if (!class_exists($className))
         {
-            TelegramLog::error('Command class name: "' . $className . '" does not exist.');
+            $error = 'Command class name: "' . $className . '" does not exist.';
+            TelegramLog::error($error);
+            throw new InvalidArgumentException($error);
         }
-        if (!empty($command))
+        if (empty($command))
         {
-            TelegramLog::error('Command Name "' . $command . '" not set.');
+            $error = 'Command Name "' . $command . '" not set.';
+            TelegramLog::error($error);
+            throw new InvalidArgumentException($error);
         }
 
         if (!is_array($this->commandsClasses))
@@ -844,6 +850,16 @@ public function getCommandsPaths(): array
         return $this->commands_paths;
     }
 
+    /**
+     * Return the list of commands classes
+     *
+     * @return array
+     */
+    public function getCommandsClasses(): array
+    {
+        return $this->commandsClasses;
+    }
+
     /**
      * Set custom upload path
      *

tests/Unit/TelegramTest.php

@@ -12,6 +12,8 @@
 namespace Longman\TelegramBot\Tests\Unit;
 
 use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
+use Exception;
+use Longman\TelegramBot\Commands\UserCommands\StartCommand;
 use Longman\TelegramBot\Entities\Update;
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Telegram;
@@ -133,6 +135,33 @@ public function testAddCustomCommandsPaths(): void
         self::assertCount(4, $tg->getCommandsPaths());
     }
 
+    public function testAddCustomCommandsClass(): void
+    {
+        $tg = $this->telegram;
+        $class = StartCommand::class;
+
+        self::assertCount(3, $tg->getCommandsClasses());
+
+        try {
+            $tg->addCommandsClass('test', 'not\exist\Class', 'user');
+        }
+        catch (\Exception $ex){}
+        self::assertCount(0, $tg->getCommandsClasses()['User']);
+
+        try {
+            $tg->addCommandsClass('', $class, 'user');
+        }
+        catch (\Exception $ex){}
+        self::assertCount(0, $tg->getCommandsClasses()['User']);
+
+        $tg->addCommandsClass('test', $class, 'user');
+        self::assertCount(1, $tg->getCommandsClasses()['User']);
+
+        $tg->addCommandsClass('testadmin', $class, 'admin');
+        self::assertCount(1, $tg->getCommandsClasses()['Admin']);
+
+    }
+
     public function testSettingDownloadUploadPaths(): void
     {
         self::assertEmpty($this->telegram->getDownloadPath());
@@ -152,6 +181,23 @@ public function testGetCommandsList(): void
         self::assertNotCount(0, $commands);
     }
 
+    public function testGetCommandClass(): void
+    {
+        $className = StartCommand::class;
+        $commands = $this->telegram->getCommandsClasses();
+        self::assertIsArray($commands);
+        self::assertCount(3, $commands);
+
+        $class = $this->telegram->getCommandClassName('user', 'notexist');
+        self::assertNull($class);
+
+        $this->telegram->addCommandsClass('test', $className, 'user');
+        $class = $this->telegram->getCommandClassName('user', 'test');
+        self::assertNotNull($class);
+        self::assertSame($className, $class);
+
+    }
+
     public function testUpdateFilter(): void
     {
         $rawUpdate = '{