Merge branch 'refs/heads/master' into 0.4

cboden · cboden · commit 6f337232d916 · 2013-07-08T16:26:29.000-04:00
Conflicts:
	CHANGELOG.md
diff --git a/BufferedSink.php b/BufferedSink.php
@@ -4,7 +4,6 @@
 
 use React\Promise\Deferred;
 use React\Promise\PromisorInterface;
-use React\Stream\WritableStream;
 
 class BufferedSink extends WritableStream implements PromisorInterface
 {
@@ -50,7 +49,7 @@ public function promise()
         return $this->deferred->promise();
     }
 
-    public static function createPromise(ReadableStream $stream)
+    public static function createPromise(ReadableStreamInterface $stream)
     {
         $sink = new static();
         $stream->pipe($sink);
diff --git a/CompositeStream.php b/CompositeStream.php
@@ -76,7 +76,7 @@ public function end($data = null)
 
     public function close()
     {
-        $this->pipeSource = true;
+        $this->pipeSource = null;
 
         $this->readable->close();
         $this->writable->close();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use React\Promise\Deferred;`
`6`	`6`	`use React\Promise\PromisorInterface;`
`7`		`-use React\Stream\WritableStream;`
`8`	`7`
`9`	`8`	`class BufferedSink extends WritableStream implements PromisorInterface`
`10`	`9`	`{`
`@@ -50,7 +49,7 @@ public function promise()`
`50`	`49`	`return $this->deferred->promise();`
`51`	`50`	`}`
`52`	`51`
`53`		`- public static function createPromise(ReadableStream $stream)`
	`52`	`+ public static function createPromise(ReadableStreamInterface $stream)`
`54`	`53`	`{`
`55`	`54`	`$sink = new static();`
`56`	`55`	`$stream->pipe($sink);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function end($data = null)`
`76`	`76`
`77`	`77`	`public function close()`
`78`	`78`	`{`
`79`		`- $this->pipeSource = true;`
	`79`	`+ $this->pipeSource = null;`
`80`	`80`
`81`	`81`	`$this->readable->close();`
`82`	`82`	`$this->writable->close();`