Fixes for refactoring after move to GitHub

TiiFuchs · TiiFuchs · commit c002afee3f4d · 2022-10-04T22:29:01.000+02:00
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "tii/laravel-telegram-bot",
+    "name": "php-telegram-bot/laravel",
     "description": "Integrates PHP Telegram Bot into Laravel.",
     "license": "MIT",
     "authors": [
@@ -8,11 +8,11 @@
             "email": "mail@tii.one"
         }
     ],
-    "homepage": "https://github.com/tii/laravel-telegram-bot",
+    "homepage": "https://github.com/php-telegram-bot/laravel",
     "keywords": ["laravel", "telegram", "bot"],
     "require": {
         "illuminate/support": "~7|~8|~9",
-        "longman/telegram-bot": "^0.77",
+        "longman/telegram-bot": "^0.79",
         "ext-pcntl": "*"
     },
     "require-dev": {
@@ -21,22 +21,17 @@
     },
     "autoload": {
         "psr-4": {
-            "Tii\\LaravelTelegramBot\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tii\\LaravelTelegramBot\\Tests\\": "tests"
+            "PhpTelegramBot\\Laravel\\": "src/"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-              "Tii\\LaravelTelegramBot\\TelegramServiceProvider"
+              "PhpTelegramBot\\Laravel\\TelegramServiceProvider"
             ],
             "aliases": {
-                "CallbackButton": "Tii\\LaravelTelegramBot\\Facades\\CallbackButton",
-                "Telegram": "Tii\\LaravelTelegramBot\\Facades\\Telegram"
+                "CallbackButton": "PhpTelegramBot\\Laravel\\Facades\\CallbackButton",
+                "Telegram": "PhpTelegramBot\\Laravel\\Facades\\Telegram"
             }
         }
     }
diff --git a/database/migrations/2022_10_04_221900_update_to_0.78.0.php b/database/migrations/2022_10_04_221900_update_to_0.78.0.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration {
+    public function up()
+    {
+        DB::unprepared(file_get_contents(__DIR__ . '/sql/0.77.1-0.78.0.sql'));
+    }
+
+    public function down()
+    {
+        //
+    }
+};
diff --git a/database/migrations/sql/0.77.1-0.78.0.sql b/database/migrations/sql/0.77.1-0.78.0.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `bot_user` ADD COLUMN `is_premium` tinyint(1) DEFAULT 0 COMMENT 'True, if this user is a Telegram Premium user' AFTER `language_code`;
+ALTER TABLE `bot_user` ADD COLUMN `added_to_attachment_menu` tinyint(1) DEFAULT 0 COMMENT 'True, if this user added the bot to the attachment menu' AFTER `is_premium`;
diff --git a/readme.md b/readme.md
@@ -12,7 +12,7 @@ This is where your description should go. Take a look at [contributing.md](contr
 Via Composer
 
 ``` bash
-$ composer require tii/laravel-telegram-bot
+$ composer require php-telegram-bot/laravel
 ```
 
 ## Usage
diff --git a/src/Console/Commands/GeneratorCommand.php b/src/Console/Commands/GeneratorCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 
 use Illuminate\Console\Command;
diff --git a/src/Console/Commands/MakeTelegramCommand.php b/src/Console/Commands/MakeTelegramCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Support\Str;
 
diff --git a/src/Console/Commands/TelegramCloseCommand.php b/src/Console/Commands/TelegramCloseCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Console\Command;
 use Longman\TelegramBot\Request;
diff --git a/src/Console/Commands/TelegramDeleteWebhookCommand.php b/src/Console/Commands/TelegramDeleteWebhookCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Console\Command;
 use Longman\TelegramBot\Request;
diff --git a/src/Console/Commands/TelegramFetchCommand.php b/src/Console/Commands/TelegramFetchCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 
 use Illuminate\Console\Command;
diff --git a/src/Console/Commands/TelegramLogoutCommand.php b/src/Console/Commands/TelegramLogoutCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Console\Command;
 use Longman\TelegramBot\Request;
diff --git a/src/Console/Commands/TelegramPublishCommand.php b/src/Console/Commands/TelegramPublishCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Filesystem\Filesystem;
 
diff --git a/src/Console/Commands/TelegramSetWebhookCommand.php b/src/Console/Commands/TelegramSetWebhookCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Console\Commands;
+namespace PhpTelegramBot\Laravel\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
diff --git a/src/Facades/CallbackButton.php b/src/Facades/CallbackButton.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Facades;
+namespace PhpTelegramBot\Laravel\Facades;
 
 
 use Illuminate\Support\Facades\Facade;
@@ -10,6 +10,6 @@ class CallbackButton extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        return \Tii\LaravelTelegramBot\Factories\CallbackButton::class;
+        return \PhpTelegramBot\Laravel\Factories\CallbackButton::class;
     }
 }
