Emit final data when input ends (EOF without EOL)

Author: clue

examples/01-periodic.php

@@ -16,8 +16,8 @@
 });
 
 // react to commands the user entered
-$stdio->on('line', function ($line) use ($stdio, $loop, $timer) {
-    $stdio->writeln('you just said: ' . $line . ' (' . strlen($line) . ')');
+$stdio->on('data', function ($line) use ($stdio, $loop, $timer) {
+    $stdio->writeln('you just said: ' . addcslashes($line, "\0..\37") . ' (' . strlen($line) . ')');
 
     $loop->cancelTimer($timer);
     $stdio->end();

src/Readline.php

@@ -47,7 +47,8 @@ public function __construct(ReadableStreamInterface $input, WritableStreamInterf
             "\n" => 'onKeyEnter',
             "\x7f" => 'onKeyBackspace',
             "\t" => 'onKeyTab',
-            "\x04" => 'closeInput', // CTRL+D
+
+            "\x04" => 'handleEnd', // CTRL+D
 
             "\033[A" => 'onKeyUp',
             "\033[B" => 'onKeyDown',
@@ -804,6 +805,10 @@ public function strwidth($str)
     /** @internal */
     public function handleEnd()
     {
+        if ($this->linebuffer !== '') {
+            $this->processLine();
+        }
+
         if (!$this->closed) {
             $this->emit('end');
             $this->close();
@@ -839,14 +844,6 @@ public function pipe(WritableStreamInterface $dest, array $options = array())
         return $dest;
     }
 
-    public function closeInput()
-    {
-        if ($this->linebuffer !== '') {
-            $this->processLine();
-        }
-        $this->handleEnd();
-    }
-
     public function close()
     {
         if ($this->closed) {

tests/ReadlineTest.php

@@ -981,9 +981,22 @@ public function testEmitErrorWillEmitErrorAndClose()
 
     public function testEmitEndWillEmitEndAndClose()
     {
+        $this->readline->on('data', $this->expectCallableNever());
+        $this->readline->on('end', $this->expectCallableOnce());
+        $this->readline->on('close', $this->expectCallableOnce());
+
+        $this->input->emit('end');
+
+        $this->assertFalse($this->readline->isReadable());
+    }
+
+    public function testEmitEndAfterDataWillEmitDataAndEndAndClose()
+    {
+        $this->readline->on('data', $this->expectCallableOnce('hello'));
         $this->readline->on('end', $this->expectCallableOnce());
         $this->readline->on('close', $this->expectCallableOnce());
 
+        $this->input->emit('data', array('hello'));
         $this->input->emit('end');
 
         $this->assertFalse($this->readline->isReadable());