Simplify interaction between Stream and Buffer

src/Stream.php

@@ -63,9 +63,10 @@ public function __construct($stream, LoopInterface $loop, WritableStreamInterfac
 
         $this->buffer->on('error', function ($error) use ($that) {
             $that->emit('error', array($error, $that));
-            $that->close();
         });
 
+        $this->buffer->on('close', array($this, 'close'));
+
         $this->buffer->on('drain', function () use ($that) {
             $that->emit('drain', array($that));
         });
@@ -118,7 +119,7 @@ public function close()
         $this->emit('end', array($this));
         $this->emit('close', array($this));
         $this->loop->removeStream($this->stream);
-        $this->buffer->removeAllListeners();
+        $this->buffer->close();
         $this->removeAllListeners();
 
         $this->handleClose();
@@ -135,8 +136,6 @@ public function end($data = null)
         $this->readable = false;
         $this->writable = false;
 
-        $this->buffer->on('close', array($this, 'close'));
-
         $this->buffer->end($data);
     }