Skip to content

Throws NullException for response codes of 500 #119

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

Merged
merged 3 commits into from
Oct 16, 2016
Merged

Throws NullException for response codes of 500 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37647e4
handle missing JSON in body
Jul 13, 2016
c6f4e0b
handle server 500 as NullException errors
Jul 13, 2016
990677e
formatting
Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions lib/Tmdb/Exception/TmdbApiException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,6 @@ class TmdbApiException extends \Exception
const STATUS_INVALID_REQUEST_TOKEN = 33;
const STATUS_RESOURCE_NOT_FOUND = 34;

/**
* @var int
*/
protected $code;

/**
* @var string
*/
protected $message;

/**
* @var Request
*/
Expand All @@ -78,15 +68,16 @@ class TmdbApiException extends \Exception
/**
* Create the exception
*
* @param string $message
* @param int $code
* @param Request|null $request
* @param Response|null $response
* @param int $code
* @param string $message
* @param Request|null $request
* @param Response|null $response
* @param \Exception|null $previous
*/
public function __construct($code, $message, $request = null, $response = null)
public function __construct($code, $message, $request = null, $response = null, \Exception $previous = null)
{
$this->code = $code;
$this->message = $message;
parent::__construct($message, $code, $previous);

$this->request = $request;
$this->response = $response;
}
Expand Down
10 changes: 6 additions & 4 deletions lib/Tmdb/HttpClient/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@ abstract class AbstractAdapter implements AdapterInterface
*
* @param Request $request
* @param Response $response
* @param \Exception $previous
* @return TmdbApiException
*/
protected function createApiException(Request $request, Response $response)
protected function createApiException(Request $request, Response $response, \Exception $previous= null)
{
$errors = json_decode((string) $response->getBody());

return new TmdbApiException(
$errors->status_code,
$errors->status_message,
isset($errors->status_code) ? $errors->status_code : $response->getCode(),
isset($errors->status_message) ? $errors->status_message : null,
$request,
$response
$response,
$previous
);
}
}
10 changes: 8 additions & 2 deletions lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,14 @@ private function createResponse(ResponseInterface $adapterResponse = null)
*/
protected function handleRequestException(Request $request, RequestException $previousException)
{
if (null !== $previousException && null == $previousException->getResponse()) {
throw new NullResponseException($this->request, $previousException);
if (null !== $previousException) {
$response = $previousException->getResponse();
if(null == $response) {
throw new NullResponseException($this->request, $previousException);
}
if($response->getStatusCode() >= 500 && $response->getStatusCode() <= 599) {
throw new NullResponseException($this->request, $previousException);
}
}

throw $this->createApiException(
Expand Down
23 changes: 23 additions & 0 deletions test/Tmdb/Tests/HttpClient/Adapter/GuzzleAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,29 @@ public function shouldThrowNullResponseException()
$adapter->get(new Request());
}

/**
* @expectedException \Tmdb\Exception\NullResponseException
* @test
*/
public function shouldThrowExceptionForServerError()
{
$client = $this->getMock('GuzzleHttp\ClientInterface');

$client->expects($this->once())
->method('get')
->will($this->throwException(
new RequestException(
'500',
new \GuzzleHttp\Message\Request('get', '/'),
new \GuzzleHttp\Message\Response(500, [], Stream::factory('<html><body>Internal Server Error</body></html>'))
)
))
;

$adapter = new GuzzleAdapter($client);
$adapter->get(new Request());
}

/**
* @test
*/
Expand Down