Merge pull request #284 from zuuperman/master

AydinHassan · web-flow · commit 328e64a76504 · 2025-07-29T15:29:56.000+02:00
diff --git a/src/Builder/CliMenuBuilder.php b/src/Builder/CliMenuBuilder.php
@@ -93,7 +93,7 @@ class CliMenuBuilder
      */
     private $subMenu = false;
 
-    public function __construct(Terminal $terminal = null)
+    public function __construct(?Terminal $terminal = null)
     {
         $this->terminal = $terminal ?? TerminalFactory::fromSystem();
         $this->style    = new MenuStyle($this->terminal);
@@ -249,7 +249,7 @@ public function addSubMenuFromBuilder(string $text, CliMenuBuilder $builder) : s
         return $this;
     }
 
-    public function enableAutoShortcuts(string $regex = null) : self
+    public function enableAutoShortcuts(?string $regex = null) : self
     {
         $this->autoShortcuts = true;
 
@@ -373,14 +373,14 @@ public function setExitButtonText(string $exitButtonText) : self
         return $this;
     }
 
-    public function setBackgroundColour(string $colour, string $fallback = null) : self
+    public function setBackgroundColour(string $colour, ?string $fallback = null) : self
     {
         $this->style->setBg($colour, $fallback);
 
         return $this;
     }
 
-    public function setForegroundColour(string $colour, string $fallback = null) : self
+    public function setForegroundColour(string $colour, ?string $fallback = null) : self
     {
         $this->style->setFg($colour, $fallback);
 
@@ -394,7 +394,7 @@ public function setWidth(int $width) : self
         return $this;
     }
 
