Merge pull request #17 from clue-labs/cleanup

Remove all event listeners when either stream closes

Author: clue

src/ControlCodeParser.php

@@ -46,7 +46,7 @@ public function __construct(ReadableStreamInterface $input)
         $this->input = $input;
 
         if (!$this->input->isReadable()) {
-            $this->close();
+            return $this->close();
         }
 
         $this->input->on('data', array($this, 'handleData'));
@@ -89,6 +89,7 @@ public function close()
         $this->input->close();
 
         $this->emit('close');
+        $this->removeAllListeners();
     }
 
     /** @internal */

tests/ControlCodeParserTest.php

@@ -238,6 +238,16 @@ public function testClosingInputWillCloseParser()
         $this->assertFalse($this->parser->isReadable());
     }
 
+    public function testClosingInputWillRemoveAllDataListeners()
+    {
+        $this->parser->on('data', $this->expectCallableNever());
+
+        $this->input->close();
+
+        $this->assertEquals(array(), $this->input->listeners('data'));
+        $this->assertEquals(array(), $this->parser->listeners('data'));
+    }
+
     public function testClosingParserWillCloseInput()
     {
         $this->input = $this->getMock('React\Stream\ReadableStreamInterface');
@@ -252,6 +262,19 @@ public function testClosingParserWillCloseInput()
         $this->assertFalse($this->parser->isReadable());
     }
 
+    public function testClosingParserWillRemoveAllDataListeners()
+    {
+        $this->input = new ReadableStream();
+        $this->parser = new ControlCodeParser($this->input);
+
+        $this->parser->on('data', $this->expectCallableNever());
+
+        $this->parser->close();
+
+        $this->assertEquals(array(), $this->input->listeners('data'));
+        $this->assertEquals(array(), $this->parser->listeners('data'));
+    }
+
     public function testClosingParserMultipleTimesWillOnlyCloseOnce()
     {
         $this->input = $this->getMock('React\Stream\ReadableStreamInterface');
@@ -275,6 +298,17 @@ public function testPassingClosedInputToParserWillCloseParser()
         $this->assertFalse($this->parser->isReadable());
     }
 
+    public function testPassingClosedInputToParserWillNotAddAnyDataListeners()
+    {
+        $this->input = new ReadableStream();
+        $this->input->close();
+
+        $this->parser = new ControlCodeParser($this->input);
+
+        $this->assertEquals(array(), $this->input->listeners('data'));
+        $this->assertEquals(array(), $this->parser->listeners('data'));
+    }
+
     public function testWillForwardPauseToInput()
     {
         $this->input = $this->getMock('React\Stream\ReadableStreamInterface');