Merge pull request #449 from guzzle/merge-1.x

Merge 1.x -> master

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   for backwards compatibility. Callers relying on the exception being thrown to detect invalid
   URIs should catch the new exception.
 
+### Fixed
+
+- Return `null` in caching stream size if remote size is `null`
+
 ## 2.0.0 - 2021-06-30
 
 Identical to the RC release.

src/CachingStream.php

@@ -36,7 +36,13 @@ public function __construct(
 
     public function getSize(): ?int
     {
-        return max($this->stream->getSize(), $this->remoteStream->getSize());
+        $remoteSize = $this->remoteStream->getSize();
+
+        if (null === $remoteSize) {
+            return null;
+        }
+
+        return max($this->stream->getSize(), $remoteSize);
     }
 
     public function rewind(): void

tests/CachingStreamTest.php

@@ -31,13 +31,22 @@ protected function tearDown(): void
         $this->body->close();
     }
 
-    public function testUsesRemoteSizeIfPossible(): void
+    public function testUsesRemoteSizeIfAvailable(): void
     {
         $body = Psr7\Utils::streamFor('test');
         $caching = new CachingStream($body);
         self::assertSame(4, $caching->getSize());
     }
 
+    public function testUsesRemoteSizeIfNotAvailable(): void
+    {
+        $body = new Psr7\PumpStream(function () {
+            return 'a';
+        });
+        $caching = new CachingStream($body);
+        self::assertNull($caching->getSize());
+    }
+
     public function testReadsUntilCachedToByte(): void
     {
         $this->body->seek(5);