Merge pull request #1074 from 1int/refactor/default-command-names

Use class constants instead of strings for 'generic' and 'genericmessage'

Author: noplanman

CHANGELOG.md

@@ -7,6 +7,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Notes
 - [:ledger: View file changes][Unreleased]
 ### Added
+- Replaced 'generic' and 'genericmessage' strings with Telegram::GENERIC_COMMAND and Telegram::GENERIC_MESSAGE_COMMAND constants (@1int)
 ### Changed
 ### Deprecated
 ### Removed

src/Commands/SystemCommands/GenericmessageCommand.php

@@ -15,6 +15,7 @@
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Exception\TelegramException;
 use Longman\TelegramBot\Request;
+use Longman\TelegramBot\Telegram;
 
 /**
  * Generic message command
@@ -24,7 +25,7 @@ class GenericmessageCommand extends SystemCommand
     /**
      * @var string
      */
-    protected $name = 'genericmessage';
+    protected $name = Telegram::GENERIC_MESSAGE_COMMAND;
 
     /**
      * @var string

src/Telegram.php

@@ -146,6 +146,16 @@ class Telegram
      */
     protected $last_update_id = null;
 
+    /**
+     * The command to be executed when there's a new message update and nothing more suitable is found
+     */
+    const GENERIC_MESSAGE_COMMAND = 'genericmessage';
+
+    /**
+     * The command to be executed by default (when no other relevant commands are applicable)
+     */
+    const GENERIC_COMMAND = 'generic';
+
     /**
      * Telegram constructor.
      *
@@ -455,7 +465,7 @@ public function processUpdate(Update $update)
         $this->getCommandsList();
 
         //If all else fails, it's a generic message.
-        $command = 'genericmessage';
+        $command = self::GENERIC_MESSAGE_COMMAND;
 
         $update_type = $this->update->getUpdateType();
         if ($update_type === 'message') {
@@ -506,12 +516,12 @@ public function executeCommand($command)
 
         if (!$command_obj || !$command_obj->isEnabled()) {
             //Failsafe in case the Generic command can't be found
-            if ($command === 'generic') {
+            if ($command === self::GENERIC_COMMAND) {
                 throw new TelegramException('Generic command missing!');
             }
 
             //Handle a generic command or non existing one
-            $this->last_command_response = $this->executeCommand('generic');
+            $this->last_command_response = $this->executeCommand(self::GENERIC_COMMAND);
         } else {
             //execute() method is executed after preExecute()
             //This is to prevent executing a DB query without a valid connection