Merge "StringStream::copyToStream() should adjust the offset"

diff --git a/includes/Rest/CopyableStreamInterface.php b/includes/Rest/CopyableStreamInterface.php
index d271db3..3e18e16 100644 (file)
--- a/includes/Rest/CopyableStreamInterface.php
+++ b/includes/Rest/CopyableStreamInterface.php
@@ -10,6 +10,9 @@ interface CopyableStreamInterface extends \Psr\Http\Message\StreamInterface {
         * Copy this stream to a specified stream resource. For some streams,
         * this can be implemented without a tight loop in PHP code.
         *
+        * Equivalent to reading from the object until EOF and writing the
+        * resulting data to $stream. The position will be advanced to the end.
+        *
         * Note that $stream is not a StreamInterface object.
         *
         * @param resource $stream Destination

diff --git a/includes/Rest/StringStream.php b/includes/Rest/StringStream.php
index 18fb6b1..10ec42d 100644 (file)
--- a/includes/Rest/StringStream.php
+++ b/includes/Rest/StringStream.php
@@ -35,6 +35,7 @@ class StringStream implements CopyableStreamInterface {
                } else {
                        $block = $this->contents;
                }
+               $this->offset = strlen( $this->contents );
                fwrite( $stream, $block );
        }