Merge pull request #22 from arnaud-lb/write-in-drain

Fixed double-writes when write() is called during 'drain' event

Author: cboden

src/Buffer.php

@@ -111,12 +111,12 @@ public function handleWrite()
         }
 
         $len = strlen($this->data);
+        $this->data = (string) substr($this->data, $sent);
+
         if ($len >= $this->softLimit && $len - $sent < $this->softLimit) {
             $this->emit('drain', array($this));
         }
 
-        $this->data = (string) substr($this->data, $sent);
-
         if (0 === strlen($this->data)) {
             $this->loop->removeWriteStream($this->stream);
             $this->listening = false;

tests/BufferTest.php

@@ -94,6 +94,36 @@ public function testDrain()
         $buffer->write("bar\n");
     }
 
+    /**
+     * @covers React\Stream\Buffer::write
+     * @covers React\Stream\Buffer::handleWrite
+     */
+    public function testWriteInDrain()
+    {
+        $writeStreams = array();
+
+        $stream = fopen('php://temp', 'r+');
+        $loop = $this->createWriteableLoopMock();
+        $loop->preventWrites = true;
+
+        $buffer = new Buffer($stream, $loop);
+        $buffer->softLimit = 2;
+        $buffer->on('error', $this->expectCallableNever());
+
+        $buffer->once('drain', function ($buffer) {
+            $buffer->listening = false;
+            $buffer->write("bar\n");
+        });
+
+        $this->assertFalse($buffer->write("foo"));
+        $loop->preventWrites = false;
+        $buffer->listening = false;
+        $buffer->write("\n");
+
+        fseek($stream, 0);
+        $this->assertSame("foo\nbar\n", stream_get_contents($stream));
+    }
+
     /**
      * @covers React\Stream\Buffer::end
      */