Catch parsing exceptions.

Author: mekras

src/CurlHttpClient.php

@@ -95,7 +95,6 @@ public function __destruct()
      * @return ResponseInterface
      *
      * @throws \UnexpectedValueException if unsupported HTTP version requested
-     * @throws \InvalidArgumentException
      * @throws RequestException
      *
      * @since 1.0
@@ -119,7 +118,12 @@ public function sendRequest(RequestInterface $request)
 
         $info = curl_getinfo($this->handle);
 
-        return $this->responseParser->parse($raw, $info);
+        try {
+            $response = $this->responseParser->parse($raw, $info);
+        } catch (\Exception $e) {
+            throw new RequestException($e->getMessage(), $request, $e);
+        }
+        return $response;
     }
 
     /**

src/MultiRunner.php

@@ -54,7 +54,7 @@ public function __destruct()
     }
 
     /**
-     * Add promise core
+     * Add promise to runner
      *
      * @param PromiseCore $core
      */
@@ -74,6 +74,22 @@ public function add(PromiseCore $core)
         curl_multi_add_handle($this->multiHandle, $core->getHandle());
     }
 
+    /**
+     * Remove promise from runner
+     *
+     * @param PromiseCore $core
+     */
+    public function remove(PromiseCore $core)
+    {
+        foreach ($this->cores as $index => $existed) {
+            if ($existed === $core) {
+                curl_multi_remove_handle($this->multiHandle, $core->getHandle());
+                unset($this->cores[$index]);
+                return;
+            }
+        }
+    }
+
     /**
      * Wait for request(s) to be completed.
      *
@@ -86,18 +102,32 @@ public function wait(PromiseCore $targetCore = null)
             $info = curl_multi_info_read($this->multiHandle);
             if (false !== $info) {
                 $core = $this->findCoreByHandle($info['handle']);
+
+                if (null === $core) {
+                    // We have no promise for this handle. Drop it.
+                    curl_multi_remove_handle($this->multiHandle, $info['handle']);
+                    continue;
+                }
+
                 if (CURLE_OK === $info['result']) {
-                    $response = $this->responseParser->parse(
-                        curl_multi_getcontent($info['handle']),
-                        curl_getinfo($info['handle'])
-                    );
-                    $core->fulfill($response);
+                    try {
+                        $response = $this->responseParser->parse(
+                            curl_multi_getcontent($core->getHandle()),
+                            curl_getinfo($core->getHandle())
+                        );
+                        $core->fulfill($response);
+                    } catch (\Exception $e) {
+                        $core->reject(
+                            new RequestException($e->getMessage(), $core->getRequest(), $e)
+                        );
+                    }
                 } else {
-                    $error = curl_error($info['handle']);
-                    $exception = new RequestException($error, $core->getRequest());
-                    $core->reject($exception);
+                    $error = curl_error($core->getHandle());
+                    $core->reject(new RequestException($error, $core->getRequest()));
                 }
+                $this->remove($core);
 
+                // This is a promise we are waited for. So exiting wait().
                 if ($core === $targetCore) {
                     return;
                 }