From 146afe672018d00627ed56ceb02a7a1de88d07f8 Mon Sep 17 00:00:00 2001 From: Tommaso Barbugli Date: Tue, 24 Jun 2014 20:38:21 +0200 Subject: [PATCH] better exception handling --- lib/GetStream/Stream/Feed.php | 7 +++++-- lib/GetStream/Stream/StreamFeedException.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/GetStream/Stream/Feed.php b/lib/GetStream/Stream/Feed.php index 4b962c9..4b7e57d 100644 --- a/lib/GetStream/Stream/Feed.php +++ b/lib/GetStream/Stream/Feed.php @@ -3,7 +3,10 @@ use GuzzleHttp; use GuzzleHttp\Exception\ClientErrorResponseException; +use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ServerErrorResponse; +use \Exception; + class Feed extends BaseFeed { @@ -34,8 +37,8 @@ public function makeHttpRequest($uri, $method, $data = null, $query_params = nul try { $response = $client->send($request); } catch (Exception $e) { - if ($e instanceof ClientErrorResponseException || $e instanceof ServerErrorResponse) { - throw new StreamFeedException($e->getResponse()); + if ($e instanceof ClientErrorResponseException || $e instanceof ServerErrorResponse || $e instanceof ClientException) { + throw new StreamFeedException($e->getResponse()->getBody()); } else { throw $e; } diff --git a/lib/GetStream/Stream/StreamFeedException.php b/lib/GetStream/Stream/StreamFeedException.php index 5bf41b6..8ed22af 100644 --- a/lib/GetStream/Stream/StreamFeedException.php +++ b/lib/GetStream/Stream/StreamFeedException.php @@ -1,6 +1,6 @@