Inject input and output stream into Stdio (DI)

Author: clue

src/Stdio.php

@@ -2,11 +2,10 @@
 
 namespace Clue\React\Stdio;
 
-use React\Stream\StreamInterface;
 use React\Stream\CompositeStream;
 use React\EventLoop\LoopInterface;
-use React\Stream\ReadableStream;
-use React\Stream\Stream;
+use React\Stream\ReadableStreamInterface;
+use React\Stream\WritableStreamInterface;
 
 class Stdio extends CompositeStream
 {
@@ -16,13 +15,23 @@ class Stdio extends CompositeStream
     private $readline;
     private $needsNewline = false;
 
-    public function __construct(LoopInterface $loop, $input = true)
+    public function __construct(LoopInterface $loop, ReadableStreamInterface $input = null, WritableStreamInterface $output = null, Readline $readline = null)
     {
-        $this->input = new Stdin($loop);
+        if ($input === null) {
+            $input = new Stdin($loop);
+        }
+
+        if ($output === null) {
+            $output = new Stdout(STDOUT);
+        }
 
-        $this->output = new Stdout(STDOUT);
+        if ($readline === null) {
+            $readline = new Readline($input, $output);
+        }
 
-        $this->readline = new Readline($this->input, $this->output);
+        $this->input = $input;
+        $this->output = $output;
+        $this->readline = $readline;
 
         $that = $this;
 
@@ -35,10 +44,6 @@ public function __construct(LoopInterface $loop, $input = true)
         $this->readline->on('data', function($line) use ($that) {
             $that->emit('line', array($line, $that));
         });
-
-        if (!$input) {
-            $this->pause();
-        }
     }
 
     public function pause()

tests/StdioTest.php

@@ -2,6 +2,7 @@
 
 use React\EventLoop\Factory;
 use Clue\React\Stdio\Stdio;
+use Clue\React\Stdio\Readline;
 
 class StdioTest extends TestCase
 {
@@ -12,8 +13,24 @@ public function setUp()
         $this->loop = Factory::create();
     }
 
-    public function testCtor()
+    public function testCtorDefaultArgs()
     {
         $stdio = new Stdio($this->loop);
+        $stdio->close();
+    }
+
+    public function testCtorArgsWillBeReturnedByGetters()
+    {
+        $input = $this->getMock('React\Stream\ReadableStreamInterface');
+        $output = $this->getMock('React\Stream\WritableStreamInterface');
+
+        //$readline = $this->getMockBuilder('Clue\React\Stdio\Readline')->disableOriginalConstructor()->getMock();
+        $readline = new Readline($input, $output);
+
+        $stdio = new Stdio($this->loop, $input, $output, $readline);
+
+        $this->assertSame($input, $stdio->getInput());
+        $this->assertSame($output, $stdio->getOutput());
+        $this->assertSame($readline, $stdio->getReadline());
     }
 }