catch http error response in the debugger, otherwise the response is …

…null
rafrsr · Jun 30, 2016 · 398a1c1 · 398a1c1
1 parent 0065498
commit 398a1c1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/src/ApiInterface.php b/src/ApiInterface.php
@@ -11,6 +11,7 @@
 
 namespace Rafrsr\GenericApi;
 
+use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\ResponseInterface;
 use Rafrsr\GenericApi\Exception\ApiException;
 
@@ -52,6 +53,7 @@ public function isModeLive();
      *
      * @return ResponseInterface|mixed
      * @throws ApiException if any other kind of error is happened before or after the request is sent
+     * @throws GuzzleException if any error happen in the communication
      */
     public function process(ApiServiceInterface $service);
 }
diff --git a/src/Debug/ApiDebugger.php b/src/Debug/ApiDebugger.php
@@ -39,9 +39,11 @@ public function beginRequestProcess(RequestInterface $request)
      * @param RequestProcess    $process
      * @param ResponseInterface $response
      */
-    public function finishRequestProcess(RequestProcess $process, ResponseInterface $response)
+    public function finishRequestProcess(RequestProcess $process, ResponseInterface $response = null)
     {
-        $process->setResponse($response);
+        if ($response) {
+            $process->setResponse($response);
+        }
         $this->requestStack[] = $process;
     }
 

diff --git a/src/GenericApi.php b/src/GenericApi.php
@@ -12,10 +12,9 @@
 namespace Rafrsr\GenericApi;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
 use Psr\Http\Message\ResponseInterface;
 use Rafrsr\GenericApi\Debug\ApiDebugger;
-use Rafrsr\GenericApi\Debug\RequestProcess;
-use Rafrsr\GenericApi\Debug\RequestProcessStack;
 use Rafrsr\GenericApi\Event\OnResponseEvent;
 use Rafrsr\GenericApi\Event\PreBuildRequestEvent;
 use Rafrsr\GenericApi\Event\PreSendRequestEvent;
@@ -144,14 +143,28 @@ public function process(ApiServiceInterface $service)
 
         $this->getEventDispatcher()->dispatch(self::EVENT_PRE_SEND_REQUEST, new PreSendRequestEvent($this, $service, $request));
 
+        $debugProcess = null;
         if ($this->debugger) {
-            $process = $this->debugger->beginRequestProcess($request);
+            $debugProcess = $this->debugger->beginRequestProcess($request);
         }
 
-        $httpResponse = $this->sendRequest($request);
+        $exception = null;
+        $httpResponse = null;
+        try {
+            $httpResponse = $this->sendRequest($request);
+        } catch (RequestException $e) {
+            $httpResponse = $e->getResponse();
+            //silent exception during debug
+            $exception = $e;
+        }
+
+        if ($debugProcess !== null) {
+            $this->debugger->finishRequestProcess($debugProcess, $httpResponse);
+        }
 
-        if ($this->debugger && isset($process)) {
-            $this->debugger->finishRequestProcess($process, $httpResponse);
+        //has pending exception
+        if ($exception && $exception instanceof \Exception) {
+            throw $exception;
         }
 
         $this->getEventDispatcher()->dispatch(self::EVENT_ON_RESPONSE, new OnResponseEvent($this, $service, $httpResponse));