From: Tim Starling <tstarling@wikimedia.org>
Date: Mon, 3 Jun 2019 06:10:44 +0000 (+1000)
Subject: StringStream::copyToStream() should adjust the offset
X-Git-Tag: 1.34.0-rc.0~1409^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=e8f90b8a265c4f749843d03ae38c5a990e53f63a;p=lhc%2Fweb%2Fwiklou.git

StringStream::copyToStream() should adjust the offset

As Stream is assumed to do.

Change-Id: I25ed0da8e8ca1b4393f88e64ecf7b96484ce8118
---

diff --git a/includes/Rest/CopyableStreamInterface.php b/includes/Rest/CopyableStreamInterface.php
index d271db3690..3e18e165f2 100644
--- 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 18fb6b1812..10ec42dbf0 100644
--- 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 );
 	}