[HttpClient][Psr18Client] Remove Psr18ExceptionTrait

fancyweb · fancyweb · commit c1746d8b1448 · 2019-12-18T16:09:34.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php
@@ -105,7 +105,7 @@ public function sendRequest(RequestInterface $request): ResponseInterface
 /**
  * @internal
  */
-trait Psr18ExceptionTrait
+class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
 {
     private $request;
 
@@ -121,18 +121,21 @@ public function getRequest(): RequestInterface
     }
 }
 
-/**
- * @internal
- */
-class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface
-{
-    use Psr18ExceptionTrait;
-}
-
 /**
  * @internal
  */
 class Psr18RequestException extends \InvalidArgumentException implements RequestExceptionInterface
 {
-    use Psr18ExceptionTrait;
+    private $request;
+
+    public function __construct(TransportExceptionInterface $e, RequestInterface $request)
+    {
+        parent::__construct($e->getMessage(), 0, $e);
+        $this->request = $request;
+    }
+
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
 }
