Merge pull request #88 from clue-labs/fix-close

Fix closing to emit final close event and clean up all listeners

Author: clue

src/Readline.php

@@ -1012,5 +1012,6 @@ public function close()
         $this->input->close();
 
         $this->emit('close');
+        $this->removeAllListeners();
     }
 }

src/Stdio.php

@@ -192,10 +192,11 @@ public function close()
         $this->ending = true;
         $this->closed = true;
 
-        // clear readline output and then close
-        $this->readline->setInput('')->setPrompt('');
         $this->input->close();
         $this->output->close();
+
+        $this->emit('close');
+        $this->removeAllListeners();
     }
 
     /**

tests/ReadlineTest.php

@@ -286,6 +286,16 @@ public function testEndInputWithIncompleteLineOnCtrlD()
         $this->input->emit('data', array("hello\x04"));
     }
 
+    public function testCloseWillEmitCloseEventAndCloseInputStream()
+    {
+        $this->input->on('close', $this->expectCallableOnce());
+        $this->readline->on('close', $this->expectCallableOnce());
+
+        $this->readline->close();
+
+        $this->assertEquals(array(), $this->readline->listeners('close'));
+    }
+
     public function testWriteSimpleCharWritesOnce()
     {
         $this->output->expects($this->once())->method('write')->with($this->equalTo("\r\033[K" . "k"));

tests/StdioTest.php

@@ -285,7 +285,7 @@ public function testWritableWillBeForwardedToOutput()
         $this->assertTrue($stdio->isWritable());
     }
 
-    public function testCloseWillCloseInputAndOutput()
+    public function testCloseWillEmitCloseEventAndCloseInputAndOutput()
     {
         $input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
@@ -295,13 +295,17 @@ public function testCloseWillCloseInputAndOutput()
 
         $stdio = new Stdio($this->loop, $input, $output, $readline);
 
+        $stdio->on('close', $this->expectCallableOnce());
+
         $input->expects($this->once())->method('close');
         $output->expects($this->once())->method('close');
 
         $stdio->close();
+
+        $this->assertEquals(array(), $stdio->listeners('close'));
     }
 
-    public function testCloseTwiceWillCloseInputAndOutputOnlyOnce()
+    public function testCloseTwiceWillEmitCloseEventAndCloseInputAndOutputOnlyOnce()
     {
         $input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
@@ -311,20 +315,23 @@ public function testCloseTwiceWillCloseInputAndOutputOnlyOnce()
 
         $stdio = new Stdio($this->loop, $input, $output, $readline);
 
+        $stdio->on('close', $this->expectCallableOnce());
+
         $input->expects($this->once())->method('close');
         $output->expects($this->once())->method('close');
 
         $stdio->close();
         $stdio->close();
     }
 
-    public function testEndWillCloseInputAndEndOutput()
+    public function testEndWillClearReadlineAndCloseInputAndEndOutput()
     {
         $input = $this->getMockBuilder('React\Stream\ReadableStreamInterface')->getMock();
         $output = $this->getMockBuilder('React\Stream\WritableStreamInterface')->getMock();
 
-        //$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
-        $readline = new Readline($input, $output);
+        $readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
+        $readline->expects($this->once())->method('setPrompt')->with('')->willReturnSelf();
+        $readline->expects($this->once())->method('setInput')->with('')->willReturnSelf();
 
         $stdio = new Stdio($this->loop, $input, $output, $readline);