diff --git a/src/Facades/Telegram.php b/src/Facades/Telegram.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Facades;
+namespace PhpTelegramBot\Laravel\Facades;
 
 use Illuminate\Support\Facades\Facade;
-use Tii\LaravelTelegramBot\LaravelTelegramBot;
+use PhpTelegramBot\Laravel\LaravelTelegramBot;
 
 class Telegram extends Facade
 {
diff --git a/src/Factories/CallbackButton.php b/src/Factories/CallbackButton.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Factories;
+namespace PhpTelegramBot\Laravel\Factories;
 
 
 use Illuminate\Support\Facades\Cache;
diff --git a/src/Http/Middleware/TrustTelegramNetwork.php b/src/Http/Middleware/TrustTelegramNetwork.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Http\Middleware;
+namespace PhpTelegramBot\Laravel\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\App;
diff --git a/src/LaravelTelegramBot.php b/src/LaravelTelegramBot.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot;
+namespace PhpTelegramBot\Laravel;
 
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Entities\Update;
diff --git a/src/Telegram/Commands/CallbackqueryCommand.php b/src/Telegram/Commands/CallbackqueryCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Telegram\Commands;
+namespace PhpTelegramBot\Laravel\Telegram\Commands;
 
 
 use Illuminate\Support\Facades\App;
@@ -10,10 +10,10 @@
 use Longman\TelegramBot\Conversation;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Request;
-use Tii\LaravelTelegramBot\Facades\Telegram;
-use Tii\LaravelTelegramBot\Telegram\Conversation\ConversationWrapper;
-use Tii\LaravelTelegramBot\Telegram\InlineKeyboardButton\RemembersCallbackPayload;
-use Tii\LaravelTelegramBot\Telegram\UsesEffectiveEntities;
+use PhpTelegramBot\Laravel\Facades\Telegram;
+use PhpTelegramBot\Laravel\Telegram\Conversation\ConversationWrapper;
+use PhpTelegramBot\Laravel\Telegram\InlineKeyboardButton\RemembersCallbackPayload;
+use PhpTelegramBot\Laravel\Telegram\UsesEffectiveEntities;
 
 class CallbackqueryCommand extends SystemCommand
 {
diff --git a/src/Telegram/Commands/GenericmessageCommand.php b/src/Telegram/Commands/GenericmessageCommand.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Telegram\Commands;
+namespace PhpTelegramBot\Laravel\Telegram\Commands;
 
 use Longman\TelegramBot\Commands\SystemCommand;
 use Longman\TelegramBot\Conversation;
 use Longman\TelegramBot\Entities\ServerResponse;
 use Longman\TelegramBot\Request;
-use Tii\LaravelTelegramBot\Facades\Telegram;
-use Tii\LaravelTelegramBot\Telegram\Conversation\ConversationWrapper;
-use Tii\LaravelTelegramBot\Telegram\UsesEffectiveEntities;
+use PhpTelegramBot\Laravel\Facades\Telegram;
+use PhpTelegramBot\Laravel\Telegram\Conversation\ConversationWrapper;
+use PhpTelegramBot\Laravel\Telegram\UsesEffectiveEntities;
 
 class GenericmessageCommand extends SystemCommand
 {
diff --git a/src/Telegram/Conversation/ConversationWrapper.php b/src/Telegram/Conversation/ConversationWrapper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Telegram\Conversation;
+namespace PhpTelegramBot\Laravel\Telegram\Conversation;
 
 use Longman\TelegramBot\Conversation;
 use Longman\TelegramBot\Entities\Update;
diff --git a/src/Telegram/Conversation/LeadsConversation.php b/src/Telegram/Conversation/LeadsConversation.php
@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Telegram\Conversation;
+namespace PhpTelegramBot\Laravel\Telegram\Conversation;
 
 use Longman\TelegramBot\Entities\Update;
 
 /**
  * Trait LeadsConversation
- * @package Tii\LaravelTelegramBot
+ * @package PhpTelegramBot\Laravel
  * @method Update getUpdate()
  * @method string getName()
  */
diff --git a/src/Telegram/InlineKeyboardButton/CallbackPayload.php b/src/Telegram/InlineKeyboardButton/CallbackPayload.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Tii\LaravelTelegramBot\Telegram\InlineKeyboardButton;
+namespace PhpTelegramBot\Laravel\Telegram\InlineKeyboardButton;
 
 
 class CallbackPayload
diff --git a/src/Telegram/InlineKeyboardButton/RemembersCallbackPayload.php b/src/Telegram/InlineKeyboardButton/RemembersCallbackPayload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Telegram\InlineKeyboardButton;
+namespace PhpTelegramBot\Laravel\Telegram\InlineKeyboardButton;
 
 
 use Illuminate\Support\Facades\Cache;
@@ -9,7 +9,7 @@
 
 /**
  * Trait CallbackQueryCache
- * @package Tii\LaravelTelegramBot\Services
+ * @package PhpTelegramBot\Laravel\Services
  * @method Update getUpdate()
  */
 trait RemembersCallbackPayload
diff --git a/src/Telegram/UsesEffectiveEntities.php b/src/Telegram/UsesEffectiveEntities.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot\Telegram;
+namespace PhpTelegramBot\Laravel\Telegram;
 
 use Longman\TelegramBot\Entities\Chat;
 use Longman\TelegramBot\Entities\Message;
diff --git a/src/TelegramServiceProvider.php b/src/TelegramServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tii\LaravelTelegramBot;
+namespace PhpTelegramBot\Laravel;
 
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\File;
@@ -9,18 +9,17 @@
 use Longman\TelegramBot\Request;
 use Longman\TelegramBot\Telegram;
 use Symfony\Component\Finder\Finder;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramCloseCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramDeleteWebhookCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramFetchCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramLogoutCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramPublishCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramSetWebhookCommand;
-use Tii\LaravelTelegramBot\Console\Commands\TelegramTunnelCommand;
-use Tii\LaravelTelegramBot\Console\Commands\MakeTelegramCommand;
-use Tii\LaravelTelegramBot\Factories\CallbackButton;
-use Tii\LaravelTelegramBot\Http\Middleware\TrustTelegramNetwork;
-use Tii\LaravelTelegramBot\Telegram\Commands\CallbackqueryCommand;
-use Tii\LaravelTelegramBot\Telegram\Commands\GenericmessageCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramCloseCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramDeleteWebhookCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramFetchCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramLogoutCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramPublishCommand;
+use PhpTelegramBot\Laravel\Console\Commands\TelegramSetWebhookCommand;
+use PhpTelegramBot\Laravel\Console\Commands\MakeTelegramCommand;
+use PhpTelegramBot\Laravel\Factories\CallbackButton;
+use PhpTelegramBot\Laravel\Http\Middleware\TrustTelegramNetwork;
+use PhpTelegramBot\Laravel\Telegram\Commands\CallbackqueryCommand;
+use PhpTelegramBot\Laravel\Telegram\Commands\GenericmessageCommand;
 
 class TelegramServiceProvider extends ServiceProvider
 {
@@ -117,7 +116,6 @@ protected function bootForConsole(): void
             TelegramLogoutCommand::class,
             TelegramPublishCommand::class,
             TelegramSetWebhookCommand::class,
-            TelegramTunnelCommand::class,
         ]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+ALTER TABLE `bot_user` ADD COLUMN `is_premium` tinyint(1) DEFAULT 0 COMMENT 'True, if this user is a Telegram Premium user' AFTER `language_code`;
	`2`	+ALTER TABLE `bot_user` ADD COLUMN `added_to_attachment_menu` tinyint(1) DEFAULT 0 COMMENT 'True, if this user added the bot to the attachment menu' AFTER `is_premium`;