From f236d40854600e037b000f6fff39f77ada74e6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 11:47:44 +0300 Subject: [PATCH 1/7] add webhook artisan command --- src/Laravel/Commands/WebhookCommand.php | 63 +++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/Laravel/Commands/WebhookCommand.php diff --git a/src/Laravel/Commands/WebhookCommand.php b/src/Laravel/Commands/WebhookCommand.php new file mode 100644 index 0000000..c27af33 --- /dev/null +++ b/src/Laravel/Commands/WebhookCommand.php @@ -0,0 +1,63 @@ +$telegramBot = $telegramBot; + } + + public function handle() + { + $webhook = $this->argument('url'); + $delete = $this->option('delete'); + + if (!($webhook && $delete)) { + $this->error("Not enough arguments!"); + $this->error("php artisan telegram:webhook {url?} {--delete}"); + return; + } + + if ($delete) { + try { + $this->telegramBot->deleteWebhook(); + $this->info('Webhook deleted succesfully!'); + } catch (TelegramException $e) { + $this->error("Couldn't delete webhook"); + $this->error($e->getMessage()); + return; + } + } + + + if ($webhook) { + try { + $this->telegramBot->setWebhook($webhook);; + $this->info('Webhook set succesfully!'); + } catch (TelegramException $e) { + $this->error("Couldn't set webhook"); + $this->error($e->getMessage()); + return; + } + + } + + $this->info('All done!'); + } +} From a6a70b043c90000924bb4a1f8128cfd9854725eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 11:50:33 +0300 Subject: [PATCH 2/7] register command --- src/Laravel/ServiceProvider.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Laravel/ServiceProvider.php b/src/Laravel/ServiceProvider.php index d549a54..2d55760 100644 --- a/src/Laravel/ServiceProvider.php +++ b/src/Laravel/ServiceProvider.php @@ -13,6 +13,7 @@ namespace PhpTelegramBot\Laravel; use Illuminate\Support\ServiceProvider as LaravelServiceProvider; +use PhpTelegramBot\Laravel\Commands\WebhookCommand; class ServiceProvider extends LaravelServiceProvider { @@ -92,6 +93,13 @@ public function register() return $bot; }); + + if ($this->app->runningInConsole()) { + $this->commands([ + WebhookCommand::class + ]); + } + } /** From 210d54cda837bd517986b8bd0425c3b77452ce1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 11:52:30 +0300 Subject: [PATCH 3/7] fix typo --- src/Laravel/Commands/WebhookCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Laravel/Commands/WebhookCommand.php b/src/Laravel/Commands/WebhookCommand.php index c27af33..6a0c826 100644 --- a/src/Laravel/Commands/WebhookCommand.php +++ b/src/Laravel/Commands/WebhookCommand.php @@ -20,7 +20,7 @@ public function __construct(PhpTelegramBotContract $telegramBot) { parent::__construct(); - $this->$telegramBot = $telegramBot; + $this->telegramBot = $telegramBot; } public function handle() From 9393b7d9887f56510ac59f3d28964a1914fd2bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 11:54:17 +0300 Subject: [PATCH 4/7] fix logical mistake --- src/Laravel/Commands/WebhookCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Laravel/Commands/WebhookCommand.php b/src/Laravel/Commands/WebhookCommand.php index 6a0c826..cea2b9b 100644 --- a/src/Laravel/Commands/WebhookCommand.php +++ b/src/Laravel/Commands/WebhookCommand.php @@ -28,7 +28,7 @@ public function handle() $webhook = $this->argument('url'); $delete = $this->option('delete'); - if (!($webhook && $delete)) { + if (!($webhook || $delete)) { $this->error("Not enough arguments!"); $this->error("php artisan telegram:webhook {url?} {--delete}"); return; From 96969a7db69cfda2eb010196500d4eb84c40ffc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 12:16:25 +0300 Subject: [PATCH 5/7] fix for PSR-2 coding standard --- .phpunit.result.cache | 1 + src/Laravel/Commands/WebhookCommand.php | 15 ++++++++------- src/Laravel/ServiceProvider.php | 3 +-- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 .phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 0000000..191b754 --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +C:37:"PHPUnit\Runner\DefaultTestResultCache":368:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:5:{s:52:"Tests\Unit\ServiceProviderTest::config_is_injectable";d:0.167;s:54:"Tests\Unit\ServiceProviderTest::database_is_injectable";d:0.009;s:40:"Tests\Unit\ServiceProviderTest::provides";d:0.007;s:54:"Tests\Unit\ServiceProviderTest::testIsAServiceProvider";d:0.009;s:44:"Tests\Unit\ServiceProviderTest::testProvides";d:0.006;}}} \ No newline at end of file diff --git a/src/Laravel/Commands/WebhookCommand.php b/src/Laravel/Commands/WebhookCommand.php index cea2b9b..9705b5c 100644 --- a/src/Laravel/Commands/WebhookCommand.php +++ b/src/Laravel/Commands/WebhookCommand.php @@ -1,10 +1,12 @@ argument('url'); $delete = $this->option('delete'); - if (!($webhook || $delete)) { - $this->error("Not enough arguments!"); - $this->error("php artisan telegram:webhook {url?} {--delete}"); + if (! ($webhook || $delete)) { + $this->error('Not enough arguments!'); + $this->error('php artisan telegram:webhook {url?} {--delete}'); return; } @@ -48,14 +50,13 @@ public function handle() if ($webhook) { try { - $this->telegramBot->setWebhook($webhook);; + $this->telegramBot->setWebhook($webhook); $this->info('Webhook set succesfully!'); } catch (TelegramException $e) { $this->error("Couldn't set webhook"); $this->error($e->getMessage()); return; } - } $this->info('All done!'); diff --git a/src/Laravel/ServiceProvider.php b/src/Laravel/ServiceProvider.php index 2d55760..6e9dbbe 100644 --- a/src/Laravel/ServiceProvider.php +++ b/src/Laravel/ServiceProvider.php @@ -96,10 +96,9 @@ public function register() if ($this->app->runningInConsole()) { $this->commands([ - WebhookCommand::class + WebhookCommand::class, ]); } - } /** From f4dea4c0ade592c34e2f65cc4331669537ee3316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 12:18:02 +0300 Subject: [PATCH 6/7] fix argument description --- src/Laravel/Commands/WebhookCommand.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Laravel/Commands/WebhookCommand.php b/src/Laravel/Commands/WebhookCommand.php index 9705b5c..17e38f2 100644 --- a/src/Laravel/Commands/WebhookCommand.php +++ b/src/Laravel/Commands/WebhookCommand.php @@ -10,8 +10,8 @@ class WebhookCommand extends Command { - protected $signature = 'telegram:webhook {url?} - {--delete : Force the operation to run when in production}'; + protected $signature = 'telegram:webhook {webhook?} + {--delete : Delete webhook}'; protected $description = 'Set or delete webhook for Telegram bot'; @@ -27,12 +27,12 @@ public function __construct(PhpTelegramBotContract $telegramBot) public function handle() { - $webhook = $this->argument('url'); + $webhook = $this->argument('webhook'); $delete = $this->option('delete'); if (! ($webhook || $delete)) { $this->error('Not enough arguments!'); - $this->error('php artisan telegram:webhook {url?} {--delete}'); + $this->error('php artisan telegram:webhook {webhook?} {--delete}'); return; } From 4d43abd6de0c9df8493bdd14d34ccf0b7c8d654e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enes=20C=CC=A7ak=C4=B1r?= Date: Sat, 8 Feb 2020 12:19:13 +0300 Subject: [PATCH 7/7] remove phpunit cache --- .phpunit.result.cache | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 191b754..0000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -C:37:"PHPUnit\Runner\DefaultTestResultCache":368:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:5:{s:52:"Tests\Unit\ServiceProviderTest::config_is_injectable";d:0.167;s:54:"Tests\Unit\ServiceProviderTest::database_is_injectable";d:0.009;s:40:"Tests\Unit\ServiceProviderTest::provides";d:0.007;s:54:"Tests\Unit\ServiceProviderTest::testIsAServiceProvider";d:0.009;s:44:"Tests\Unit\ServiceProviderTest::testProvides";d:0.006;}}} \ No newline at end of file