Merge pull request #246 from jmalloc/stream-drain-event

igorw · igorw · commit 0c8eaecff4f0 · 2014-02-02T08:18:48.000-08:00
[Stream] Pass the stream as final parameter on 'drain'.
diff --git a/src/React/Stream/Buffer.php b/src/React/Stream/Buffer.php
@@ -78,13 +78,13 @@ public function close()
         $this->listening = false;
         $this->data = '';
 
-        $this->emit('close');
+        $this->emit('close', [$this]);
     }
 
     public function handleWrite()
     {
         if (!is_resource($this->stream) || ('generic_socket' === $this->meta['stream_type'] && feof($this->stream))) {
-            $this->emit('error', array(new \RuntimeException('Tried to write to closed or invalid stream.')));
+            $this->emit('error', array(new \RuntimeException('Tried to write to closed or invalid stream.'), $this));
 
             return;
         }
@@ -96,20 +96,23 @@ public function handleWrite()
         restore_error_handler();
 
         if (false === $sent) {
-            $this->emit('error', array(new \ErrorException(
-                $this->lastError['message'],
-                0,
-                $this->lastError['number'],
-                $this->lastError['file'],
-                $this->lastError['line']
-            )));
+            $this->emit('error', array(
+                new \ErrorException(
+                    $this->lastError['message'],
+                    0,
+                    $this->lastError['number'],
+                    $this->lastError['file'],
+                    $this->lastError['line']
+                ),
+                $this
+            ));
 
             return;
         }
 
         $len = strlen($this->data);
         if ($len >= $this->softLimit && $len - $sent < $this->softLimit) {
-            $this->emit('drain');
+            $this->emit('drain', [$this]);
         }
 
         $this->data = (string) substr($this->data, $sent);
@@ -118,7 +121,7 @@ public function handleWrite()
             $this->loop->removeWriteStream($this->stream);
             $this->listening = false;
 
-            $this->emit('full-drain');
+            $this->emit('full-drain', [$this]);
         }
     }
 
diff --git a/src/React/Stream/Stream.php b/src/React/Stream/Stream.php
@@ -27,7 +27,7 @@ public function __construct($stream, LoopInterface $loop)
         });
 
         $this->buffer->on('drain', function () {
-            $this->emit('drain');
+            $this->emit('drain', array($this));
         });
 
         $this->resume();
diff --git a/src/React/Stream/ThroughStream.php b/src/React/Stream/ThroughStream.php
@@ -19,13 +19,13 @@ public function filter($data)
 
     public function write($data)
     {
-        $this->readable->emit('data', array($this->filter($data)));
+        $this->readable->emit('data', array($this->filter($data), $this));
     }
 
     public function end($data = null)
     {
         if (null !== $data) {
-            $this->readable->emit('data', array($this->filter($data)));
+            $this->readable->emit('data', array($this->filter($data), $this));
         }
 
         $this->writable->end($data);

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ public function filter($data)`
`19`	`19`
`20`	`20`	`public function write($data)`
`21`	`21`	`{`
`22`		`- $this->readable->emit('data', array($this->filter($data)));`
	`22`	`+ $this->readable->emit('data', array($this->filter($data), $this));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function end($data = null)`
`26`	`26`	`{`
`27`	`27`	`if (null !== $data) {`
`28`		`- $this->readable->emit('data', array($this->filter($data)));`
	`28`	`+ $this->readable->emit('data', array($this->filter($data), $this));`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`$this->writable->end($data);`