Merge pull request #78 from clue-labs/resetty

Fix restoring TTY mode when ext-readline is not in use

Author: clue

src/Stdio.php

@@ -291,7 +291,7 @@ private function createStdin(LoopInterface $loop)
         }
 
         if ($this->isTty()) {
-            $this->originalTtyMode = shell_exec('stty -g');
+            $this->originalTtyMode = rtrim(shell_exec('stty -g'), PHP_EOL);
 
             // Disable icanon (so we can fread each keypress) and echo (we'll do echoing here instead)
             shell_exec('stty -icanon -echo');

tests/FunctionalExampleTest.php

@@ -87,6 +87,20 @@ public function testStubCanCloseStdoutAndIsNotWritable()
         $this->assertEquals('', $output);
     }
 
+    public function testStubCanEndWithoutOutput()
+    {
+        $output = $this->execExample('php ../tests/stub/04-end.php');
+
+        $this->assertEquals('', $output);
+    }
+
+    public function testStubCanEndWithoutExtensions()
+    {
+        $output = $this->execExample('php -n ../tests/stub/04-end.php');
+
+        $this->assertEquals('', $output);
+    }
+
     public function testPeriodicExampleViaInteractiveModeQuitsImmediately()
     {
         if (defined('HHVM_VERSION')) {

tests/stub/04-end.php

@@ -0,0 +1,12 @@
+<?php
+
+use Clue\React\Stdio\Stdio;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$loop = React\EventLoop\Factory::create();
+
+$stdio = new Stdio($loop);
+$stdio->end();
+
+$loop->run();