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.

Sign up for GitHub

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

Jump to bottom

RequestException - check if readable before access #2081

Merged
merged 6 commits into from Aug 8, 2018
Merged

RequestException - check if readable before access #2081

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e68fb5c
check if readable before access
SpacePossum May 31, 2018
ca2e155
Add unit tests for RequestException::getResponseBodySummary
SpacePossum Jun 22, 2018
94af1d8
use real object in test
SpacePossum Jun 25, 2018
90af282
update test for older PHP version support
SpacePossum Jul 2, 2018
92a8c66
remove no longer used imports
SpacePossum Jul 2, 2018
a64cdc5
Update RequestExceptionTest.php
SpacePossum Jul 28, 2018
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
View file
Open in desktop
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
34 changes: 34 additions & 0 deletions tests/Exception/RequestExceptionTest.php
View file
Open in desktop
Expand Up @@ -5,6 +5,8 @@
use GuzzleHttp\Psr7\Request;
use GuzzleHttp\Psr7\Response;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;

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

public function testGetResponseBodySummaryOfNonReadableStream()
{
$stream = $this->prophesize(StreamInterface::class);
SpacePossum marked this conversation as resolved.
Show resolved Hide resolved
$stream->isSeekable()->willReturn(true);
$stream->isReadable()->willReturn(false);

$response = $this->prophesize(ResponseInterface::class);
$response->getBody()->willReturn($stream->reveal());

$this->assertNull(RequestException::getResponseBodySummary($response->reveal()));
}

public function testGetResponseBodySummary()
{
$message = 'PHPUnit test response';

$stream = $this->prophesize(StreamInterface::class);
$stream->isSeekable()->willReturn(true);
$stream->isReadable()->willReturn(true);
$stream->getSize()->willReturn(strlen($message));
$stream->read(120)->willReturn($message);
$stream->rewind()->willReturn();

$response = $this->prophesize(ResponseInterface::class);
$response->getBody()->willReturn($stream->reveal());

$this->assertSame(
$message,
RequestException::getResponseBodySummary($response->reveal())
);
}
}