Update phpstan and fix findings

Author: AydinHassan

composer.json

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

src/CliMenu.php

@@ -244,7 +244,8 @@ private function display() : void
         $reader = new NonCanonicalReader($this->terminal);
         $reader->addControlMappings($this->defaultControlMappings);
 
-        while ($this->isOpen() && $char = $reader->readCharacter()) {
+        while ($this->isOpen()) {
+            $char = $reader->readCharacter();
             if (!$char->isHandledControl()) {
                 $rawChar = $char->get();
                 if (isset($this->customControlMappings[$rawChar])) {
@@ -293,7 +294,7 @@ protected function moveSelectionVertically(string $direction) : void
                 ? $this->selectedItem--
                 : $this->selectedItem++;
 
-            if (!array_key_exists($this->selectedItem, $this->items)) {
+            if ($this->selectedItem !== null && !array_key_exists($this->selectedItem, $this->items)) {
                 $this->selectedItem  = $direction === 'UP'
                     ? end($itemKeys)
                     : reset($itemKeys);
@@ -371,7 +372,9 @@ protected function executeCurrentItem() : void
 
         if ($item->canSelect()) {
             $callable = $item->getSelectAction();
-            $callable($this);
+            if ($callable) {
+                $callable($this);
+            }
         }
     }
 

src/Dialogue/Confirm.php

@@ -36,7 +36,7 @@ public function display(string $confirmText = 'OK') : void
         $this->emptyRow();
 
         $confirmText = sprintf(' < %s > ', $confirmText);
-        $leftFill    = ($promptWidth / 2) - (mb_strlen($confirmText) / 2);
+        $leftFill    = (int) (($promptWidth / 2) - (mb_strlen($confirmText) / 2));
 
         $this->write(sprintf(
             "%s%s%s%s%s%s%s\n",

src/Dialogue/Dialogue.php

@@ -68,14 +68,14 @@ protected function assertMenuOpen() : void
     protected function calculateCoordinates() : void
     {
         //y
-        $textLines          = count(explode("\n", $this->text)) + 2;
-        $this->y            = ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($textLines / 2) + 1;
+        $textLines = count(explode("\n", $this->text)) + 2;
+        $this->y = (int) (ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($textLines / 2) + 1);
 
         //x
-        $parentStyle        = $this->parentMenu->getStyle();
-        $dialogueHalfLength = (mb_strlen($this->text) + ($this->style->getPaddingLeftRight() * 2)) / 2;
-        $widthHalfLength    = ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin());
-        $this->x            = $widthHalfLength - $dialogueHalfLength;
+        $parentStyle = $this->parentMenu->getStyle();
+        $dialogueHalfLength = (int) ((mb_strlen($this->text) + ($this->style->getPaddingLeftRight() * 2)) / 2);
+        $widthHalfLength = (int) ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin());
+        $this->x = $widthHalfLength - $dialogueHalfLength;
     }
 
     /**

src/Input/InputIO.php

@@ -110,14 +110,14 @@ private function calculateYPosition() : int
     {
         $lines = 5; //1. empty 2. prompt text 3. empty 4. input 5. empty
 
-        return ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($lines /2) + 1;
+        return (int) (ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($lines /2) + 1);
     }
 
     private function calculateYPositionWithError() : int
     {
         $lines = 7; //1. empty 2. prompt text 3. empty 4. input 5. empty 6. error 7. empty
 
-        return ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($lines /2) + 1;
+        return (int) (ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($lines /2) + 1);
     }
 
     private function calculateXPosition(Input $input, string $userInput) : int
@@ -134,7 +134,7 @@ private function calculateXPosition(Input $input, string $userInput) : int
         $halfWidth       = ($width + ($input->getStyle()->getPaddingLeftRight() * 2)) / 2;
         $parentHalfWidth = ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin());
 
-        return $parentHalfWidth - $halfWidth;
+        return (int) ($parentHalfWidth - $halfWidth);
     }
 
     private function drawLine(Input $input, string $userInput, string $text) : void
@@ -164,8 +164,8 @@ private function drawCenteredLine(Input $input, string $userInput, string $text)
         );
 
         $textLength = mb_strlen(StringUtil::stripAnsiEscapeSequence($text));
-        $leftFill   = ($width / 2) - ($textLength / 2);
-        $rightFill  = ceil($width - $leftFill - $textLength);
+        $leftFill   = (int) (($width / 2) - ($textLength / 2));
+        $rightFill  = (int) ceil($width - $leftFill - $textLength);
 
         $this->drawLine(
             $input,

src/Input/Number.php

@@ -80,11 +80,11 @@ public function getPlaceholderText() : string
     public function ask() : InputResult
     {
         $this->inputIO->registerControlCallback(InputCharacter::UP, function (string $input) {
-            return $this->validate($input) ? $input + 1 : $input;
+            return $this->validate($input) ? (int) $input + 1 : $input;
         });
 
         $this->inputIO->registerControlCallback(InputCharacter::DOWN, function (string $input) {
-            return $this->validate($input) ? $input - 1 : $input;
+            return $this->validate($input) ? (int) $input - 1 : $input;
         });
 
         return $this->inputIO->collect($this);

src/MenuItem/AsciiArtItem.php

@@ -67,7 +67,7 @@ public function getRows(MenuStyle $style, bool $selected = false) : array
                     break;
                 case self::POSITION_CENTER:
                 default:
-                    $left = ceil($padding / 2);
+                    $left = (int) ceil($padding / 2);
                     $row = sprintf('%s%s', str_repeat(' ', $left), $row);
                     break;
             }
@@ -117,7 +117,7 @@ public function setText(string $text) : void
      */
     private function calculateArtLength() : void
     {
-        $this->artLength = max(array_map('mb_strlen', explode("\n", $this->text)));
+        $this->artLength = (int) max(array_map('mb_strlen', explode("\n", $this->text)));
     }
 
     /**

src/MenuItem/SplitItem.php

@@ -117,6 +117,7 @@ public function getRows(MenuStyle $style, bool $selected = false) : array
             : floor($style->getContentWidth() / $numberOfItems);
 
         $length -= $this->gutter;
+        $length = (int) $length;
 
         $missingLength = $style->getContentWidth() % $numberOfItems;
 

src/MenuStyle.php

@@ -485,7 +485,7 @@ public function getMargin() : int
     public function setMarginAuto() : self
     {
         $this->marginAuto = true;
-        $this->margin = floor(($this->terminal->getWidth() - $this->width) / 2);
+        $this->margin = (int) floor(($this->terminal->getWidth() - $this->width) / 2);
 
         $this->generateBorderRows();
         $this->generatePaddingTopBottomRows();

src/Util/StringUtil.php

@@ -41,6 +41,6 @@ public static function wordwrap(string $string, int $width, string $break = "\n"
 
     public static function stripAnsiEscapeSequence(string $str) : string
     {
-        return preg_replace('/\x1b[^m]*m/', '', $str);
+        return (string) preg_replace('/\x1b[^m]*m/', '', $str);
     }
 }