From da2c32c94b11e972e4a1b07b465839f775c70192 Mon Sep 17 00:00:00 2001
From: Marco De Bortoli <me@debo.io>
Date: Sat, 16 May 2020 20:27:12 +0100
Subject: [PATCH 1/2] #1048: Update code to reflect namespace changes

---
 README.md                |  2 +-
 composer.json            |  2 +-
 src/BotManager.php       | 20 ++++++++++----------
 tests/BotManagerTest.php |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 16b769f..9132092 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ It is possible however, to override the core version that this library requires:
 ```yaml
 "require": {
     "php-telegram-bot/telegram-bot-manager": "^1.4",
-    "longman/telegram-bot": "dev-develop as 0.59"
+    "php-telegram-bot/core": "dev-develop as 0.59"
 }
 ```
 
diff --git a/composer.json b/composer.json
index d4e54c8..798d592 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": "^7.1",
-        "longman/telegram-bot": "^0.59",
+        "php-telegram-bot/core": "^0.59",
         "longman/ip-tools": "^1.2",
         "psr/log": "^1.1"
     },
diff --git a/src/BotManager.php b/src/BotManager.php
index f7e794c..c90a359 100644
--- a/src/BotManager.php
+++ b/src/BotManager.php
@@ -12,16 +12,16 @@
 
 use Exception;
 use Longman\IPTools\Ip;
-use Longman\TelegramBot\Entities\CallbackQuery;
-use Longman\TelegramBot\Entities\ChosenInlineResult;
-use Longman\TelegramBot\Entities\InlineQuery;
-use Longman\TelegramBot\Entities\Message;
-use Longman\TelegramBot\Entities\ServerResponse;
-use Longman\TelegramBot\Entities\Update;
-use Longman\TelegramBot\Exception\TelegramException;
-use Longman\TelegramBot\Request;
-use Longman\TelegramBot\Telegram;
-use Longman\TelegramBot\TelegramLog;
+use PhpTelegramBot\Core\Entities\CallbackQuery;
+use PhpTelegramBot\Core\Entities\ChosenInlineResult;
+use PhpTelegramBot\Core\Entities\InlineQuery;
+use PhpTelegramBot\Core\Entities\Message;
+use PhpTelegramBot\Core\Entities\ServerResponse;
+use PhpTelegramBot\Core\Entities\Update;
+use PhpTelegramBot\Core\Exception\TelegramException;
+use PhpTelegramBot\Core\Request;
+use PhpTelegramBot\Core\Telegram;
+use PhpTelegramBot\Core\TelegramLog;
 use TelegramBot\TelegramBotManager\Exception\InvalidAccessException;
 use TelegramBot\TelegramBotManager\Exception\InvalidActionException;
 use TelegramBot\TelegramBotManager\Exception\InvalidParamsException;
diff --git a/tests/BotManagerTest.php b/tests/BotManagerTest.php
index f9ecffc..f082356 100644
--- a/tests/BotManagerTest.php
+++ b/tests/BotManagerTest.php
@@ -10,9 +10,9 @@
 
 namespace TelegramBot\TelegramBotManager\Tests;
 
-use Longman\TelegramBot\Request;
-use Longman\TelegramBot\Telegram;
-use Longman\TelegramBot\TelegramLog;
+use PhpTelegramBot\Core\Request;
+use PhpTelegramBot\Core\Telegram;
+use PhpTelegramBot\Core\TelegramLog;
 use TelegramBot\TelegramBotManager\BotManager;
 use TelegramBot\TelegramBotManager\Exception\InvalidAccessException;
 use TelegramBot\TelegramBotManager\Exception\InvalidParamsException;

From 9941b7cdf0dbb4726146cbb68a6d1795e0a0742b Mon Sep 17 00:00:00 2001
From: Marco De Bortoli <me@debo.io>
Date: Sun, 24 May 2020 14:30:08 +0100
Subject: [PATCH 2/2] #1048: Properly update bot manager namespace

---
 CHANGELOG.md                              |  4 ++--
 README.md                                 |  2 +-
 composer.json                             | 12 ++++++------
 src/Action.php                            |  4 ++--
 src/BotManager.php                        | 10 +++++-----
 src/Exception/BotManagerException.php     |  2 +-
 src/Exception/InvalidAccessException.php  |  2 +-
 src/Exception/InvalidActionException.php  |  2 +-
 src/Exception/InvalidParamsException.php  |  2 +-
 src/Exception/InvalidWebhookException.php |  2 +-
 src/Params.php                            |  4 ++--
 tests/ActionTest.php                      |  6 +++---
 tests/BotManagerTest.php                  | 14 +++++++-------
 tests/ParamsTest.php                      |  8 ++++----
 tests/TestHelpers.php                     |  2 +-
 15 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0a205d..7081e01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Notes
 - [:ledger: View file changes][1.2.2]
 ### Added
-- Linked version numbers in changelog for easy verification of code changes. 
+- Linked version numbers in changelog for easy verification of code changes.
 ### Changed
 - Upgraded dependencies and bumped core to version 0.48.0.
 
