Merge pull request #85 from clue-labs/tests

Improve test suite to test against legacy PHP 5.3 through PHP 7.3 and support PHPUnit 7

Author: clue

.travis.yml

@@ -5,7 +5,10 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
   - hhvm # ignore errors, see below
 
 # lock distro so future defaults will not break the build

composer.json

@@ -26,7 +26,7 @@
     "require-dev": {
         "clue/arguments": "^2.0",
         "clue/commander": "^1.2",
-        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+        "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
     },
     "config": {
         "sort-packages": true

src/Readline.php

@@ -61,7 +61,7 @@ public function __construct(ReadableStreamInterface $input, WritableStreamInterf
             "\033[D" => 'onKeyLeft',
 
             "\033[1~" => 'onKeyHome',
-            "\033[2~" => 'onKeyInsert',
+//          "\033[2~" => 'onKeyInsert',
             "\033[3~" => 'onKeyDelete',
             "\033[4~" => 'onKeyEnd',
 
@@ -547,12 +547,6 @@ public function onKeyDelete()
         $this->deleteChar($this->linepos);
     }
 
-    /** @internal */
-    public function onKeyInsert()
-    {
-        // TODO: toggle insert mode
-    }
-
     /** @internal */
     public function onKeyHome()
     {
@@ -838,6 +832,11 @@ protected function processLine($eol)
         $this->emit('data', array($line . $eol));
     }
 
+    /**
+     * @param string $str
+     * @return int
+     * @codeCoverageIgnore
+     */
     private function strlen($str)
     {
         // prefer mb_strlen() if available
@@ -849,6 +848,13 @@ private function strlen($str)
         return strlen(preg_replace('/./us', '.', $str));
     }
 
+    /**
+     * @param string $str
+     * @param int    $start
+     * @param ?int   $len
+     * @return string
+     * @codeCoverageIgnore
+     */
     private function substr($str, $start = 0, $len = null)
     {
         if ($len === null) {
@@ -866,7 +872,12 @@ private function substr($str, $start = 0, $len = null)
         return implode('', array_slice($matches[0], $start, $len));
     }
 
-    /** @internal */
+    /**
+     * @internal
+     * @param string $str
+     * @return int
+     * @codeCoverageIgnore
+     */
     public function strwidth($str)
     {
         // prefer mb_strwidth() if available
@@ -891,6 +902,10 @@ public function strwidth($str)
         ));
     }
 
+    /**
+     * @param string $str
+     * @return string[]
+     */
     private function strsplit($str)
     {
         return preg_split('//u', $str, null, PREG_SPLIT_NO_EMPTY);