PHP Type hints

Author: TiiFuchs

src/FluentEntity.php

@@ -16,12 +16,12 @@ public function __construct(array $data = [])
         $this->data = $data + $this->data;
     }
 
-    public static function make()
+    public static function make(): static
     {
         return new static;
     }
 
-    public function __call($name, $arguments)
+    public function __call($name, $arguments): self
     {
         $key = snake_case($name);
 
@@ -30,13 +30,12 @@ public function __call($name, $arguments)
         return $this;
     }
 
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return (object) $this->data;
     }
 
-    private function getDefault($key)
+    private function getDefault($key): mixed
     {
         return $this->defaults[$key] ?? null;
     }

src/InlineKeyboard/InlineKeyboardButton.php

@@ -7,7 +7,6 @@
 /**
  * @method self text(string $text)
  * @method self url(string $url)
- * @method self loginUrl(array $login_url)
  * @method self callbackData(string $callback_data)
  * @method self switchInlineQuery(string $switch_inline_query)
  * @method self switchInlineQueryCurrentChat(string $switch_inline_query_current_chat)
@@ -21,7 +20,7 @@ class InlineKeyboardButton extends Button
         'pay' => true,
     ];
 
-    public static function make(string $text = null)
+    public static function make(string $text = null): static
     {
         $data = [];
 
@@ -32,4 +31,17 @@ public static function make(string $text = null)
         return new static($data);
     }
 
+    public function loginUrl(array|string $login_url): self
+    {
+        if (! is_array($login_url)) {
+            $login_url = [
+                'url' => $login_url
+            ];
+        }
+
+        $this->data['login_url'] = $login_url;
+
+        return $this;
+    }
+
 }

src/KeyboardMarkup.php

@@ -28,7 +28,7 @@ public function __construct(array $data = [])
      * @param  Button[]  $buttons
      * @return $this
      */
-    public function row(array $buttons = [])
+    public function row(array $buttons = []): self
     {
         $keyboard = &$this->data[static::$keyboardFieldName];
 
@@ -53,7 +53,7 @@ public function row(array $buttons = [])
      * @param  Button[]  $buttons
      * @return $this
      */
-    public function stack(array $buttons)
+    public function stack(array $buttons): self
     {
         // Every button gets its own row
         foreach ($buttons as $button) {
@@ -69,7 +69,7 @@ public function stack(array $buttons)
      * @param  Button  $button
      * @return $this
      */
-    public function button(Button $button)
+    public function button(Button $button): self
     {
         $keyboard = &$this->data[static::$keyboardFieldName];
 

src/ReplyKeyboard/KeyboardButton.php

@@ -18,7 +18,7 @@ class KeyboardButton extends Button
         'request_poll'     => [],
     ];
 
-    public static function make(string $text = null)
+    public static function make(string $text = null): static
     {
         $data = [];
 

src/ReplyKeyboard/KeyboardButtonPollType.php

@@ -12,19 +12,19 @@ class KeyboardButtonPollType extends Button
 
     protected $data = [];
 
-    public static function any()
+    public static function any(): static
     {
         return new static();
     }
 
-    public static function quiz()
+    public static function quiz(): static
     {
         return new static([
             'type' => 'quiz'
         ]);
     }
 
-    public static function regular()
+    public static function regular(): static
     {
         return new static([
             'type' => 'regular'