Skip to content

Commit bad5e01

Browse files
authored
Merge pull request #253 from php-school/strict-types
Add strict_types everywhere
2 parents 112d36f + c5bf170 commit bad5e01

File tree

95 files changed

+131
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+131
-29
lines changed

CHANGELOG.md

+8-1

examples/ascii-art.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/basic-centered.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/basic-separation.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/basic.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/borders.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/checkbox-item.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/confirm-cancellable.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/confirm.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/crazy-redraw.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/crazy-separation.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/custom-item-register.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Builder\SplitItemBuilder;
45
use PhpSchool\CliMenu\CliMenu;

examples/custom-mapping.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/custom-styles.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/disabled-items.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/draw.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Action\ExitAction;
45
use PhpSchool\CliMenu\Builder\SplitItemBuilder;

examples/flash.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/input-advanced.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/input-custom.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/input-number.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/input-password.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/input-text.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/item-extra-toggling.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/item-extra.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/nested-submenu.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/radio-item.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/redraw.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/remove-defaults.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/shortcuts.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Builder\SplitItemBuilder;
45
use PhpSchool\CliMenu\CliMenu;

examples/split-checkbox-item.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Builder\SplitItemBuilder;
45
use PhpSchool\CliMenu\CliMenu;

examples/split-item.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Builder\SplitItemBuilder;
45
use PhpSchool\CliMenu\CliMenu;

examples/split-radio-item.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\Builder\SplitItemBuilder;
45
use PhpSchool\CliMenu\CliMenu;

examples/submenu.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

examples/useful-separation.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
use PhpSchool\CliMenu\CliMenu;
45
use PhpSchool\CliMenu\Builder\CliMenuBuilder;

src/Action/ExitAction.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Action;
45

src/Action/GoBackAction.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Action;
45

src/Builder/CliMenuBuilder.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Builder;
45

src/Builder/SplitItemBuilder.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Builder;
45

src/CliMenu.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu;
45

src/Dialogue/CancellableConfirm.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Dialogue;
45

src/Dialogue/Confirm.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Dialogue;
45

src/Dialogue/Dialogue.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Dialogue;
45

src/Dialogue/Flash.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Dialogue;
45

src/Exception/InvalidShortcutException.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Exception;
45

src/Exception/InvalidTerminalException.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Exception;
45

src/Exception/MenuNotOpenException.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Exception;
45

src/Frame.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu;
45

src/Input/Input.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

src/Input/InputIO.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

src/Input/InputResult.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

src/Input/Number.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

@@ -92,11 +93,11 @@ public function setValidator(callable $validator) : Input
9293
public function ask() : InputResult
9394
{
9495
$this->inputIO->registerControlCallback(InputCharacter::UP, function (string $input) {
95-
return $this->validate($input) ? (int) $input + 1 : $input;
96+
return $this->validate($input) ? (string) ((int) $input + 1) : $input;
9697
});
9798

9899
$this->inputIO->registerControlCallback(InputCharacter::DOWN, function (string $input) {
99-
return $this->validate($input) ? (int) $input - 1 : $input;
100+
return $this->validate($input) ? (string) ((int) $input - 1) : $input;
100101
});
101102

102103
return $this->inputIO->collect($this);

src/Input/Password.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

src/Input/Text.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\Input;
45

src/MenuItem/AsciiArtItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/CheckboxItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/LineBreakItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/MenuItemInterface.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/MenuMenuItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/RadioItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/SelectableItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/SplitItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

src/MenuItem/StaticItem.php

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
declare(strict_types=1);
23

34
namespace PhpSchool\CliMenu\MenuItem;
45

0 commit comments

Comments
 (0)