Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RequestException - check if readable before access #2081

Merged
merged 6 commits into from Aug 8, 2018
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Exception/RequestException.php
Expand Up @@ -126,7 +126,7 @@ public static function getResponseBodySummary(ResponseInterface $response)
{
$body = $response->getBody();

if (!$body->isSeekable()) {
if (!$body->isSeekable() || !$body->isReadable()) {
return null;
}

Expand Down
27 changes: 27 additions & 0 deletions tests/Exception/RequestExceptionTest.php
Expand Up @@ -4,6 +4,7 @@
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Psr7\Stream;
use PHPUnit\Framework\TestCase;

/**
Expand Down Expand Up @@ -174,4 +175,30 @@ public function testObfuscateUrlWithUsernameAndPassword()
$e = RequestException::create($r, new Response(500));
$this->assertContains('http://user:***@www.oo.com', $e->getMessage());
}

public function testGetResponseBodySummaryOfNonReadableStream()
{
$stream = new ReadSeekOnlyStream();
$stream->detach();
SpacePossum marked this conversation as resolved.
Show resolved Hide resolved
$response = new Response(500, [], $stream);
$this->assertNull(RequestException::getResponseBodySummary($response));
}
}

final class ReadSeekOnlyStream extends Stream
{
public function __construct()
{
parent::__construct(fopen('php://memory', 'wb'));
}

public function isSeekable()
{
return true;
}

public function isReadable()
{
return false;
}
}