Merge pull request #30 from tanhongit/test

Update exceptions

.gitignore

@@ -1,31 +1,22 @@
-/vendor
+vendor
 composer.lock
 composer.phar
 .DS_Store
-/node_modules
-/public/storage
-/storage/*.key
 Thumbs.db
-/bower_components
+bower_components
 
 .env
 .env.backup
 .idea
 .vscode
 
 .vagrant
-Homestead.json
-Homestead.yaml
 npm-debug.log
 
 .phpunit.cache
 .phpunit.result.cache
-/storage/.license
-/storage/fonts
-/storage/installing
-/storage/installed
-/storage/json
-/log
+storage
+log
 
 package-lock.json
 yarn.lock

src/Constants/NotificationConstant.php

@@ -4,12 +4,12 @@
 
 final class NotificationConstant
 {
-    // Separation between chat id pairs
+    /** @var string Separation between chat id pairs */
     public const CHAT_ID_PAIRS_SEPARATOR = ';';
 
-    // Separation between chat id and thread id
+    /** @var string Separation between chat id and thread id */
     public const CHAT_THREAD_ID_SEPARATOR = ':';
 
-    // Separation between thread id
+    /** @var string Separation between thread ids */
     public const THREAD_ID_SEPARATOR = ',';
 }

src/Exceptions/BotException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace CSlant\TelegramGitNotifier\Exceptions;
+
+use Exception;
+
+final class BotException extends TelegramGitNotifierException
+{
+    public static function editMessageText(Exception $exception): self
+    {
+        return new self('Error editing message text: ' . $exception->getMessage());
+    }
+
+    public static function editMessageReplyMarkup(Exception $exception): self
+    {
+        return new self('Error sending message: ' . $exception->getMessage());
+    }
+}

src/Exceptions/CallbackException.php

@@ -2,15 +2,12 @@
 
 namespace CSlant\TelegramGitNotifier\Exceptions;
 
+use Exception;
+
 final class CallbackException extends TelegramGitNotifierException
 {
-    public static function isEmpty(): self
-    {
-        return new self('Callback is empty');
-    }
-
-    public static function invalid(): self
+    public static function answer(Exception $exception): self
     {
-        return new self('Callback is invalid');
+        return new self('Error answering callback query: ' . $exception->getMessage());
     }
 }

src/Helpers/ConfigHelper.php

@@ -6,7 +6,7 @@
 use CSlant\TelegramGitNotifier\Exceptions\InvalidViewTemplateException;
 use Throwable;
 
-class ConfigHelper
+final class ConfigHelper
 {
     /**
      * @var array<string, mixed>

src/Interfaces/SettingInterface.php

@@ -3,6 +3,7 @@
 namespace CSlant\TelegramGitNotifier\Interfaces;
 
 use CSlant\TelegramGitNotifier\Constants\EventConstant;
+use CSlant\TelegramGitNotifier\Exceptions\BotException;
 use CSlant\TelegramGitNotifier\Exceptions\InvalidViewTemplateException;
 use CSlant\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
 use CSlant\TelegramGitNotifier\Trait\BotSettingTrait;
@@ -65,6 +66,7 @@ public function getEndKeyboard(string $platform, ?string $parentEvent = null): a
      *
      * @return void
      * @throws InvalidViewTemplateException
+     * @throws BotException
      * @see EventSettingTrait::eventHandle()
      */
     public function eventHandle(?string $callback = null, ?string $platform = null, string $platformFile = null): void;
@@ -90,6 +92,7 @@ public function getPlatformFromCallback(?string $callback, ?string $platform): s
      * @return bool
      * @see EventSettingTrait::sendSettingEventMessage()
      * @throws InvalidViewTemplateException
+     * @throws BotException
      */
     public function sendSettingEventMessage(string $platform, ?string $callback = null, ?string $view = null): bool;
 
@@ -113,6 +116,7 @@ public function getEventFromCallback(?string $callback): string;
      * @return bool
      * @see EventSettingTrait::handleEventWithActions()
      * @throws InvalidViewTemplateException
+     * @throws BotException
      */
     public function handleEventWithActions(
         string $event,
@@ -129,6 +133,7 @@ public function handleEventWithActions(
      *
      * @return void
      * @throws InvalidViewTemplateException
+     * @throws BotException
      * @see EventSettingTrait::handleEventUpdate()
      */
     public function handleEventUpdate(string $event, string $platform, string $platFormFile = null): void;
@@ -142,6 +147,7 @@ public function handleEventUpdate(string $event, string $platform, string $platF
      *
      * @return void
      * @throws InvalidViewTemplateException
+     * @throws BotException
      * @see EventSettingTrait::eventUpdateHandle()
      */
     public function eventUpdateHandle(string $event, string $platform, string $platFormFile = null): void;

src/Interfaces/Structures/AppInterface.php

@@ -2,6 +2,8 @@
 
 namespace CSlant\TelegramGitNotifier\Interfaces\Structures;
 
+use CSlant\TelegramGitNotifier\Exceptions\BotException;
+use CSlant\TelegramGitNotifier\Exceptions\CallbackException;
 use CSlant\TelegramGitNotifier\Exceptions\EntryNotFoundException;
 use CSlant\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
 
@@ -35,12 +37,14 @@ public function sendPhoto(string $photo = '', array $caption = []): void;
      * Send callback response to telegram (show alert)
      *
      * @param string|null $text
+     * @param array $options
      *
      * @return void
      * @throws MessageIsEmptyException
+     * @throws CallbackException
      * @see App::answerCallbackQuery()
      */
-    public function answerCallbackQuery(string $text = null): void;
+    public function answerCallbackQuery(string $text = null, array $options = []): void;
 
     /**
      * Edit message text and reply markup
@@ -49,6 +53,7 @@ public function answerCallbackQuery(string $text = null): void;
      * @param array $options
      *
      * @return void
+     * @throws BotException
      * @see App::editMessageText()
      */
     public function editMessageText(string $text = null, array $options = []): void;
@@ -59,6 +64,7 @@ public function editMessageText(string $text = null, array $options = []): void;
      * @param array $options
      *
      * @return void
+     * @throws BotException
      * @see App::editMessageReplyMarkup()
      */
     public function editMessageReplyMarkup(array $options = []): void;

src/Structures/App.php

@@ -2,6 +2,8 @@
 
 namespace CSlant\TelegramGitNotifier\Structures;
 
+use CSlant\TelegramGitNotifier\Exceptions\BotException;
+use CSlant\TelegramGitNotifier\Exceptions\CallbackException;
 use CSlant\TelegramGitNotifier\Exceptions\EntryNotFoundException;
 use CSlant\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
 use Exception;
@@ -76,7 +78,7 @@ public function answerCallbackQuery(string $text = null, array $options = []): v
             ], $options);
             $this->telegram->answerCallbackQuery($options);
         } catch (Exception $e) {
-            error_log("Error answering callback query: " . $e->getMessage());
+            throw CallbackException::answer($e);
         }
     }
 
@@ -91,7 +93,7 @@ public function editMessageText(
 
             $this->telegram->editMessageText($content);
         } catch (Exception $e) {
-            error_log($e->getMessage());
+            throw BotException::editMessageText($e);
         }
     }
 
@@ -102,7 +104,7 @@ public function editMessageReplyMarkup(array $options = []): void
                 $this->setCallbackContentMessage($options)
             );
         } catch (Exception $e) {
-            error_log($e->getMessage());
+            throw BotException::editMessageReplyMarkup($e);
         }
     }