Merge pull request #5 from php-school/catch-all-controls

Catch all controls

Author: AydinHassan

src/InputCharacter.php

@@ -48,12 +48,17 @@ public function __construct(string $data)
         $this->data = $data;
     }
 
+    public function isHandledControl() : bool
+    {
+        return isset(static::$controls[$this->data]);
+    }
+
     /**
      * Is this character a control sequence?
      */
     public function isControl() : bool
     {
-        return isset(static::$controls[$this->data]);
+        return preg_match('/[\x00-\x1F\x7F]/', $this->data);
     }
 
     /**

test/InputCharacterTest.php

@@ -15,6 +15,7 @@ public function testWhenCharacterIsAControl() : void
         $char = new InputCharacter("\n");
 
         self::assertTrue($char->isControl());
+        self::assertTrue($char->isHandledControl());
         self::assertFalse($char->isNotControl());
         self::assertEquals('ENTER', $char->getControl());
         self::assertEquals("\n", $char->get());
@@ -26,6 +27,7 @@ public function testWhenCharacterIsNotAControl() : void
         $char = new InputCharacter('p');
 
         self::assertFalse($char->isControl());
+        self::assertFalse($char->isHandledControl());
         self::assertTrue($char->isNotControl());
         self::assertEquals('p', $char->get());
         self::assertEquals('p', $char->__toString());
@@ -83,4 +85,28 @@ public function testControlExists() : void
         self::assertTrue(InputCharacter::controlExists(InputCharacter::UP));
         self::assertFalse(InputCharacter::controlExists('w'));
     }
+
+    public function testIsControlOnNotExplicitlyHandledControls() : void
+    {
+        $char = new InputCharacter("\016"); //ctrl + p (I think)
+
+        self::assertTrue($char->isControl());
+        self::assertFalse($char->isHandledControl());
+
+        $char = new InputCharacter("\021"); //ctrl + u (I think)
+
+        self::assertTrue($char->isControl());
+        self::assertFalse($char->isHandledControl());
+    }
+
+    public function testUnicodeCharacter() : void
+    {
+        $char = new InputCharacter('ß');
+
+        self::assertFalse($char->isControl());
+        self::assertFalse($char->isHandledControl());
+        self::assertTrue($char->isNotControl());
+        self::assertEquals('ß', $char->get());
+        self::assertEquals('ß', $char->__toString());
+    }
 }