Merge remote-tracking branch 'origin/master' into 2.x

Author: dbu

CHANGELOG.md

@@ -15,7 +15,13 @@
 ### Removed
 - Deprecated option `debug_plugins` has been removed from `PluginClient`
 
-## 1.9.0 - [unreleased]
+## 1.9.0 - 2019-01-03
+
+### Added
+
+- Support for PSR-18 clients
+- Added traits `VersionBridgePlugin` and `VersionBridgeClient` to help plugins and clients to support both
+  1.x and 2.x version of `php-http/client-common` and `php-http/httplug`.
 
 ### Changed
 

src/EmulatedHttpAsyncClient.php

@@ -18,8 +18,15 @@ final class EmulatedHttpAsyncClient implements HttpClient, HttpAsyncClient
     use HttpAsyncClientEmulator;
     use HttpClientDecorator;
 
-    public function __construct(ClientInterface $httpClient)
+    /**
+     * @param HttpClient|ClientInterface $httpClient
+     */
+    public function __construct($httpClient)
     {
+        if (!($httpClient instanceof HttpClient) && !($httpClient instanceof ClientInterface)) {
+            throw new \LogicException('Client must be an instance of Http\\Client\\HttpClient or Psr\\Http\\Client\\ClientInterface');
+        }
+
         $this->httpClient = $httpClient;
     }
 }