fix: Crashpad received a malformed value as an update (#11)

telegram-bot-php · Jun 24, 2024 · c2c621c · c2c621c
1 parent 5411909
commit c2c621c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/CrashPad.php b/src/CrashPad.php
@@ -25,7 +25,7 @@ public static function enableCrashHandler(): void
     {
         $handler = function (Throwable $throwable) {
             if (Telegram::getAdminId() !== -1) {
-                $input = getenv('TG_CURRENT_UPDATE') ?? Telegram::getInput();
+                $input = Telegram::getInput();
                 CrashPad::sendCrash(Telegram::getAdminId(), $throwable, $input);
             }
 

diff --git a/src/Entities/InlineKeyboardButton.php b/src/Entities/InlineKeyboardButton.php
@@ -35,12 +35,12 @@ class InlineKeyboardButton extends KeyboardButton
     /**
      * Creates instance of InlineKeyboardButton
      *
-     * @param string $string
+     * @param string|null $label
      * @return InlineKeyboardButton
      */
-    public static function make(string $string): InlineKeyboardButton
+    public static function make(string|null $label = null): InlineKeyboardButton
     {
-        return new self($string);
+        return new self($label);
     }
 
     /**

diff --git a/src/Entities/KeyboardButton.php b/src/Entities/KeyboardButton.php
@@ -42,18 +42,18 @@ public function __construct($data)
             $data = ['text' => $data];
         }
 
-        parent::__construct($data);
+        parent::__construct($data ?? []);
     }
 
     /**
      * Creates instance of KeyboardButton
      *
-     * @param string $string
+     * @param string|null $label
      * @return KeyboardButton
      */
-    public static function make(string $string): KeyboardButton
+    public static function make(string|null $label = null): KeyboardButton
     {
-        return new self($string);
+        return new self($label);
     }
 
     /**

diff --git a/src/Telegram.php b/src/Telegram.php
@@ -127,7 +127,17 @@ public static function getUpdate(): Update|null
      */
     public static function getInput(): string|null
     {
-        return file_get_contents('php://input') ?? null;
+        $input = file_get_contents('php://input');
+        if (!empty($input)) {
+            return $input;
+        }
+
+        $env = getenv('TG_CURRENT_UPDATE');
+        if (!empty($env) && is_string($env)) {
+            return $env;
+        }
+
+        return null;
     }
 
     /**

diff --git a/tests/KeyboardTest.php b/tests/KeyboardTest.php
@@ -118,4 +118,4 @@ public function test_create_for_answer_query(): void
         $this->assertEquals(json_encode($raw_data), $result['options']['query']['reply_markup']);
     }
 
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,4 +118,4 @@ public function test_create_for_answer_query(): void @@
             $this->assertEquals(json_encode($raw_data), $result['options']['query']['reply_markup']);
         }
-    }
+    }