Merge pull request #253 from php-school/strict-types

Add strict_types everywhere
php-school · Dec 16, 2021 · bad5e01 · bad5e01
2 parents 112d36f + c5bf170
commit bad5e01
Show file tree

Hide file tree

Showing 95 changed files with 131 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,16 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ### Removed
 
+## [4.3.0]
+### Fixed
+ - PHP 8.1 Support (#252, #249)
+
+### Added
+ - declare(strict_types=1) everywhere
+
 ## [4.2.0]
 ### Added
- - Yes/no comfirmation dialogue (#248)
+ - Yes/no confirmation dialogue (#248)
  - Ability to add multiple checkbox and radio items (#241)
 
 ## [4.1.0]

diff --git a/examples/ascii-art.php b/examples/ascii-art.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/basic-centered.php b/examples/basic-centered.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/basic-separation.php b/examples/basic-separation.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/basic.php b/examples/basic.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/borders.php b/examples/borders.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/checkbox-item.php b/examples/checkbox-item.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/confirm-cancellable.php b/examples/confirm-cancellable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/confirm.php b/examples/confirm.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/crazy-redraw.php b/examples/crazy-redraw.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/crazy-separation.php b/examples/crazy-separation.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/custom-item-register.php b/examples/custom-item-register.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;

diff --git a/examples/custom-mapping.php b/examples/custom-mapping.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/custom-styles.php b/examples/custom-styles.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/disabled-items.php b/examples/disabled-items.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/draw.php b/examples/draw.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Action\ExitAction;
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;

diff --git a/examples/flash.php b/examples/flash.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/input-advanced.php b/examples/input-advanced.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/input-custom.php b/examples/input-custom.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/input-number.php b/examples/input-number.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/input-password.php b/examples/input-password.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/input-text.php b/examples/input-text.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/item-extra-toggling.php b/examples/item-extra-toggling.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/item-extra.php b/examples/item-extra.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/nested-submenu.php b/examples/nested-submenu.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/radio-item.php b/examples/radio-item.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/redraw.php b/examples/redraw.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/remove-defaults.php b/examples/remove-defaults.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/shortcuts.php b/examples/shortcuts.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;

diff --git a/examples/split-checkbox-item.php b/examples/split-checkbox-item.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;

diff --git a/examples/split-item.php b/examples/split-item.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;

diff --git a/examples/split-radio-item.php b/examples/split-radio-item.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\Builder\SplitItemBuilder;
 use PhpSchool\CliMenu\CliMenu;

diff --git a/examples/submenu.php b/examples/submenu.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/examples/useful-separation.php b/examples/useful-separation.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;

diff --git a/src/Action/ExitAction.php b/src/Action/ExitAction.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Action;
 

diff --git a/src/Action/GoBackAction.php b/src/Action/GoBackAction.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Action;
 

diff --git a/src/Builder/CliMenuBuilder.php b/src/Builder/CliMenuBuilder.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Builder;
 

diff --git a/src/Builder/SplitItemBuilder.php b/src/Builder/SplitItemBuilder.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Builder;
 

diff --git a/src/CliMenu.php b/src/CliMenu.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu;
 

diff --git a/src/Dialogue/CancellableConfirm.php b/src/Dialogue/CancellableConfirm.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Dialogue;
 

diff --git a/src/Dialogue/Confirm.php b/src/Dialogue/Confirm.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Dialogue;
 

diff --git a/src/Dialogue/Dialogue.php b/src/Dialogue/Dialogue.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Dialogue;
 

diff --git a/src/Dialogue/Flash.php b/src/Dialogue/Flash.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Dialogue;
 

diff --git a/src/Exception/InvalidShortcutException.php b/src/Exception/InvalidShortcutException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Exception;
 

diff --git a/src/Exception/InvalidTerminalException.php b/src/Exception/InvalidTerminalException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Exception;
 

diff --git a/src/Exception/MenuNotOpenException.php b/src/Exception/MenuNotOpenException.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Exception;
 

diff --git a/src/Frame.php b/src/Frame.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu;
 

diff --git a/src/Input/Input.php b/src/Input/Input.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 

diff --git a/src/Input/InputIO.php b/src/Input/InputIO.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 

diff --git a/src/Input/InputResult.php b/src/Input/InputResult.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 

diff --git a/src/Input/Number.php b/src/Input/Number.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 
@@ -92,11 +93,11 @@ public function setValidator(callable $validator) : Input
     public function ask() : InputResult
     {
         $this->inputIO->registerControlCallback(InputCharacter::UP, function (string $input) {
-            return $this->validate($input) ? (int) $input + 1 : $input;
+            return $this->validate($input) ? (string) ((int) $input + 1) : $input;
         });
 
         $this->inputIO->registerControlCallback(InputCharacter::DOWN, function (string $input) {
-            return $this->validate($input) ? (int) $input - 1 : $input;
+            return $this->validate($input) ? (string) ((int) $input - 1) : $input;
         });
 
         return $this->inputIO->collect($this);

diff --git a/src/Input/Password.php b/src/Input/Password.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 

diff --git a/src/Input/Text.php b/src/Input/Text.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Input;
 

diff --git a/src/MenuItem/AsciiArtItem.php b/src/MenuItem/AsciiArtItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/CheckboxItem.php b/src/MenuItem/CheckboxItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/LineBreakItem.php b/src/MenuItem/LineBreakItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/MenuItemInterface.php b/src/MenuItem/MenuItemInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/MenuMenuItem.php b/src/MenuItem/MenuMenuItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/RadioItem.php b/src/MenuItem/RadioItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/SelectableItem.php b/src/MenuItem/SelectableItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/SplitItem.php b/src/MenuItem/SplitItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;
 

diff --git a/src/MenuItem/StaticItem.php b/src/MenuItem/StaticItem.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\MenuItem;