@@ -94,7 +94,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 - [:ledger: View file changes][1.0.0]
 ### Changed
 - [:exclamation:][1.0.0-bc-move] Move to `php-telegram-bot/telegram-bot-manager` on packagist.
-- [:exclamation:][1.0.0-bc-move] Move to `TelegramBot\TelegramBotManager` namespace.
+- [:exclamation:][1.0.0-bc-move] Move to `PhpTelegramBot\PhpTelegramBotManager` namespace.
 
 ## [0.44.0] - 2017-05-05
 ### Notes
diff --git a/README.md b/README.md
index 9132092..adbbe7a 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ Let's start off with a simple example that uses the webhook method:
 ```php
 <?php
 
-use TelegramBot\TelegramBotManager\BotManager;
+use PhpTelegramBot\PhpTelegramBotManager\BotManager;
 
 // Load composer.
 require_once __DIR__ . '/vendor/autoload.php';
diff --git a/composer.json b/composer.json
index 798d592..e3d76bf 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-    "name": "php-telegram-bot/telegram-bot-manager",
+    "name": "php-telegram-bot/php-telegram-bot-manager",
     "type": "library",
     "description": "PHP Telegram Bot Manager",
     "keywords": ["telegram", "bot", "manager"],
     "license": "MIT",
-    "homepage": "https://github.com/php-telegram-bot/telegram-bot-manager",
+    "homepage": "https://github.com/php-telegram-bot/php-telegram-bot-manager",
     "support": {
-        "issues": "https://github.com/php-telegram-bot/telegram-bot-manager/issues",
-        "source": "https://github.com/php-telegram-bot/telegram-bot-manager"
+        "issues": "https://github.com/php-telegram-bot/php-telegram-bot-manager/issues",
+        "source": "https://github.com/php-telegram-bot/php-telegram-bot-manager"
     },
     "authors": [
         {
@@ -30,12 +30,12 @@
     },
     "autoload": {
         "psr-4": {
-            "TelegramBot\\TelegramBotManager\\": "src"
+            "PhpTelegramBot\\PhpTelegramBotManager\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "TelegramBot\\TelegramBotManager\\Tests\\": "tests"
+            "PhpTelegramBot\\PhpTelegramBotManager\\Tests\\": "tests"
         }
     },
     "scripts": {
diff --git a/src/Action.php b/src/Action.php
index 4284348..bbfb09a 100644
--- a/src/Action.php
+++ b/src/Action.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager;
+namespace PhpTelegramBot\PhpTelegramBotManager;
 
-use TelegramBot\TelegramBotManager\Exception\InvalidActionException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidActionException;
 
 class Action
 {
diff --git a/src/BotManager.php b/src/BotManager.php
index c90a359..747e423 100644
--- a/src/BotManager.php
+++ b/src/BotManager.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager;
+namespace PhpTelegramBot\PhpTelegramBotManager;
 
 use Exception;
 use Longman\IPTools\Ip;
@@ -22,10 +22,10 @@
 use PhpTelegramBot\Core\Request;
 use PhpTelegramBot\Core\Telegram;
 use PhpTelegramBot\Core\TelegramLog;
-use TelegramBot\TelegramBotManager\Exception\InvalidAccessException;
-use TelegramBot\TelegramBotManager\Exception\InvalidActionException;
-use TelegramBot\TelegramBotManager\Exception\InvalidParamsException;
-use TelegramBot\TelegramBotManager\Exception\InvalidWebhookException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidAccessException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidActionException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidParamsException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidWebhookException;
 
 class BotManager
 {
diff --git a/src/Exception/BotManagerException.php b/src/Exception/BotManagerException.php
index e5fd638..92e1bc7 100644
--- a/src/Exception/BotManagerException.php
+++ b/src/Exception/BotManagerException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Exception;
+namespace PhpTelegramBot\PhpTelegramBotManager\Exception;
 
 class BotManagerException extends \Exception
 {
diff --git a/src/Exception/InvalidAccessException.php b/src/Exception/InvalidAccessException.php
index cfcd5d3..fccb68e 100644
--- a/src/Exception/InvalidAccessException.php
+++ b/src/Exception/InvalidAccessException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Exception;
+namespace PhpTelegramBot\PhpTelegramBotManager\Exception;
 
 class InvalidAccessException extends BotManagerException
 {
diff --git a/src/Exception/InvalidActionException.php b/src/Exception/InvalidActionException.php
index 745c2ea..950e833 100644
--- a/src/Exception/InvalidActionException.php
+++ b/src/Exception/InvalidActionException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Exception;
+namespace PhpTelegramBot\PhpTelegramBotManager\Exception;
 
 class InvalidActionException extends BotManagerException
 {
diff --git a/src/Exception/InvalidParamsException.php b/src/Exception/InvalidParamsException.php
index 8bdea4a..432765c 100644
--- a/src/Exception/InvalidParamsException.php
+++ b/src/Exception/InvalidParamsException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Exception;
+namespace PhpTelegramBot\PhpTelegramBotManager\Exception;
 
 class InvalidParamsException extends BotManagerException
 {
diff --git a/src/Exception/InvalidWebhookException.php b/src/Exception/InvalidWebhookException.php
index cddb2cc..84bf7b7 100644
--- a/src/Exception/InvalidWebhookException.php
+++ b/src/Exception/InvalidWebhookException.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Exception;
+namespace PhpTelegramBot\PhpTelegramBotManager\Exception;
 
 class InvalidWebhookException extends BotManagerException
 {
diff --git a/src/Params.php b/src/Params.php
index 762c4f2..4482643 100644
--- a/src/Params.php
+++ b/src/Params.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager;
+namespace PhpTelegramBot\PhpTelegramBotManager;
 
-use TelegramBot\TelegramBotManager\Exception\InvalidParamsException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidParamsException;
 
 class Params
 {
diff --git a/tests/ActionTest.php b/tests/ActionTest.php
index 2f58f9e..47faef1 100644
--- a/tests/ActionTest.php
+++ b/tests/ActionTest.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Tests;
+namespace PhpTelegramBot\PhpTelegramBotManager\Tests;
 
-use TelegramBot\TelegramBotManager\Action;
-use TelegramBot\TelegramBotManager\Exception\InvalidActionException;
+use PhpTelegramBot\PhpTelegramBotManager\Action;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidActionException;
 
 class ActionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/BotManagerTest.php b/tests/BotManagerTest.php
index f082356..b16e4ee 100644
--- a/tests/BotManagerTest.php
+++ b/tests/BotManagerTest.php
@@ -8,21 +8,21 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Tests;
+namespace PhpTelegramBot\PhpTelegramBotManager\Tests;
 
 use PhpTelegramBot\Core\Request;
 use PhpTelegramBot\Core\Telegram;
 use PhpTelegramBot\Core\TelegramLog;
-use TelegramBot\TelegramBotManager\BotManager;
-use TelegramBot\TelegramBotManager\Exception\InvalidAccessException;
-use TelegramBot\TelegramBotManager\Exception\InvalidParamsException;
+use PhpTelegramBot\PhpTelegramBotManager\BotManager;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidAccessException;
+use PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidParamsException;
 
 /**
  * Class BotManagerTest.php
  *
  * Leave all member variables public to allow easy modification.
  *
- * @package TelegramBot\TelegramBotManager
+ * @package PhpTelegramBot\PhpTelegramBotManager
  */
 class BotManagerTest extends \PHPUnit\Framework\TestCase
 {
@@ -259,7 +259,7 @@ public function testDeleteWebhookViaRunLiveBot(): void
     }
 
     /**
-     * @expectedException \TelegramBot\TelegramBotManager\Exception\InvalidWebhookException
+     * @expectedException \PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidWebhookException
      * @expectedExceptionMessage Invalid webhook
      */
     public function testValidateAndSetWebhookFailSetWithoutWebhook(): void
@@ -271,7 +271,7 @@ public function testValidateAndSetWebhookFailSetWithoutWebhook(): void
     }
 
     /**
-     * @expectedException \TelegramBot\TelegramBotManager\Exception\InvalidWebhookException
+     * @expectedException \PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidWebhookException
      * @expectedExceptionMessage Invalid webhook
      */
     public function testValidateAndSetWebhookFailResetWithoutWebhook(): void
diff --git a/tests/ParamsTest.php b/tests/ParamsTest.php
index 46a610e..8ad243a 100644
--- a/tests/ParamsTest.php
+++ b/tests/ParamsTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Tests;
+namespace PhpTelegramBot\PhpTelegramBotManager\Tests;
 
-use TelegramBot\TelegramBotManager\Params;
+use PhpTelegramBot\PhpTelegramBotManager\Params;
 
 class ParamsTest extends \PHPUnit\Framework\TestCase
 {
@@ -88,7 +88,7 @@ public function testConstruct(): void
     }
 
     /**
-     * @expectedException \TelegramBot\TelegramBotManager\Exception\InvalidParamsException
+     * @expectedException \PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidParamsException
      * @expectedExceptionMessage Some vital info is missing: api_key
      */
     public function testConstructWithoutApiKey(): void
@@ -97,7 +97,7 @@ public function testConstructWithoutApiKey(): void
     }
 
     /**
-     * @expectedException \TelegramBot\TelegramBotManager\Exception\InvalidParamsException
+     * @expectedException \PhpTelegramBot\PhpTelegramBotManager\Exception\InvalidParamsException
      * @expectedExceptionMessage Some vital info is missing: secret
      */
     public function testConstructWithWebhookWithoutSecret(): void
diff --git a/tests/TestHelpers.php b/tests/TestHelpers.php
index 27250e2..0e2c051 100644
--- a/tests/TestHelpers.php
+++ b/tests/TestHelpers.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace TelegramBot\TelegramBotManager\Tests;
+namespace PhpTelegramBot\PhpTelegramBotManager\Tests;
 
 class TestHelpers
 {