From 3cd17314be981c3ea4c32b961bdfb7292d83a188 Mon Sep 17 00:00:00 2001 From: Gerhard Alfanz Date: Tue, 14 Nov 2017 11:15:03 +0100 Subject: [PATCH 1/4] Fixes #31: Wrong parameters error when TimeoutException is thrown --- src/Exception/StreamException.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/Exception/StreamException.php b/src/Exception/StreamException.php index d40a6ce..c202dd1 100644 --- a/src/Exception/StreamException.php +++ b/src/Exception/StreamException.php @@ -3,7 +3,36 @@ namespace Http\Client\Socket\Exception; use Http\Client\Exception; +use Psr\Http\Message\RequestInterface; class StreamException extends \RuntimeException implements Exception { + /** + * The request object + * @var RequestInterface + */ + private $request; + + /** + * Accepts an optional request object as second param + * + * @param string $message + * @param RequestInterface $request + * @param long $code + * @param Exception $previous + */ + public function __construct($message = null, RequestInterface $request = null, $code = null, $previous = null) + { + $this->request=$request; + parent::__construct($message, $code, $previous); + } + + /** + * @return \Psr\Http\Message\RequestInterface|NULL + */ + final public function getRequest() + { + return $this->request; + } } + From 203842b87384524e0e653c4d5e71c36fffefa063 Mon Sep 17 00:00:00 2001 From: Gerhard Alfanz Date: Wed, 15 Nov 2017 10:17:28 +0100 Subject: [PATCH 2/4] Fixes #31: request on StreamException now is 4th param --- src/Exception/StreamException.php | 14 +++++++------- src/ResponseReader.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Exception/StreamException.php b/src/Exception/StreamException.php index c202dd1..847bb5e 100644 --- a/src/Exception/StreamException.php +++ b/src/Exception/StreamException.php @@ -14,16 +14,16 @@ class StreamException extends \RuntimeException implements Exception private $request; /** - * Accepts an optional request object as second param + * Accepts an optional request object as 4th param * - * @param string $message - * @param RequestInterface $request - * @param long $code - * @param Exception $previous + * @param string $message + * @param int $code + * @param Exception $previous + * @param RequestInterface $request */ - public function __construct($message = null, RequestInterface $request = null, $code = null, $previous = null) + public function __construct($message = null, $code = null, $previous = null, RequestInterface $request = null) { - $this->request=$request; + $this->request = $request; parent::__construct($message, $code, $previous); } diff --git a/src/ResponseReader.php b/src/ResponseReader.php index 6826078..7efc288 100644 --- a/src/ResponseReader.php +++ b/src/ResponseReader.php @@ -48,7 +48,7 @@ protected function readResponse(RequestInterface $request, $socket) $metadatas = stream_get_meta_data($socket); if (array_key_exists('timed_out', $metadatas) && true === $metadatas['timed_out']) { - throw new TimeoutException('Error while reading response, stream timed out', $request); + throw new TimeoutException('Error while reading response, stream timed out', null, null, $request); } $parts = explode(' ', array_shift($headers), 3); From 48224d8c06cf56e126f5cb91ceccff7f5bdbbed8 Mon Sep 17 00:00:00 2001 From: Gerhard Alfanz Date: Mon, 27 Nov 2017 13:35:52 +0100 Subject: [PATCH 3/4] fixed style --- src/Exception/StreamException.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Exception/StreamException.php b/src/Exception/StreamException.php index 847bb5e..c9d2bc9 100644 --- a/src/Exception/StreamException.php +++ b/src/Exception/StreamException.php @@ -8,18 +8,19 @@ class StreamException extends \RuntimeException implements Exception { /** - * The request object + * The request object. + * * @var RequestInterface */ private $request; /** - * Accepts an optional request object as 4th param + * Accepts an optional request object as 4th param. * - * @param string $message - * @param int $code - * @param Exception $previous - * @param RequestInterface $request + * @param string $message + * @param int $code + * @param Exception $previous + * @param RequestInterface $request */ public function __construct($message = null, $code = null, $previous = null, RequestInterface $request = null) { @@ -28,7 +29,7 @@ public function __construct($message = null, $code = null, $previous = null, Req } /** - * @return \Psr\Http\Message\RequestInterface|NULL + * @return \Psr\Http\Message\RequestInterface|null */ final public function getRequest() { From e6c7bf6774fd7d5997c3b6ab856fb99bc130acc6 Mon Sep 17 00:00:00 2001 From: Gerhard Alfanz Date: Thu, 30 Nov 2017 13:53:09 +0100 Subject: [PATCH 4/4] Style fix (removed trailing empty line) --- src/Exception/StreamException.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Exception/StreamException.php b/src/Exception/StreamException.php index c9d2bc9..6437cec 100644 --- a/src/Exception/StreamException.php +++ b/src/Exception/StreamException.php @@ -36,4 +36,3 @@ final public function getRequest() return $this->request; } } -