Only switch handled controls

Author: AydinHassan

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "php" : ">=7.1",
         "beberlei/assert": "^2.4",
-        "php-school/terminal": "dev-master",
+        "php-school/terminal": "dev-catch-all-controls",
         "ext-posix": "*"
     },
     "autoload" : {

src/CliMenu.php

@@ -174,7 +174,7 @@ private function display() : void
         ]);
 
         while ($this->isOpen() && $char = $reader->readCharacter()) {
-            if ($char->isNotControl()) {
+            if (!$char->isHandledControl()) {
                 continue;
             }
 

src/Input/InputIO.php

@@ -57,27 +57,29 @@ public function collect(Input $input) : InputResult
                 continue;
             }
 
-            switch ($char->getControl()) {
-                case InputCharacter::ENTER:
-                    if ($input->validate($inputValue)) {
+            if ($char->isHandledControl()) {
+                switch ($char->getControl()) {
+                    case InputCharacter::ENTER:
+                        if ($input->validate($inputValue)) {
+                            $this->parentMenu->redraw();
+                            return new InputResult($inputValue);
+                        } else {
+                            $this->drawInputWithError($input, $inputValue);
+                            continue 2;
+                        }
+
+                    case InputCharacter::BACKSPACE:
+                        $inputValue = substr($inputValue, 0, -1);
                         $this->parentMenu->redraw();
-                        return new InputResult($inputValue);
-                    } else {
-                        $this->drawInputWithError($input, $inputValue);
+                        $this->drawInput($input, $inputValue);
                         continue 2;
-                    }
-
-                case InputCharacter::BACKSPACE:
-                    $inputValue = substr($inputValue, 0, -1);
-                    $this->parentMenu->redraw();
-                    $this->drawInput($input, $inputValue);
-                    continue 2;
-            }
+                }
 
-            if (!empty($this->callbacks[$char->getControl()])) {
-                foreach ($this->callbacks[$char->getControl()] as $callback) {
-                    $inputValue = $callback($inputValue);
-                    $this->drawInput($input, $inputValue);
+                if (!empty($this->callbacks[$char->getControl()])) {
+                    foreach ($this->callbacks[$char->getControl()] as $callback) {
+                        $inputValue = $callback($inputValue);
+                        $this->drawInput($input, $inputValue);
+                    }
                 }
             }
         }