fix: phpstan test errors

cslant · Oct 30, 2023 · 7b1d14e · 7b1d14e
1 parent 07b74e4
commit 7b1d14e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/src/Interfaces/Structures/AppInterface.php b/src/Interfaces/Structures/AppInterface.php
@@ -10,14 +10,14 @@ interface AppInterface
     /**
      * Send a message to telegram
      *
-     * @param string $message
+     * @param string|null $message
      * @param array $options
      *
      * @return void
      * @throws MessageIsEmptyException
      * @see App::sendMessage()
      */
-    public function sendMessage(string $message = '', array $options = []): void;
+    public function sendMessage(?string $message = '', array $options = []): void;
 
     /**
      * Send a photo to telegram

diff --git a/src/Structures/App.php b/src/Structures/App.php
@@ -27,7 +27,7 @@ private function createTelegramBaseContent(): array
         ];
     }
 
-    public function sendMessage(string $message = '', array $options = []): void
+    public function sendMessage(?string $message = '', array $options = []): void
     {
         if (empty($message)) {
             throw MessageIsEmptyException::create();

diff --git a/src/Structures/Notification.php b/src/Structures/Notification.php
@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Exception\GuzzleException;
 use LbilTech\TelegramGitNotifier\Constants\EventConstant;
+use LbilTech\TelegramGitNotifier\Exceptions\MessageIsEmptyException;
 use LbilTech\TelegramGitNotifier\Exceptions\SendNotificationException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -30,11 +31,18 @@ public function accessDenied(
 
     public function setPayload(Request $request, string $event)
     {
+        $content = null;
+
         if ($this->event->platform === 'gitlab') {
-            $this->payload = json_decode($request->getContent());
+            $content = $request->getContent();
         } elseif ($this->event->platform === EventConstant::DEFAULT_PLATFORM) {
-            $this->payload = json_decode($request->request->get('payload'));
+            $content = $request->request->get('payload');
+        }
+
+        if (is_string($content)) {
+            $this->payload = json_decode($content);
         }
+
         $this->setMessage($event);
 
         return $this->payload;
@@ -46,6 +54,7 @@ public function setPayload(Request $request, string $event)
      * @param string $typeEvent
      *
      * @return void
+     * @throws MessageIsEmptyException
      */
     private function setMessage(string $typeEvent): void
     {
@@ -56,10 +65,16 @@ private function setMessage(string $typeEvent): void
             ? "events.{$this->event->platform}.{$event}.default"
             : "events.{$this->event->platform}.{$event}.{$action}";
 
-        $this->message = view($viewTemplate, [
+        $viewResult = view($viewTemplate, [
             'payload' => $this->payload,
             'event'   => tgn_convert_event_name($typeEvent),
         ]);
+
+        if ($viewResult === null) {
+            throw MessageIsEmptyException::create();
+        }
+
+        $this->message = $viewResult;
     }
 
     public function sendNotify(string $message = null, array $options = []): bool

diff --git a/src/Trait/EventSettingTrait.php b/src/Trait/EventSettingTrait.php
@@ -157,6 +157,10 @@ public function sendSettingEventMessage(
 
     public function getEventFromCallback(?string $callback): string
     {
+        if (!$callback) {
+            return '';
+        }
+
         return str_replace([
             EventConstant::EVENT_PREFIX,
             EventConstant::GITHUB_EVENT_SEPARATOR,