Merge pull request #672 from defstudio/php-8.4

support for php 8.4
defstudio · Nov 26, 2024 · b3a1f9a · b3a1f9a
2 parents 267a5e7 + 8327551
commit b3a1f9a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/DTO/InlineQueryResultArticle.php b/src/DTO/InlineQueryResultArticle.php
@@ -20,7 +20,7 @@ class InlineQueryResultArticle extends InlineQueryResult
     protected bool|null $hideUrl = null;
     protected string|null $parseMode = null;
 
-    public static function make(string $id, string $title, string $message = null): InlineQueryResultArticle
+    public static function make(string $id, string $title, ?string $message = null): InlineQueryResultArticle
     {
         $result = new InlineQueryResultArticle();
         $result->id = $id;

diff --git a/src/Handlers/WebhookHandler.php b/src/Handlers/WebhookHandler.php
@@ -14,6 +14,7 @@
 use DefStudio\Telegraph\DTO\InlineQuery;
 use DefStudio\Telegraph\DTO\Message;
 use DefStudio\Telegraph\DTO\Reaction;
+use DefStudio\Telegraph\DTO\ReactionType;
 use DefStudio\Telegraph\DTO\User;
 use DefStudio\Telegraph\Exceptions\TelegramWebhookException;
 use DefStudio\Telegraph\Keyboard\Keyboard;
@@ -44,7 +45,7 @@ abstract class WebhookHandler
     protected ChatJoinRequest|null $chatJoinRequest = null;
 
     /**
-     * @var Collection<string, string>|Collection<int, array<string, string>>
+     * @var Collection<string, string>|Collection<int, array<string, string>>|Collection<array-key, ReactionType>
      */
     protected Collection $data;
 

diff --git a/src/Keyboard/Keyboard.php b/src/Keyboard/Keyboard.php
@@ -85,11 +85,11 @@ public static function fromArray(array $arrayKeyboard): Keyboard
                 }
 
                 if (array_key_exists('switch_inline_query', $button)) {
-                    $rowButton = $rowButton->switchInlineQuery($button['switch_inline_query'] ?? '');
+                    $rowButton = $rowButton->switchInlineQuery($button['switch_inline_query']);
                 }
 
                 if (array_key_exists('switch_inline_query_current_chat', $button)) {
-                    $rowButton = $rowButton->switchInlineQuery($button['switch_inline_query_current_chat'] ?? '')->currentChat();
+                    $rowButton = $rowButton->switchInlineQuery($button['switch_inline_query_current_chat'])->currentChat();
                 }
 
                 $rowButtons[] = $rowButton;

diff --git a/src/Telegraph.php b/src/Telegraph.php
@@ -134,7 +134,7 @@ public function send(): TelegraphResponse
         return TelegraphResponse::fromResponse($response);
     }
 
-    public function dispatch(string $queue = null): PendingDispatch
+    public function dispatch(?string $queue = null): PendingDispatch
     {
         return $this->dispatchRequestToTelegram($queue);
     }