-    public function setPadding(int $topBottom, int $leftRight = null) : self
+    public function setPadding(int $topBottom, ?int $leftRight = null) : self
     {
         $this->style->setPadding($topBottom, $leftRight);
 
@@ -452,7 +452,7 @@ public function setTitleSeparator(string $separator) : self
      * @param int|string|null $bottom
      * @param int|string|null $left
      */
-    public function setBorder(int $top, $right = null, $bottom = null, $left = null, string $colour = null) : self
+    public function setBorder(int $top, $right = null, $bottom = null, $left = null, ?string $colour = null) : self
     {
         $this->style->setBorder($top, $right, $bottom, $left, $colour);
 
@@ -487,7 +487,7 @@ public function setBorderLeftWidth(int $width) : self
         return $this;
     }
 
-    public function setBorderColour(string $colour, string $fallback = null) : self
+    public function setBorderColour(string $colour, ?string $fallback = null) : self
     {
         $this->style->setBorderColour($colour, $fallback);
 
diff --git a/src/Builder/SplitItemBuilder.php b/src/Builder/SplitItemBuilder.php
@@ -144,7 +144,7 @@ public function setGutter(int $gutter) : self
         return $this;
     }
 
-    public function enableAutoShortcuts(string $regex = null) : self
+    public function enableAutoShortcuts(?string $regex = null) : self
     {
         $this->autoShortcuts = true;
 
diff --git a/src/CliMenu.php b/src/CliMenu.php
@@ -99,8 +99,8 @@ class CliMenu
     public function __construct(
         ?string $title,
         array $items,
-        Terminal $terminal = null,
-        MenuStyle $style = null
+        ?Terminal $terminal = null,
+        ?MenuStyle $style = null
     ) {
         $this->title           = $title;
         $this->items           = $items;
@@ -696,7 +696,7 @@ public function getCurrentFrame() : Frame
         return $this->currentFrame;
     }
 
-    public function flash(string $text, MenuStyle $style = null) : Flash
+    public function flash(string $text, ?MenuStyle $style = null) : Flash
     {
         $this->guardSingleLine($text);
 
@@ -707,7 +707,7 @@ public function flash(string $text, MenuStyle $style = null) : Flash
         return new Flash($this, $style, $this->terminal, $text);
     }
 
-    public function confirm(string $text, MenuStyle $style = null) : Confirm
+    public function confirm(string $text, ?MenuStyle $style = null) : Confirm
     {
         $this->guardSingleLine($text);
 
@@ -718,7 +718,7 @@ public function confirm(string $text, MenuStyle $style = null) : Confirm
         return new Confirm($this, $style, $this->terminal, $text);
     }
 
-    public function cancellableConfirm(string $text, MenuStyle $style = null) : CancellableConfirm
+    public function cancellableConfirm(string $text, ?MenuStyle $style = null) : CancellableConfirm
     {
         $this->guardSingleLine($text);
 
@@ -729,7 +729,7 @@ public function cancellableConfirm(string $text, MenuStyle $style = null) : Canc
         return new CancellableConfirm($this, $style, $this->terminal, $text);
     }
 
-    public function askNumber(MenuStyle $style = null) : Number
+    public function askNumber(?MenuStyle $style = null) : Number
     {
         $this->assertOpen();
 
@@ -740,7 +740,7 @@ public function askNumber(MenuStyle $style = null) : Number
         return new Number(new InputIO($this, $this->terminal), $style);
     }
 
-    public function askText(MenuStyle $style = null) : Text
+    public function askText(?MenuStyle $style = null) : Text
     {
         $this->assertOpen();
 
@@ -751,7 +751,7 @@ public function askText(MenuStyle $style = null) : Text
         return new Text(new InputIO($this, $this->terminal), $style);
     }
 
-    public function askPassword(MenuStyle $style = null) : Password
+    public function askPassword(?MenuStyle $style = null) : Password
     {
         $this->assertOpen();
 
diff --git a/src/Dialogue/Dialogue.php b/src/Dialogue/Dialogue.php
@@ -108,7 +108,7 @@ protected function emptyRow() : void
     /**
      * Write some text at a particular column
      */
-    protected function write(string $text, int $column = null) : void
+    protected function write(string $text, ?int $column = null) : void
     {
         $this->terminal->moveCursorToColumn($column ?: $this->x);
         $this->terminal->write($text);
diff --git a/src/MenuStyle.php b/src/MenuStyle.php
@@ -227,7 +227,7 @@ class MenuStyle
     /**
      * Initialise style
      */
-    public function __construct(Terminal $terminal = null)
+    public function __construct(?Terminal $terminal = null)
     {
         $this->terminal = $terminal ?: TerminalFactory::fromSystem();
 
@@ -401,7 +401,7 @@ public function getFg() : string
         return $this->fg;
     }
 
-    public function setFg(string $fg, string $fallback = null) : self
+    public function setFg(string $fg, ?string $fallback = null) : self
     {
         $this->fg = ColourUtil::validateColour(
             $this->terminal,
@@ -418,7 +418,7 @@ public function getBg() : string
         return $this->bg;
     }
 
-    public function setBg(string $bg, string $fallback = null) : self
+    public function setBg(string $bg, ?string $fallback = null) : self
     {
         $this->bg = ColourUtil::validateColour(
             $this->terminal,
@@ -522,7 +522,7 @@ public function getPaddingTopBottomRows() : array
         return $this->paddingTopBottomRows;
     }
 
-    public function setPadding(int $topBottom, int $leftRight = null) : self
+    public function setPadding(int $topBottom, ?int $leftRight = null) : self
     {
         if ($leftRight === null) {
             $leftRight = $topBottom;
@@ -700,7 +700,7 @@ public function setBorder(
         $rightWidth = null,
         $bottomWidth = null,
         $leftWidth = null,
-        string $colour = null
+        ?string $colour = null
     ) : self {
         if (!is_int($rightWidth)) {
             $colour = $rightWidth;
@@ -768,7 +768,7 @@ public function setBorderLeftWidth(int $width) : self
         return $this;
     }
 
-    public function setBorderColour(string $colour, string $fallback = null) : self
+    public function setBorderColour(string $colour, ?string $fallback = null) : self
     {
         $this->borderColour = ColourUtil::validateColour(
             $this->terminal,
diff --git a/src/Util/ColourUtil.php b/src/Util/ColourUtil.php
@@ -307,7 +307,7 @@ public static function map256To8(int $colourCode) : string
      * Check if $colour exists
      * If it's a 256-colours code and $terminal doesn't support it, returns a fallback value
      */
-    public static function validateColour(Terminal $terminal, string $colour, string $fallback = null) : string
+    public static function validateColour(Terminal $terminal, string $colour, ?string $fallback = null) : string
     {
         if (!is_numeric($colour)) {
             return self::validateColourName($colour);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ class CliMenuBuilder`
`93`	`93`	`*/`
`94`	`94`	`private $subMenu = false;`
`95`	`95`
`96`		`- public function __construct(Terminal $terminal = null)`
	`96`	`+ public function __construct(?Terminal $terminal = null)`
`97`	`97`	`{`
`98`	`98`	`$this->terminal = $terminal ?? TerminalFactory::fromSystem();`
`99`	`99`	`$this->style = new MenuStyle($this->terminal);`
`@@ -249,7 +249,7 @@ public function addSubMenuFromBuilder(string $text, CliMenuBuilder $builder) : s`
`249`	`249`	`return $this;`
`250`	`250`	`}`
`251`	`251`
`252`		`- public function enableAutoShortcuts(string $regex = null) : self`
	`252`	`+ public function enableAutoShortcuts(?string $regex = null) : self`
`253`	`253`	`{`
`254`	`254`	`$this->autoShortcuts = true;`
`255`	`255`
`@@ -373,14 +373,14 @@ public function setExitButtonText(string $exitButtonText) : self`
`373`	`373`	`return $this;`
`374`	`374`	`}`
`375`	`375`
`376`		`- public function setBackgroundColour(string $colour, string $fallback = null) : self`
	`376`	`+ public function setBackgroundColour(string $colour, ?string $fallback = null) : self`
`377`	`377`	`{`
`378`	`378`	`$this->style->setBg($colour, $fallback);`
`379`	`379`
`380`	`380`	`return $this;`
`381`	`381`	`}`
`382`	`382`
`383`		`- public function setForegroundColour(string $colour, string $fallback = null) : self`
	`383`	`+ public function setForegroundColour(string $colour, ?string $fallback = null) : self`
`384`	`384`	`{`
`385`	`385`	`$this->style->setFg($colour, $fallback);`
`386`	`386`
`@@ -394,7 +394,7 @@ public function setWidth(int $width) : self`
`394`	`394`	`return $this;`
`395`	`395`	`}`
`396`	`396`
`397`		`- public function setPadding(int $topBottom, int $leftRight = null) : self`
	`397`	`+ public function setPadding(int $topBottom, ?int $leftRight = null) : self`
`398`	`398`	`{`
`399`	`399`	`$this->style->setPadding($topBottom, $leftRight);`
`400`	`400`
`@@ -452,7 +452,7 @@ public function setTitleSeparator(string $separator) : self`
`452`	`452`	`* @param int\|string\|null $bottom`
`453`	`453`	`* @param int\|string\|null $left`
`454`	`454`	`*/`
`455`		`- public function setBorder(int $top, $right = null, $bottom = null, $left = null, string $colour = null) : self`
	`455`	`+ public function setBorder(int $top, $right = null, $bottom = null, $left = null, ?string $colour = null) : self`
`456`	`456`	`{`
`457`	`457`	`$this->style->setBorder($top, $right, $bottom, $left, $colour);`
`458`	`458`
`@@ -487,7 +487,7 @@ public function setBorderLeftWidth(int $width) : self`
`487`	`487`	`return $this;`
`488`	`488`	`}`
`489`	`489`
`490`		`- public function setBorderColour(string $colour, string $fallback = null) : self`
	`490`	`+ public function setBorderColour(string $colour, ?string $fallback = null) : self`
`491`	`491`	`{`
`492`	`492`	`$this->style->setBorderColour($colour, $fallback);`
`493`	`493`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function setGutter(int $gutter) : self`
`144`	`144`	`return $this;`
`145`	`145`	`}`
`146`	`146`
`147`		`- public function enableAutoShortcuts(string $regex = null) : self`
	`147`	`+ public function enableAutoShortcuts(?string $regex = null) : self`
`148`	`148`	`{`
`149`	`149`	`$this->autoShortcuts = true;`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ class CliMenu`
`99`	`99`	`public function __construct(`
`100`	`100`	`?string $title,`
`101`	`101`	`array $items,`
`102`		`- Terminal $terminal = null,`
`103`		`- MenuStyle $style = null`
	`102`	`+ ?Terminal $terminal = null,`
	`103`	`+ ?MenuStyle $style = null`
`104`	`104`	`) {`
`105`	`105`	`$this->title = $title;`
`106`	`106`	`$this->items = $items;`
`@@ -696,7 +696,7 @@ public function getCurrentFrame() : Frame`
`696`	`696`	`return $this->currentFrame;`
`697`	`697`	`}`
`698`	`698`
`699`		`- public function flash(string $text, MenuStyle $style = null) : Flash`
	`699`	`+ public function flash(string $text, ?MenuStyle $style = null) : Flash`
`700`	`700`	`{`
`701`	`701`	`$this->guardSingleLine($text);`
`702`	`702`
`@@ -707,7 +707,7 @@ public function flash(string $text, MenuStyle $style = null) : Flash`
`707`	`707`	`return new Flash($this, $style, $this->terminal, $text);`
`708`	`708`	`}`
`709`	`709`
`710`		`- public function confirm(string $text, MenuStyle $style = null) : Confirm`
	`710`	`+ public function confirm(string $text, ?MenuStyle $style = null) : Confirm`
`711`	`711`	`{`
`712`	`712`	`$this->guardSingleLine($text);`
`713`	`713`
`@@ -718,7 +718,7 @@ public function confirm(string $text, MenuStyle $style = null) : Confirm`
`718`	`718`	`return new Confirm($this, $style, $this->terminal, $text);`
`719`	`719`	`}`
`720`	`720`
`721`		`- public function cancellableConfirm(string $text, MenuStyle $style = null) : CancellableConfirm`
	`721`	`+ public function cancellableConfirm(string $text, ?MenuStyle $style = null) : CancellableConfirm`
`722`	`722`	`{`
`723`	`723`	`$this->guardSingleLine($text);`
`724`	`724`
`@@ -729,7 +729,7 @@ public function cancellableConfirm(string $text, MenuStyle $style = null) : Canc`
`729`	`729`	`return new CancellableConfirm($this, $style, $this->terminal, $text);`
`730`	`730`	`}`
`731`	`731`
`732`		`- public function askNumber(MenuStyle $style = null) : Number`
	`732`	`+ public function askNumber(?MenuStyle $style = null) : Number`
`733`	`733`	`{`
`734`	`734`	`$this->assertOpen();`
`735`	`735`
`@@ -740,7 +740,7 @@ public function askNumber(MenuStyle $style = null) : Number`
`740`	`740`	`return new Number(new InputIO($this, $this->terminal), $style);`
`741`	`741`	`}`
`742`	`742`
`743`		`- public function askText(MenuStyle $style = null) : Text`
	`743`	`+ public function askText(?MenuStyle $style = null) : Text`
`744`	`744`	`{`
`745`	`745`	`$this->assertOpen();`
`746`	`746`
`@@ -751,7 +751,7 @@ public function askText(MenuStyle $style = null) : Text`
`751`	`751`	`return new Text(new InputIO($this, $this->terminal), $style);`
`752`	`752`	`}`
`753`	`753`
`754`		`- public function askPassword(MenuStyle $style = null) : Password`
	`754`	`+ public function askPassword(?MenuStyle $style = null) : Password`
`755`	`755`	`{`
`756`	`756`	`$this->assertOpen();`
`757`	`757`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function emptyRow() : void`
`108`	`108`	`/**`
`109`	`109`	`* Write some text at a particular column`
`110`	`110`	`*/`
`111`		`- protected function write(string $text, int $column = null) : void`
	`111`	`+ protected function write(string $text, ?int $column = null) : void`
`112`	`112`	`{`
`113`	`113`	`$this->terminal->moveCursorToColumn($column ?: $this->x);`
`114`	`114`	`$this->terminal->write($text);`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ class MenuStyle`
`227`	`227`	`/**`
`228`	`228`	`* Initialise style`
`229`	`229`	`*/`
`230`		`- public function __construct(Terminal $terminal = null)`
	`230`	`+ public function __construct(?Terminal $terminal = null)`
`231`	`231`	`{`
`232`	`232`	`$this->terminal = $terminal ?: TerminalFactory::fromSystem();`
`233`	`233`
`@@ -401,7 +401,7 @@ public function getFg() : string`
`401`	`401`	`return $this->fg;`
`402`	`402`	`}`
`403`	`403`
`404`		`- public function setFg(string $fg, string $fallback = null) : self`
	`404`	`+ public function setFg(string $fg, ?string $fallback = null) : self`
`405`	`405`	`{`
`406`	`406`	`$this->fg = ColourUtil::validateColour(`
`407`	`407`	`$this->terminal,`
`@@ -418,7 +418,7 @@ public function getBg() : string`
`418`	`418`	`return $this->bg;`
`419`	`419`	`}`
`420`	`420`
`421`		`- public function setBg(string $bg, string $fallback = null) : self`
	`421`	`+ public function setBg(string $bg, ?string $fallback = null) : self`
`422`	`422`	`{`
`423`	`423`	`$this->bg = ColourUtil::validateColour(`
`424`	`424`	`$this->terminal,`
`@@ -522,7 +522,7 @@ public function getPaddingTopBottomRows() : array`
`522`	`522`	`return $this->paddingTopBottomRows;`
`523`	`523`	`}`
`524`	`524`
`525`		`- public function setPadding(int $topBottom, int $leftRight = null) : self`
	`525`	`+ public function setPadding(int $topBottom, ?int $leftRight = null) : self`
`526`	`526`	`{`
`527`	`527`	`if ($leftRight === null) {`
`528`	`528`	`$leftRight = $topBottom;`
`@@ -700,7 +700,7 @@ public function setBorder(`
`700`	`700`	`$rightWidth = null,`
`701`	`701`	`$bottomWidth = null,`
`702`	`702`	`$leftWidth = null,`
`703`		`- string $colour = null`
	`703`	`+ ?string $colour = null`
`704`	`704`	`) : self {`
`705`	`705`	`if (!is_int($rightWidth)) {`
`706`	`706`	`$colour = $rightWidth;`
`@@ -768,7 +768,7 @@ public function setBorderLeftWidth(int $width) : self`
`768`	`768`	`return $this;`
`769`	`769`	`}`
`770`	`770`
`771`		`- public function setBorderColour(string $colour, string $fallback = null) : self`
	`771`	`+ public function setBorderColour(string $colour, ?string $fallback = null) : self`
`772`	`772`	`{`
`773`	`773`	`$this->borderColour = ColourUtil::validateColour(`
`774`	`774`	`$this->terminal,`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public static function map256To8(int $colourCode) : string`
`307`	`307`	`* Check if $colour exists`
`308`	`308`	`* If it's a 256-colours code and $terminal doesn't support it, returns a fallback value`
`309`	`309`	`*/`
`310`		`- public static function validateColour(Terminal $terminal, string $colour, string $fallback = null) : string`
	`310`	`+ public static function validateColour(Terminal $terminal, string $colour, ?string $fallback = null) : string`
`311`	`311`	`{`
`312`	`312`	`if (!is_numeric($colour)) {`
`313`	`313`	`return self::validateColourName($colour);`