Merge pull request #221 from php-school/upgrade-phpstan

Upgrade phpstan and fix issues

Author: AydinHassan

composer.json

@@ -16,7 +16,7 @@
     "require-dev": {
         "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.2",
-        "phpstan/phpstan": "^0.11"
+        "phpstan/phpstan": "^0.12"
     },
     "require": {
         "php" : ">=7.1",

phpstan.neon

@@ -0,0 +1,2 @@
+parameters:
+    checkMissingIterableValueType: false

src/Builder/CliMenuBuilder.php

@@ -412,6 +412,11 @@ public function setTitleSeparator(string $separator) : self
         return $this;
     }
 
+    /**
+     * @param int|string|null $right
+     * @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
     {
         $this->style->setBorder($top, $right, $bottom, $left, $colour);
@@ -447,7 +452,7 @@ public function setBorderLeftWidth(int $width) : self
         return $this;
     }
 
-    public function setBorderColour(string $colour, $fallback = null) : self
+    public function setBorderColour(string $colour, string $fallback = null) : self
     {
         $this->style->setBorderColour($colour, $fallback);
 
@@ -575,7 +580,7 @@ public function modifySelectableStyle(callable $itemCallable) : self
      * Pass styles from current menu to sub-menu
      * only if sub-menu style has not be customized
      */
-    private function propagateStyles(CliMenu $menu, array $items = [])
+    private function propagateStyles(CliMenu $menu, array $items = []) : void
     {
         $currentItems = !empty($items) ? $items : $menu->getItems();
 

src/CliMenu.php

@@ -757,7 +757,7 @@ public function askPassword(MenuStyle $style = null) : Password
         return new Password(new InputIO($this, $this->terminal), $style);
     }
 
-    private function guardSingleLine($text) : void
+    private function guardSingleLine(string $text) : void
     {
         if (strpos($text, "\n") !== false) {
             throw new \InvalidArgumentException;

src/Exception/InvalidShortcutException.php

@@ -9,6 +9,6 @@ class InvalidShortcutException extends \RuntimeException
 {
     public static function fromShortcut(string $shortcut) : self
     {
-        return new static(sprintf('Shortcut key must be only one character. Got: "%s"', $shortcut));
+        return new self(sprintf('Shortcut key must be only one character. Got: "%s"', $shortcut));
     }
 }

src/Input/InputIO.php

@@ -99,7 +99,7 @@ public function registerControlCallback(string $control, callable $callback) : v
         $this->callbacks[$control][] = $callback;
     }
 
-    private function getInputWidth(array $lines)
+    private function getInputWidth(array $lines) : int
     {
         return max(
             array_map(

src/MenuStyle.php

@@ -354,7 +354,7 @@ protected function calculateContentWidth() : void
         }
     }
 
-    public function getFg()
+    public function getFg() : string
     {
         return $this->fg;
     }
@@ -371,7 +371,7 @@ public function setFg(string $fg, string $fallback = null) : self
         return $this;
     }
 
-    public function getBg()
+    public function getBg() : string
     {
         return $this->bg;
     }
@@ -467,6 +467,9 @@ private function generatePaddingTopBottomRows() : void
         $this->paddingTopBottomRows = array_fill(0, $this->paddingTopBottom, $paddingRow);
     }
 
+    /**
+     * @return array
+     */
     public function getPaddingTopBottomRows() : array
     {
         return $this->paddingTopBottomRows;
@@ -619,17 +622,27 @@ private function generateBorderRows() : void
         $this->borderBottomRows = array_fill(0, $this->borderBottomWidth, $borderRow);
     }
 
+    /**
+     * @return array
+     */
     public function getBorderTopRows() : array
     {
         return $this->borderTopRows;
     }
 
+    /**
+     * @return array
+     */
     public function getBorderBottomRows() : array
     {
         return $this->borderBottomRows;
     }
 
     /**
+     * @param int|string|null $rightWidth
+     * @param int|string|null $bottomWidth
+     * @param int|string|null $leftWidth
+     *
      * Shorthand function to set all borders values at once
      */
     public function setBorder(
@@ -658,8 +671,6 @@ public function setBorder(
 
         if (is_string($colour)) {
             $this->setBorderColour($colour);
-        } elseif ($colour !== null) {
-            throw new \InvalidArgumentException('Invalid colour');
         }
 
         $this->calculateContentWidth();
@@ -707,7 +718,7 @@ public function setBorderLeftWidth(int $width) : self
         return $this;
     }
 
-    public function setBorderColour(string $colour, $fallback = null) : self
+    public function setBorderColour(string $colour, string $fallback = null) : self
     {
         $this->borderColour = ColourUtil::validateColour(
             $this->terminal,