feature #30567 [HttpClient] exceptions carry response (antonch1989)

fabpot · fabpot · commit bff9e68bb448 · 2019-03-19T08:49:53.000+01:00
This PR was squashed before being merged into the 4.3-dev branch (closes #30567). Discussion ---------- [HttpClient] exceptions carry response | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #30502 | License | MIT | Doc PR | Commits ------- 103448c [HttpClient] exceptions carry response
diff --git a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php
@@ -20,8 +20,11 @@
  */
 trait HttpExceptionTrait
 {
+    private $response;
+
     public function __construct(ResponseInterface $response)
     {
+        $this->response = $response;
         $code = $response->getInfo('http_code');
         $url = $response->getInfo('url');
         $message = sprintf('HTTP %d returned for URL "%s".', $code, $url);
@@ -35,4 +38,9 @@ public function __construct(ResponseInterface $response)
 
         parent::__construct($message, $code);
     }
+
+    public function getResponse(): ResponseInterface
+    {
+        return $this->response;
+    }
 }
diff --git a/src/Symfony/Contracts/HttpClient/Exception/ClientExceptionInterface.php b/src/Symfony/Contracts/HttpClient/Exception/ClientExceptionInterface.php
@@ -18,6 +18,6 @@
  *
  * @experimental in 1.1
  */
-interface ClientExceptionInterface extends ExceptionInterface
+interface ClientExceptionInterface extends HttpExceptionInterface
 {
 }
diff --git a/src/Symfony/Contracts/HttpClient/Exception/HttpExceptionInterface.php b/src/Symfony/Contracts/HttpClient/Exception/HttpExceptionInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\HttpClient\Exception;
+
+use Symfony\Contracts\HttpClient\ResponseInterface;
+
+/**
+ * Base interface for HTTP-related exceptions.
+ *
+ * @author Anton Chernikov <anton_ch1989@mail.ru>
+ *
+ * @experimental in 1.1
+ */
+interface HttpExceptionInterface extends ExceptionInterface
+{
+    public function getResponse(): ResponseInterface;
+}
diff --git a/src/Symfony/Contracts/HttpClient/Exception/RedirectionExceptionInterface.php b/src/Symfony/Contracts/HttpClient/Exception/RedirectionExceptionInterface.php
@@ -18,6 +18,6 @@
  *
  * @experimental in 1.1
  */
-interface RedirectionExceptionInterface extends ExceptionInterface
+interface RedirectionExceptionInterface extends HttpExceptionInterface
 {
 }
diff --git a/src/Symfony/Contracts/HttpClient/Exception/ServerExceptionInterface.php b/src/Symfony/Contracts/HttpClient/Exception/ServerExceptionInterface.php
@@ -18,6 +18,6 @@
  *
  * @experimental in 1.1
  */
-interface ServerExceptionInterface extends ExceptionInterface
+interface ServerExceptionInterface extends HttpExceptionInterface
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@`
`20`	`20`	`*/`
`21`	`21`	`trait HttpExceptionTrait`
`22`	`22`	`{`
	`23`	`+ private $response;`
	`24`	`+`
`23`	`25`	`public function __construct(ResponseInterface $response)`
`24`	`26`	`{`
	`27`	`+ $this->response = $response;`
`25`	`28`	`$code = $response->getInfo('http_code');`
`26`	`29`	`$url = $response->getInfo('url');`
`27`	`30`	`$message = sprintf('HTTP %d returned for URL "%s".', $code, $url);`
`@@ -35,4 +38,9 @@ public function __construct(ResponseInterface $response)`
`35`	`38`
`36`	`39`	`parent::__construct($message, $code);`
`37`	`40`	`}`
	`41`	`+`
	`42`	`+ public function getResponse(): ResponseInterface`
	`43`	`+ {`
	`44`	`+ return $this->response;`
	`45`	`+ }`
`38`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`*`
`19`	`19`	`* @experimental in 1.1`
`20`	`20`	`*/`
`21`		`-interface ClientExceptionInterface extends ExceptionInterface`
	`21`	`+interface ClientExceptionInterface extends HttpExceptionInterface`
`22`	`22`	`{`
`23`	`23`	`}`