RequestException - check if readable before access (#2081)

* check if readable before access * Add unit tests for RequestException::getResponseBodySummary * use real object in test * update test for older PHP version support * remove no longer used imports * Update RequestExceptionTest.php
guzzle · Aug 8, 2018 · 5c7a5c5 · 5c7a5c5
1 parent 572593a
commit 5c7a5c5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Exception/RequestException.php b/src/Exception/RequestException.php
@@ -126,7 +126,7 @@ public static function getResponseBodySummary(ResponseInterface $response)
     {
         $body = $response->getBody();
 
-        if (!$body->isSeekable()) {
+        if (!$body->isSeekable() || !$body->isReadable()) {
             return null;
         }
 

diff --git a/tests/Exception/RequestExceptionTest.php b/tests/Exception/RequestExceptionTest.php
@@ -4,6 +4,7 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Stream;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -174,4 +175,27 @@ public function testObfuscateUrlWithUsernameAndPassword()
         $e = RequestException::create($r, new Response(500));
         $this->assertContains('http://user:***@www.oo.com', $e->getMessage());
     }
+
+    public function testGetResponseBodySummaryOfNonReadableStream()
+    {
+        $this->assertNull(RequestException::getResponseBodySummary(new Response(500, [], new ReadSeekOnlyStream())));
+    }
+}
+
+final class ReadSeekOnlyStream extends Stream
+{
+    public function __construct()
+    {
+        parent::__construct(fopen('php://memory', 'wb'));
+    }
+
+    public function isSeekable()
+    {
+        return true;
+    }
+
+    public function isReadable()
+    {
+        return false;
+    }
 }