Scrutinizer fixes

Author: AydinHassan

src/Dialogue/Confirm.php

@@ -45,7 +45,7 @@ public function display(string $confirmText = 'OK') : void
             $this->style->getInvertedColoursSetCode(),
             $confirmText,
             $this->style->getInvertedColoursUnsetCode(),
-            str_repeat(' ', ceil($promptWidth - $leftFill - mb_strlen($confirmText))),
+            str_repeat(' ', (int) ceil($promptWidth - $leftFill - mb_strlen($confirmText))),
             $this->style->getColoursResetCode()
         ));
 

src/MenuItem/MenuMenuItem.php

@@ -29,7 +29,9 @@ public function __construct(string $text, CliMenu $subMenu, bool $disabled = fal
      */
     public function getSelectAction() : ?callable
     {
-        return [$this, 'showSubMenu'];
+        return function (CliMenu $menu) {
+            $this->showSubMenu($menu);
+        };
     }
 
     /**

src/MenuItem/SplitItem.php

@@ -3,8 +3,6 @@
 namespace PhpSchool\CliMenu\MenuItem;
 
 use Assert\Assertion;
-use PhpSchool\CliMenu\CliMenu;
-use PhpSchool\CliMenu\CliMenuBuilder;
 use PhpSchool\CliMenu\MenuStyle;
 use PhpSchool\CliMenu\Util\StringUtil;
 

src/MenuStyle.php

@@ -2,7 +2,6 @@
 
 namespace PhpSchool\CliMenu;
 
-use PhpSchool\CliMenu\Exception\InvalidInstantiationException;
 use PhpSchool\CliMenu\Terminal\TerminalFactory;
 use PhpSchool\CliMenu\Util\ColourUtil;
 use PhpSchool\Terminal\Terminal;
@@ -219,25 +218,25 @@ public function __construct(Terminal $terminal = null)
     {
         $this->terminal = $terminal ?: TerminalFactory::fromSystem();
 
-        $this->fg = static::$defaultStyleValues['fg'];
-        $this->bg = static::$defaultStyleValues['bg'];
+        $this->fg = self::$defaultStyleValues['fg'];
+        $this->bg = self::$defaultStyleValues['bg'];
 
         $this->generateColoursSetCode();
 
-        $this->setWidth(static::$defaultStyleValues['width']);
-        $this->setPaddingTopBottom(static::$defaultStyleValues['paddingTopBottom']);
-        $this->setPaddingLeftRight(static::$defaultStyleValues['paddingLeftRight']);
-        $this->setMargin(static::$defaultStyleValues['margin']);
-        $this->setSelectedMarker(static::$defaultStyleValues['selectedMarker']);
-        $this->setUnselectedMarker(static::$defaultStyleValues['unselectedMarker']);
-        $this->setItemExtra(static::$defaultStyleValues['itemExtra']);
-        $this->setDisplaysExtra(static::$defaultStyleValues['displaysExtra']);
-        $this->setTitleSeparator(static::$defaultStyleValues['titleSeparator']);
-        $this->setBorderTopWidth(static::$defaultStyleValues['borderTopWidth']);
-        $this->setBorderRightWidth(static::$defaultStyleValues['borderRightWidth']);
-        $this->setBorderBottomWidth(static::$defaultStyleValues['borderBottomWidth']);
-        $this->setBorderLeftWidth(static::$defaultStyleValues['borderLeftWidth']);
-        $this->setBorderColour(static::$defaultStyleValues['borderColour']);
+        $this->setWidth(self::$defaultStyleValues['width']);
+        $this->setPaddingTopBottom(self::$defaultStyleValues['paddingTopBottom']);
+        $this->setPaddingLeftRight(self::$defaultStyleValues['paddingLeftRight']);
+        $this->setMargin(self::$defaultStyleValues['margin']);
+        $this->setSelectedMarker(self::$defaultStyleValues['selectedMarker']);
+        $this->setUnselectedMarker(self::$defaultStyleValues['unselectedMarker']);
+        $this->setItemExtra(self::$defaultStyleValues['itemExtra']);
+        $this->setDisplaysExtra(self::$defaultStyleValues['displaysExtra']);
+        $this->setTitleSeparator(self::$defaultStyleValues['titleSeparator']);
+        $this->setBorderTopWidth(self::$defaultStyleValues['borderTopWidth']);
+        $this->setBorderRightWidth(self::$defaultStyleValues['borderRightWidth']);
+        $this->setBorderBottomWidth(self::$defaultStyleValues['borderBottomWidth']);
+        $this->setBorderLeftWidth(self::$defaultStyleValues['borderLeftWidth']);
+        $this->setBorderColour(self::$defaultStyleValues['borderColour']);
     }
 
     public function hasChangedFromDefaults() : bool
@@ -262,7 +261,7 @@ public function hasChangedFromDefaults() : bool
             $this->marginAuto,
         ];
 
-        return $currentValues !== array_values(static::$defaultStyleValues);
+        return $currentValues !== array_values(self::$defaultStyleValues);
     }
 
     public function getDisabledItemText(string $text) : string

src/Util/ColourUtil.php

@@ -286,7 +286,7 @@ class ColourUtil
 
     public static function getDefaultColourNames() : array
     {
-        return static::$defaultColoursNames;
+        return self::$defaultColoursNames;
     }
 
     /**
@@ -295,11 +295,11 @@ public static function getDefaultColourNames() : array
      */
     public static function map256To8(int $colourCode) : string
     {
-        if (!isset(static::$coloursMap[$colourCode])) {
+        if (!isset(self::$coloursMap[$colourCode])) {
             throw new \InvalidArgumentException('Invalid colour code');
         }
 
-        return static::$coloursMap[$colourCode];
+        return self::$coloursMap[$colourCode];
     }
 
     /**

test/MenuItem/MenuMenuItemTest.php

@@ -28,10 +28,7 @@ public function testGetSelectAction() : void
         $item = new MenuMenuItem('Item', $subMenu);
 
         $action = $item->getSelectAction();
-        $this->assertTrue(is_callable($action));
-        $this->assertInternalType('array', $action);
-        $this->assertSame($item, $action[0]);
-        $this->assertSame('showSubMenu', $action[1]);
+        $this->assertInternalType('callable', $action);
     }
 
     public function testShowsItemExtra() : void