@@ -2,8 +2,6 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace PhpSchool\CliMenu; |
4 | 4 | |
5 | -use PhpSchool\CliMenu\Dialogue\NumberInput; |
|
6 | -use PhpSchool\CliMenu\Exception\InvalidInstantiationException; |
|
7 | 5 | use PhpSchool\CliMenu\Exception\InvalidTerminalException; |
8 | 6 | use PhpSchool\CliMenu\Exception\MenuNotOpenException; |
9 | 7 | use PhpSchool\CliMenu\Input\InputIO; |
@@ -17,11 +15,9 @@ discard block |
||
17 | 15 | use PhpSchool\CliMenu\Dialogue\Flash; |
18 | 16 | use PhpSchool\CliMenu\Terminal\TerminalFactory; |
19 | 17 | use PhpSchool\CliMenu\Util\StringUtil as s; |
20 | -use PhpSchool\Terminal\Exception\NotInteractiveTerminal; |
|
21 | 18 | use PhpSchool\Terminal\InputCharacter; |
22 | 19 | use PhpSchool\Terminal\NonCanonicalReader; |
23 | 20 | use PhpSchool\Terminal\Terminal; |
24 | -use PhpSchool\Terminal\TerminalReader; |
|
25 | 21 | |
26 | 22 | /** |
27 | 23 | * @author Michael Woodward <[email protected]> |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | : $this->selectedItem++; |
205 | 205 | |
206 | 206 | if (!array_key_exists($this->selectedItem, $this->items)) { |
207 | - $this->selectedItem = $direction === 'UP' |
|
207 | + $this->selectedItem = $direction === 'UP' |
|
208 | 208 | ? end($itemKeys) |
209 | 209 | : reset($itemKeys); |
210 | 210 | } elseif ($this->getSelectedItem()->canSelect()) { |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | $frame->addRows($this->drawMenuItem(new LineBreakItem($this->style->getTitleSeparator()))); |
266 | 266 | } |
267 | 267 | |
268 | - array_map(function ($item, $index) use ($frame) { |
|
268 | + array_map(function($item, $index) use ($frame) { |
|
269 | 269 | $frame->addRows($this->drawMenuItem($item, $index === $this->selectedItem)); |
270 | 270 | }, $this->items, array_keys($this->items)); |
271 | 271 | |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | ? $this->style->getSelectedUnsetCode() |
296 | 296 | : $this->style->getUnselectedUnsetCode(); |
297 | 297 | |
298 | - return array_map(function ($row) use ($setColour, $unsetColour) { |
|
298 | + return array_map(function($row) use ($setColour, $unsetColour) { |
|
299 | 299 | return sprintf( |
300 | 300 | "%s%s%s%s%s%s%s\n", |
301 | 301 | str_repeat(' ', $this->style->getMargin()), |
@@ -87,6 +87,9 @@ discard block |
||
87 | 87 | */ |
88 | 88 | private $currentFrame; |
89 | 89 | |
90 | + /** |
|
91 | + * @param string $title |
|
92 | + */ |
|
90 | 93 | public function __construct( |
91 | 94 | ?string $title, |
92 | 95 | array $items, |
@@ -498,6 +501,9 @@ discard block |
||
498 | 501 | return new Password(new InputIO($this, $this->terminal), $style); |
499 | 502 | } |
500 | 503 | |
504 | + /** |
|
505 | + * @param string $text |
|
506 | + */ |
|
501 | 507 | private function guardSingleLine($text) |
502 | 508 | { |
503 | 509 | if (strpos($text, "\n") !== false) { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace PhpSchool\CliMenu; |
4 | 4 | |
5 | -use PhpSchool\CliMenu\Exception\InvalidInstantiationException; |
|
6 | 5 | use PhpSchool\CliMenu\Terminal\TerminalFactory; |
7 | 6 | use PhpSchool\Terminal\Terminal; |
8 | 7 |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | */ |
240 | 240 | protected function calculateContentWidth() : void |
241 | 241 | { |
242 | - $this->contentWidth = $this->width - ($this->padding * 2); |
|
242 | + $this->contentWidth = $this->width - ($this->padding*2); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | public function getFg() : string |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | public function setMarginAuto() : self |
309 | 309 | { |
310 | 310 | $this->marginAuto = true; |
311 | - $this->margin = floor(($this->terminal->getWidth() - $this->width) / 2); |
|
311 | + $this->margin = floor(($this->terminal->getWidth() - $this->width)/2); |
|
312 | 312 | |
313 | 313 | return $this; |
314 | 314 | } |
@@ -79,11 +79,11 @@ |
||
79 | 79 | |
80 | 80 | public function ask() : InputResult |
81 | 81 | { |
82 | - $this->inputIO->registerControlCallback(InputCharacter::UP, function (string $input) { |
|
82 | + $this->inputIO->registerControlCallback(InputCharacter::UP, function(string $input) { |
|
83 | 83 | return $this->validate($input) ? $input + 1 : $input; |
84 | 84 | }); |
85 | 85 | |
86 | - $this->inputIO->registerControlCallback(InputCharacter::DOWN, function (string $input) { |
|
86 | + $this->inputIO->registerControlCallback(InputCharacter::DOWN, function(string $input) { |
|
87 | 87 | return $this->validate($input) ? $input - 1 : $input; |
88 | 88 | }); |
89 | 89 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $this->emptyRow(); |
37 | 37 | |
38 | 38 | $confirmText = sprintf(' < %s > ', $confirmText); |
39 | - $leftFill = ($promptWidth / 2) - (mb_strlen($confirmText) / 2); |
|
39 | + $leftFill = ($promptWidth/2) - (mb_strlen($confirmText)/2); |
|
40 | 40 | |
41 | 41 | $this->write(sprintf( |
42 | 42 | "%s%s%s%s%s%s%s%s%s\n", |
@@ -3,12 +3,12 @@ |
||
3 | 3 | use PhpSchool\CliMenu\CliMenu; |
4 | 4 | use PhpSchool\CliMenu\CliMenuBuilder; |
5 | 5 | |
6 | -require_once(__DIR__ . '/../vendor/autoload.php'); |
|
6 | +require_once(__DIR__.'/../vendor/autoload.php'); |
|
7 | 7 | |
8 | -$itemCallable = function (CliMenu $menu) { |
|
8 | +$itemCallable = function(CliMenu $menu) { |
|
9 | 9 | $result = $menu->askPassword() |
10 | 10 | ->setPlaceholderText('') |
11 | - ->setValidator(function ($password) { |
|
11 | + ->setValidator(function($password) { |
|
12 | 12 | if ($password === 'password') { |
13 | 13 | $this->setValidationFailedText('Password is too weak'); |
14 | 14 | return false; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | public function addSubMenu(string $id, CliMenuBuilder $subMenuBuilder = null) : CliMenuBuilder |
154 | 154 | { |
155 | - $this->menuItems[] = $id; |
|
155 | + $this->menuItems[] = $id; |
|
156 | 156 | |
157 | 157 | if (null === $subMenuBuilder) { |
158 | 158 | $this->subMenuBuilders[$id] = new static($this); |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | |
295 | 295 | private function itemsHaveExtra(array $items) : bool |
296 | 296 | { |
297 | - return !empty(array_filter($items, function (MenuItemInterface $item) { |
|
297 | + return !empty(array_filter($items, function(MenuItemInterface $item) { |
|
298 | 298 | return $item->showsItemExtra(); |
299 | 299 | })); |
300 | 300 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | |
360 | 360 | private function buildSubMenus(array $items) : array |
361 | 361 | { |
362 | - return array_map(function ($item) { |
|
362 | + return array_map(function($item) { |
|
363 | 363 | if (!is_string($item)) { |
364 | 364 | return $item; |
365 | 365 | } |
@@ -3,9 +3,9 @@ |
||
3 | 3 | use PhpSchool\CliMenu\CliMenu; |
4 | 4 | use PhpSchool\CliMenu\CliMenuBuilder; |
5 | 5 | |
6 | -require_once(__DIR__ . '/../vendor/autoload.php'); |
|
6 | +require_once(__DIR__.'/../vendor/autoload.php'); |
|
7 | 7 | |
8 | -$exit = function (CliMenu $menu) { |
|
8 | +$exit = function(CliMenu $menu) { |
|
9 | 9 | $menu->close(); |
10 | 10 | }; |
11 | 11 |
@@ -3,9 +3,9 @@ discard block |
||
3 | 3 | use PhpSchool\CliMenu\CliMenu; |
4 | 4 | use PhpSchool\CliMenu\CliMenuBuilder; |
5 | 5 | |
6 | -require_once(__DIR__ . '/../vendor/autoload.php'); |
|
6 | +require_once(__DIR__.'/../vendor/autoload.php'); |
|
7 | 7 | |
8 | -$itemCallable = function (CliMenu $menu) { |
|
8 | +$itemCallable = function(CliMenu $menu) { |
|
9 | 9 | echo $menu->getSelectedItem()->getText(); |
10 | 10 | }; |
11 | 11 | |
@@ -16,12 +16,12 @@ discard block |
||
16 | 16 | ->addLineBreak('-') |
17 | 17 | ->addSubMenu('Options') |
18 | 18 | ->setTitle('CLI Menu > Options') |
19 | - ->addItem('First option', function (CliMenu $menu) { |
|
19 | + ->addItem('First option', function(CliMenu $menu) { |
|
20 | 20 | echo sprintf('Executing option: %s', $menu->getSelectedItem()->getText()); |
21 | 21 | }) |
22 | 22 | ->addSubMenu('Secret Options') |
23 | 23 | ->setTitle('CLI Menu > Options > Secret Options') |
24 | - ->addItem('First secret option', function (CliMenu $menu) { |
|
24 | + ->addItem('First secret option', function(CliMenu $menu) { |
|
25 | 25 | echo sprintf('Executing secret option: %s', $menu->getSelectedItem()->getText()); |
26 | 26 | }) |
27 | 27 | ->addLineBreak('-') |
@@ -69,12 +69,12 @@ |
||
69 | 69 | { |
70 | 70 | //y |
71 | 71 | $textLines = count(explode("\n", $this->text)) + 2; |
72 | - $this->y = ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($textLines / 2) + 1; |
|
72 | + $this->y = ceil($this->parentMenu->getCurrentFrame()->count()/2) - ceil($textLines/2) + 1; |
|
73 | 73 | |
74 | 74 | //x |
75 | 75 | $parentStyle = $this->parentMenu->getStyle(); |
76 | - $dialogueHalfLength = (mb_strlen($this->text) + ($this->style->getPadding() * 2)) / 2; |
|
77 | - $widthHalfLength = ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin()); |
|
76 | + $dialogueHalfLength = (mb_strlen($this->text) + ($this->style->getPadding()*2))/2; |
|
77 | + $widthHalfLength = ceil($parentStyle->getWidth()/2 + $parentStyle->getMargin()); |
|
78 | 78 | $this->x = $widthHalfLength - $dialogueHalfLength; |
79 | 79 | } |
80 | 80 |