Add more native types

Author: AydinHassan

src/Dialogue/CancellableConfirm.php

@@ -12,10 +12,7 @@
  */
 class CancellableConfirm extends Dialogue
 {
-    /**
-     * @var bool
-     */
-    private $confirm = true;
+    private bool $confirm = true;
 
     /**
      * Display confirmation with a button with the given text

src/Dialogue/Dialogue.php

@@ -14,40 +14,19 @@
  */
 abstract class Dialogue
 {
-    /**
-     * @var MenuStyle
-     */
-    protected $style;
+    protected MenuStyle $style;
 
-    /**
-     * @var CliMenu
-     */
-    protected $parentMenu;
+    protected CliMenu $parentMenu;
 
-    /**
-     * @var Terminal
-     */
-    protected $terminal;
+    protected Terminal $terminal;
 
-    /**
-     * @var string $text
-     */
-    protected $text;
+    protected string $text;
 
-    /**
-     * @var bool $cancellable
-     */
-    protected $cancellable;
+    protected bool $cancellable;
 
-    /**
-     * @var int
-     */
-    protected $x;
+    protected int $x;
 
-    /**
-     * @var int
-     */
-    protected $y;
+    protected int $y;
 
     public function __construct(
         CliMenu $parentMenu,

src/Input/InputResult.php

@@ -9,10 +9,7 @@
  */
 class InputResult
 {
-    /**
-     * @var string
-     */
-    private $input;
+    private string $input;
 
     public function __construct(string $input)
     {

src/Input/Number.php

@@ -12,35 +12,17 @@
  */
 class Number implements Input
 {
-    /**
-     * @var InputIO
-     */
-    private $inputIO;
-
-    /**
-     * @var string
-     */
-    private $promptText = 'Enter a number:';
-
-    /**
-     * @var string
-     */
-    private $validationFailedText = 'Not a valid number, try again';
-
-    /**
-     * @var string
-     */
-    private $placeholderText = '';
-
-    /**
-     * @var null|callable
-     */
-    private $validator;
-
-    /**
-     * @var MenuStyle
-     */
-    private $style;
+    private InputIO $inputIO;
+
+    private string $promptText = 'Enter a number:';
+
+    private string $validationFailedText = 'Not a valid number, try again';
+
+    private string $placeholderText = '';
+
+    private \Closure|null $validator = null;
+
+    private MenuStyle $style;
 
     public function __construct(InputIO $inputIO, MenuStyle $style)
     {
@@ -86,7 +68,11 @@ public function getPlaceholderText(): string
 
     public function setValidator(callable $validator): Input
     {
-        $this->validator = $validator;
+        if ($validator instanceof \Closure) {
+            $validator = $validator->bindTo($this);
+        }
+
+        $this->validator = $validator(...);
 
         return $this;
     }
@@ -109,10 +95,6 @@ public function validate(string $input): bool
         if ($this->validator) {
             $validator = $this->validator;
 
-            if ($validator instanceof \Closure) {
-                $validator = $validator->bindTo($this);
-            }
-
             return $validator($input);
         }
 

src/Input/Password.php

@@ -11,40 +11,19 @@
  */
 class Password implements Input
 {
-    /**
-     * @var InputIO
-     */
-    private $inputIO;
-
-    /**
-     * @var string
-     */
-    private $promptText = 'Enter password:';
-
-    /**
-     * @var string
-     */
-    private $validationFailedText = 'Invalid password, try again';
-
-    /**
-     * @var string
-     */
-    private $placeholderText = '';
-
-    /**
-     * @var null|callable
-     */
-    private $validator;
-
-    /**
-     * @var MenuStyle
-     */
-    private $style;
-
-    /**
-     * @var int
-     */
-    private $passwordLength = 16;
+    private InputIO $inputIO;
+
+    private string $promptText = 'Enter password:';
+
+    private string $validationFailedText = 'Invalid password, try again';
+
+    private string $placeholderText = '';
+
+    private \Closure|null $validator = null;
+
+    private MenuStyle $style;
+
+    private int $passwordLength = 16;
 
     public function __construct(InputIO $inputIO, MenuStyle $style)
     {
@@ -90,7 +69,11 @@ public function getPlaceholderText(): string
 
     public function setValidator(callable $validator): Input
     {
-        $this->validator = $validator;
+        if ($validator instanceof \Closure) {
+            $validator = $validator->bindTo($this);
+        }
+
+        $this->validator = $validator(...);
 
         return $this;
     }
@@ -105,10 +88,6 @@ public function validate(string $input): bool
         if ($this->validator) {
             $validator = $this->validator;
 
-            if ($validator instanceof \Closure) {
-                $validator = $validator->bindTo($this);
-            }
-
             return $validator($input);
         }
 

src/Input/Text.php

@@ -11,35 +11,17 @@
  */
 class Text implements Input
 {
-    /**
-     * @var InputIO
-     */
-    private $inputIO;
-
-    /**
-     * @var string
-     */
-    private $promptText = 'Enter text:';
-
-    /**
-     * @var string
-     */
-    private $validationFailedText = 'Invalid, try again';
-
-    /**
-     * @var string
-     */
-    private $placeholderText = '';
-
-    /**
-     * @var null|callable
-     */
-    private $validator;
-
-    /**
-     * @var MenuStyle
-     */
-    private $style;
+    private InputIO $inputIO;
+
+    private string $promptText = 'Enter text:';
+
+    private string $validationFailedText = 'Invalid, try again';
+
+    private string $placeholderText = '';
+
+    private \Closure|null $validator = null;
+
+    private MenuStyle $style;
 
     public function __construct(InputIO $inputIO, MenuStyle $style)
     {
@@ -85,7 +67,11 @@ public function getPlaceholderText(): string
 
     public function setValidator(callable $validator): Input
     {
-        $this->validator = $validator;
+        if ($validator instanceof \Closure) {
+            $validator = $validator->bindTo($this);
+        }
+
+        $this->validator = $validator(...);
 
         return $this;
     }
@@ -100,10 +86,6 @@ public function validate(string $input): bool
         if ($this->validator) {
             $validator = $this->validator;
 
-            if ($validator instanceof \Closure) {
-                $validator = $validator->bindTo($this);
-            }
-
             return $validator($input);
         }
 

src/MenuItem/AsciiArtItem.php

@@ -21,30 +21,15 @@ class AsciiArtItem implements MenuItemInterface
     public const POSITION_LEFT   = 'left';
     public const POSITION_RIGHT  = 'right';
 
-    /**
-     * @var string
-     */
-    private $text;
+    private string $text;
 
-    /**
-     * @var string
-     */
-    private $position;
+    private string $position;
 
-    /**
-     * @var string
-     */
-    private $alternateText;
+    private string$alternateText;
 
-    /**
-     * @var int
-     */
-    private $artLength;
+    private int $artLength;
 
-    /**
-     * @var DefaultStyle
-     */
-    private $style;
+    private DefaultStyle $style;
 
     public function __construct(string $text, string $position = self::POSITION_CENTER, string $alt = '')
     {

src/MenuItem/CheckboxItem.php

@@ -14,34 +14,20 @@ class CheckboxItem implements MenuItemInterface
     /**
      * @var string
      */
-    private $text;
+    private string $text;
 
-    /**
-     * @var callable
-     */
-    private $selectAction;
+    private \Closure $selectAction;
 
-    /**
-     * @var bool
-     */
-    private $showItemExtra;
+    private bool $showItemExtra;
 
-    /**
-     * @var bool
-     */
-    private $disabled;
+    private bool $disabled;
 
     /**
      * The current checkbox state
-     *
-     * @var bool
      */
-    private $checked = false;
+    private bool $checked = false;
 
-    /**
-     * @var CheckboxStyle
-     */
-    private $style;
+    private CheckboxStyle $style;
 
     public function __construct(
         string $text,
@@ -50,7 +36,7 @@ public function __construct(
         bool $disabled = false
     ) {
         $this->text = $text;
-        $this->selectAction = $selectAction;
+        $this->selectAction = $selectAction(...);
         $this->showItemExtra = $showItemExtra;
         $this->disabled = $disabled;