Added request object to be available is RequestException.

arturdoruch · Sep 27, 2015 · e39618d · e39618d
1 parent f8c74f2
commit e39618d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/Event/HttpErrorListener.php b/Event/HttpErrorListener.php
@@ -27,7 +27,7 @@ public function onComplete(CompleteEvent $event)
         $code = (string) $event->getResponse()->getStatusCode();
         // Throw an exception for an unsuccessful response
         if ($code[0] >= 4 || $code[0] == 0) {
-            throw RequestException::create($event->getResponse());
+            throw RequestException::create($event->getResponse(), null, $event->getRequest());
         }
     }
 }
diff --git a/Exception/RequestException.php b/Exception/RequestException.php
@@ -7,23 +7,40 @@
 
 use ArturDoruch\Http\Curl\Codes;
 use ArturDoruch\Http\Message\Response;
+use ArturDoruch\Http\Request;
 
 /**
  * HTTP Request exception
  */
 class RequestException extends \RuntimeException
 {
+    /**
+     * @var Request
+     */
+    private $request;
+
     /**
      * @var Response
      */
     private $response;
 
-    public function __construct($message, Response $response, \Exception $previous = null)
+    public function __construct($message, Response $response, \Exception $previous = null, Request $request = null)
     {
         $this->response = $response;
+        $this->request = $request;
         parent::__construct($message, $response->getStatusCode(), $previous);
     }
 
+    /**
+     * Get the request that caused the exception
+     *
+     * @return Request
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
     /**
      * Get the associated response
      *
@@ -34,6 +51,16 @@ public function getResponse()
         return $this->response;
     }
 
+    /**
+     * Check if request was set
+     *
+     * @return bool
+     */
+    public function hasRequest()
+    {
+        return $this->request !== null;
+    }
+
     /**
      * @param Response $response
      * @return string
@@ -56,15 +83,16 @@ public static function getErrorLabel(Response $response)
     /**
      * Factory method to create a new exception with a normalized error message
      *
+     * @param Request $request
      * @param Response $response Response received
-     * @param \Exception        $previous Previous exception
+     * @param \Exception $previous Previous exception
      *
      * @return self
      */
-    public static function create(Response $response, \Exception $previous = null)
+    public static function create(Response $response, \Exception $previous = null, Request $request = null)
     {
         if (static::isConnectionError($response)) {
-            return static::createConnect($response, $previous);
+            return static::createConnect($response, $previous, $request);
         }
 
         $level = floor($response->getStatusCode() / 100);
@@ -87,24 +115,25 @@ public static function create(Response $response, \Exception $previous = null)
             $message .= ' [error message] ' . $errorMsg;
         }
 
-        return new $className($message, $response, $previous);
+        return new $className($message, $response, $previous, $request);
     }
 
     /**
+     * @param Request $request
      * @param Response $response
      * @param \Exception $previous
      *
      * @return ConnectException
      */
-    private static function createConnect(Response $response, \Exception $previous = null)
+    private static function createConnect(Response $response, \Exception $previous = null, Request $request = null)
     {
         $className = __NAMESPACE__ . '\\ConnectException';
         $message = sprintf(
             'Connection error [url] %s [error number] %d [error message] %s',
             $response->getRequestUrl(), $response->getErrorNumber(), $response->getErrorMsg()
         );
 
-        return new $className($message, $response, $previous);
+        return new $className($message, $response, $previous, $request);
     }
 
     /**