Merge pull request #813 from customsoft/patch-1

Prevent redefine constant BASE_PATH

Author: noplanman

CHANGELOG.md

@@ -6,6 +6,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ## [Unreleased]
 ### Added
 ### Changed
+- [:exclamation:][unreleased-bc-rename-constants] Rename and ensure no redefinition of constants: `BASE_PATH` -> `TB_BASE_PATH`, `BASE_COMMANDS_PATH` -> `TB_BASE_COMMANDS_PATH`.
 ### Deprecated
 ### Removed
 ### Fixed

src/Telegram.php

@@ -10,8 +10,8 @@
 
 namespace Longman\TelegramBot;
 
-define('BASE_PATH', __DIR__);
-define('BASE_COMMANDS_PATH', BASE_PATH . '/Commands');
+defined('TB_BASE_PATH') || define('TB_BASE_PATH', __DIR__);
+defined('TB_BASE_COMMANDS_PATH') || define('TB_BASE_COMMANDS_PATH', TB_BASE_PATH . '/Commands');
 
 use Exception;
 use Longman\TelegramBot\Commands\Command;
@@ -177,7 +177,7 @@ public function __construct($api_key, $bot_username = '')
         }
 
         //Add default system commands path
-        $this->addCommandsPath(BASE_COMMANDS_PATH . '/SystemCommands');
+        $this->addCommandsPath(TB_BASE_COMMANDS_PATH . '/SystemCommands');
 
         Request::initialize($this);
     }
@@ -461,7 +461,7 @@ public function processUpdate(Update $update)
 
             //Load admin commands
             if ($this->isAdmin()) {
-                $this->addCommandsPath(BASE_COMMANDS_PATH . '/AdminCommands', false);
+                $this->addCommandsPath(TB_BASE_COMMANDS_PATH . '/AdminCommands', false);
             }
 
             $type = $message->getType();