Make sure we support any psr-18 client

Author: Nyholm

Collector/PluginClientFactory.php

@@ -6,6 +6,7 @@
 use Http\Client\Common\PluginClient;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\HttplugBundle\Tests\Unit\Collector\ClientInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -46,9 +47,9 @@ public function __construct(Collector $collector, Formatter $formatter, Stopwatc
     }
 
     /**
-     * @param HttpClient|HttpAsyncClient $client
-     * @param Plugin[]                   $plugins
-     * @param array                      $options {
+     * @param HttpClient|ClientInterface|HttpAsyncClient $client
+     * @param Plugin[]                                   $plugins
+     * @param array                                      $options {
      *
      *     @var string $client_name to give client a name which may be used when displaying client information like in
      *         the HTTPlugBundle profiler.

Collector/ProfileClient.php

@@ -7,6 +7,7 @@
 use Http\Client\Exception\HttpException;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
+use Http\HttplugBundle\Tests\Unit\Collector\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -58,7 +59,7 @@ class ProfileClient implements HttpClient, HttpAsyncClient
      */
     public function __construct($client, Collector $collector, Formatter $formatter, Stopwatch $stopwatch)
     {
-        if (!($client instanceof HttpClient && $client instanceof HttpAsyncClient)) {
+        if (!(($client instanceof ClientInterface || $client instanceof HttpClient) && $client instanceof HttpAsyncClient)) {
             $client = new FlexibleHttpClient($client);
         }
 

Collector/ProfileClientFactory.php

@@ -6,6 +6,7 @@
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\HttplugBundle\ClientFactory\ClientFactory;
+use Psr\Http\Client\ClientInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -61,7 +62,7 @@ public function createClient(array $config = [])
     {
         $client = is_callable($this->factory) ? call_user_func($this->factory, $config) : $this->factory->createClient($config);
 
-        if (!($client instanceof HttpClient && $client instanceof HttpAsyncClient)) {
+        if (!(($client instanceof HttpClient || $client instanceof ClientInterface) && $client instanceof HttpAsyncClient)) {
             $client = new FlexibleHttpClient($client);
         }