Update for Laravel 10 and upcoming php-telegram-bot version

Author: TiiFuchs

composer.json

@@ -18,8 +18,8 @@
     "homepage": "https://github.com/php-telegram-bot/laravel",
     "keywords": ["laravel", "telegram", "bot"],
     "require": {
-        "illuminate/support": "~7|~8|~9",
-        "longman/telegram-bot": "^0.80",
+        "illuminate/support": "~7|~8|~9|~10",
+        "longman/telegram-bot": "^0.81",
         "ext-pcntl": "*"
     },
     "require-dev": {
@@ -32,6 +32,9 @@
         }
     },
     "extra": {
+        "branch-alias": {
+            "dev-main": "2.1.x-dev"
+        },
         "laravel": {
             "providers": [
               "PhpTelegramBot\\Laravel\\TelegramServiceProvider"
@@ -41,5 +44,7 @@
                 "Telegram": "PhpTelegramBot\\Laravel\\Facades\\Telegram"
             }
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

database/migrations/2023_05-07_101600_update_to_0.81.0.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration {
+    public function up()
+    {
+        DB::unprepared(file_get_contents(__DIR__ . '/sql/0.80.0-0.81.0.sql'));
+    }
+
+    public function down()
+    {
+        //
+    }
+};

database/migrations/sql/0.80.0-0.81.0.sql

@@ -0,0 +1,8 @@
+ALTER TABLE `bot_message`
+    ADD COLUMN `has_media_spoiler`            TINYINT(1) DEFAULT 0 COMMENT 'True, if the message media is covered by a spoiler animation' AFTER `caption`,
+    ADD COLUMN `write_access_allowed`         TEXT       DEFAULT NULL COMMENT 'Service message: the user allowed the bot added to the attachment menu to write messages' AFTER `connected_website`,
+    ADD COLUMN `forum_topic_edited`           TEXT       DEFAULT NULL COMMENT 'Service message: forum topic edited' AFTER `forum_topic_created`,
+    ADD COLUMN `general_forum_topic_hidden`   TEXT       DEFAULT NULL COMMENT 'Service message: the General forum topic hidden' AFTER `forum_topic_reopened`,
+    ADD COLUMN `general_forum_topic_unhidden` TEXT       DEFAULT NULL COMMENT 'Service message: the General forum topic unhidden' AFTER `general_forum_topic_hidden`,
+    ADD COLUMN `user_shared`                  TEXT       DEFAULT NULL COMMENT 'Optional. Service message: a user was shared with the bot' AFTER `successful_payment`,
+    ADD COLUMN `chat_shared`                  TEXT       DEFAULT NULL COMMENT 'Optional. Service message: a chat was shared with the bot' AFTER `user_shared`;

readme.md

@@ -10,6 +10,38 @@ Install this package through Composer. Run this command in your project's termin
 ``` bash
 composer require php-telegram-bot/laravel
 ```
+
+Execute the following command to publish the folder structure to your Laravel application:
+```bash
+php artisan telegram:publish
+```
+This also includes a dummy `/start` command to give you a quick start.
+
+Since we're using the database part of php-telegram-bot you should run the migrations so the database schema gets installed:
+```bash
+php artisan migrate
+```
+
+And add the following lines to your .env file:
+```dotenv
+TELEGRAM_API_TOKEN=
+TELEGRAM_BOT_USERNAME=
+TELEGRAM_API_URL=
+TELEGRAM_ADMINS=
+```
+
+`TELEGRAM_API_TOKEN` and `TELEGRAM_BOT_USERNAME` should be filled with the corresponding data from [@BotFather](https://t.me/BotFather)
+
+`TELEGRAM_API_URL` is optional and can be filled with the URL to your  [custom Bot API Server](https://core.telegram.org/bots/api#using-a-local-bot-api-server) if you want to use one.
+
+`TELEGRAM_ADMINS` is optional and a comma-separated list of Telegram User IDs that gets passed to the `enableAdmins` command of php-telegram-bot to enable admin commands for those users.
+
+After that you can run `php artisan telegram:set-webhook` if your development server is reachable from the outside or you're using a custom bot api server. 
+
+Or `php artisan telegram:fetch` to start fetching your updates via polling.
+
+⚠️ Be aware that you have to cancel and restart the `telegram:fetch` command, if you change your code.
+
 ## Usage
 For further basic configuration of this Laravel package you do not need to create any configuration files.
 

src/Console/Commands/TelegramFetchCommand.php

@@ -39,7 +39,7 @@ public function handle(Telegram $bot)
             $options['allowed_updates'] = Str::of($allowedUpdates)->explode(',');
         }
 
-        $this->info("Start fetching updates...\n<comment>(Exit with Ctrl + C.)</comment>");
+        $this->info("Start fetching updates...\n<comment>(Exit with Ctrl + C)</comment>");
 
         if ($this->childPid = pcntl_fork()) {
             // Parent process