Replace \UnexpectedValueException with Http\Client\Exception\RequestException in Client::sendRequest and Client::sendAsyncRequest.

Author: mekras

CHANGELOG.md

@@ -4,7 +4,9 @@
 
 ### Changed
 
-- `Client::sendRequest` now throws NetworkException on network errors.
+- `Client::sendRequest` now throws `Http\Client\Exception\NetworkException` on network errors.
+- `\UnexpectedValueException` replaced with `Http\Client\Exception\RequestException` in
+  `Client::sendRequest` and `Client::sendAsyncRequest`
 
 
 ## 1.5.1 - 2016-08-29

src/Client.php

@@ -102,8 +102,8 @@ public function __destruct()
      * @throws \Http\Client\Exception\RequestException On invalid request.
      * @throws \InvalidArgumentException For invalid header names or values.
      * @throws \RuntimeException         If creating the body stream fails.
-     * @throws \UnexpectedValueException if unsupported HTTP version requested
      *
+     * @since x.x \UnexpectedValueException replaced with RequestException.
      * @since x.x Throw NetworkException on network errors.
      * @since 1.0
      */
@@ -149,11 +149,11 @@ public function sendRequest(RequestInterface $request)
      *
      * @return Promise
      *
+     * @throws \Http\Client\Exception\RequestException On invalid request.
      * @throws \InvalidArgumentException For invalid header names or values.
-     * @throws \RuntimeException         If creating the body stream fails.
-     * @throws \UnexpectedValueException If unsupported HTTP version requested
-     * @throws Exception
+     * @throws \RuntimeException If creating the body stream fails.
      *
+     * @since x.x \UnexpectedValueException replaced with RequestException.
      * @since 1.0
      */
     public function sendAsyncRequest(RequestInterface $request)
@@ -180,9 +180,9 @@ public function sendAsyncRequest(RequestInterface $request)
      * @param RequestInterface $request
      * @param ResponseBuilder  $responseBuilder
      *
+     * @throws \Http\Client\Exception\RequestException On invalid request.
      * @throws \InvalidArgumentException For invalid header names or values.
      * @throws \RuntimeException if can not read body
-     * @throws \UnexpectedValueException if unsupported HTTP version requested
      *
      * @return array
      */
@@ -194,7 +194,12 @@ private function createCurlOptions(RequestInterface $request, ResponseBuilder $r
         $options[CURLOPT_RETURNTRANSFER] = false;
         $options[CURLOPT_FOLLOWLOCATION] = false;
 
-        $options[CURLOPT_HTTP_VERSION] = $this->getProtocolVersion($request->getProtocolVersion());
+        try {
+            $options[CURLOPT_HTTP_VERSION]
+                = $this->getProtocolVersion($request->getProtocolVersion());
+        } catch (\UnexpectedValueException $e) {
+            throw new Exception\RequestException($e->getMessage(), $request);
+        }
         $options[CURLOPT_URL] = (string) $request->getUri();
 
         /*