Inject Buffer into Stream

reactphp · Nov 13, 2016 · 8cc22ba · 8cc22ba
1 parent d475b9e
commit 8cc22ba
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Stream.php b/src/Stream.php
@@ -33,7 +33,7 @@ class Stream extends EventEmitter implements DuplexStreamInterface
     protected $loop;
     protected $buffer;
 
-    public function __construct($stream, LoopInterface $loop)
+    public function __construct($stream, LoopInterface $loop, WritableStreamInterface $buffer = null)
     {
         $this->stream = $stream;
         if (!is_resource($this->stream) || get_resource_type($this->stream) !== "stream") {
@@ -52,8 +52,12 @@ public function __construct($stream, LoopInterface $loop)
             stream_set_read_buffer($this->stream, 0);
         }
 
+        if ($buffer === null) {
+            $buffer = new Buffer($stream, $loop);
+        }
+
         $this->loop = $loop;
-        $this->buffer = new Buffer($this->stream, $this->loop);
+        $this->buffer = $buffer;
 
         $that = $this;
 
@@ -182,6 +186,9 @@ public function handleClose()
         }
     }
 
+    /**
+     * @return WritableStreamInterface|Buffer
+     */
     public function getBuffer()
     {
         return $this->buffer;

diff --git a/tests/StreamTest.php b/tests/StreamTest.php
@@ -28,6 +28,21 @@ public function testConstructorThrowsExceptionOnInvalidStream()
         $conn = new Stream('breakme', $loop);
     }
 
+    /**
+     * @covers React\Stream\Stream::__construct
+     */
+    public function testConstructorAcceptsBuffer()
+    {
+        $stream = fopen('php://temp', 'r+');
+        $loop = $this->createLoopMock();
+
+        $buffer = $this->getMock('React\Stream\WritableStreamInterface');
+
+        $conn = new Stream($stream, $loop, $buffer);
+
+        $this->assertSame($buffer, $conn->getBuffer());
+    }
+
     /**
      * @covers React\Stream\Stream::__construct
      * @covers React\Stream\Stream::handleData