Support both guzzle6 and guzzle7-adapter

Author: ddeboer

composer.json

@@ -50,7 +50,7 @@
         "nyholm/nsa": "^1.1",
         "nyholm/psr7": "^1.2.1",
         "php-http/cache-plugin": "^1.7",
-        "php-http/guzzle6-adapter": "^1.1.1 || ^2.0.1",
+        "php-http/guzzle7-adapter": "^0.1.1",
         "php-http/mock-client": "^1.2",
         "php-http/promise": "^1.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",

src/ClientFactory/Guzzle7Factory.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Http\HttplugBundle\ClientFactory;
+
+use Http\Adapter\Guzzle7\Client;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+class Guzzle7Factory implements ClientFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function createClient(array $config = [])
+    {
+        if (!class_exists('Http\Adapter\Guzzle7\Client')) {
+            throw new \LogicException('To use the Guzzle7 adapter you need to install the "php-http/guzzle6-adapter" package.');
+        }
+
+        return Client::createWithConfig($config);
+    }
+}

src/Resources/config/data-collector.xml

@@ -72,6 +72,12 @@
             <argument type="service" id="httplug.collector.formatter"/>
             <argument type="service" id="debug.stopwatch"/>
         </service>
+        <service id="httplug.collector.factory.guzzle7" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.guzzle7" public="false">
+            <argument type="service" id="httplug.collector.factory.guzzle7.inner"/>
+            <argument type="service" id="httplug.collector.collector"/>
+            <argument type="service" id="httplug.collector.formatter"/>
+            <argument type="service" id="debug.stopwatch"/>
+        </service>
         <service id="httplug.collector.factory.react" class="Http\HttplugBundle\Collector\ProfileClientFactory" decorates="httplug.factory.react" public="false">
             <argument type="service" id="httplug.collector.factory.react.inner"/>
             <argument type="service" id="httplug.collector.collector"/>

src/Resources/config/services.xml

@@ -90,6 +90,7 @@
             <argument type="service" id="httplug.message_factory"/>
         </service>
         <service id="httplug.factory.guzzle6" class="Http\HttplugBundle\ClientFactory\Guzzle6Factory" public="false" />
+        <service id="httplug.factory.guzzle7" class="Http\HttplugBundle\ClientFactory\Guzzle7Factory" public="false" />
         <service id="httplug.factory.react" class="Http\HttplugBundle\ClientFactory\ReactFactory" public="false">
             <argument type="service" id="httplug.message_factory"/>
         </service>

tests/Functional/DiscoveryTest.php

@@ -4,7 +4,7 @@
 
 namespace Http\HttplugBundle\Tests\Unit\DependencyInjection\Compiler;
 
-use Http\Adapter\Guzzle6\Client;
+use Http\Adapter\Guzzle7\Client;
 use Http\Client\HttpAsyncClient;
 use Http\Client\HttpClient;
 use Http\Discovery\HttpClientDiscovery;

tests/Resources/Fixtures/config/full.php

@@ -11,11 +11,11 @@
         'stream_factory' => 'my_stream_factory',
     ],
     'classes' => [
-        'client' => 'Http\Adapter\Guzzle6\Client',
+        'client' => 'Http\Adapter\Guzzle7\Client',
         'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
         'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
         'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
-        'psr18_client' => 'Http\Adapter\Guzzle6\Client',
+        'psr18_client' => 'Http\Adapter\Guzzle7\Client',
         'psr17_request_factory' => 'Nyholm\Psr7\Factory\Psr17Factory',
         'psr17_response_factory' => 'Nyholm\Psr7\Factory\Psr17Factory',
         'psr17_stream_factory' => 'Nyholm\Psr7\Factory\Psr17Factory',
@@ -25,7 +25,7 @@
     ],
     'clients' => [
         'test' => [
-            'factory' => 'httplug.factory.guzzle6',
+            'factory' => 'httplug.factory.guzzle7',
             'http_methods_client' => true,
             'plugins' => [
                 'httplug.plugin.redirect',

tests/Resources/Fixtures/config/full.xml

@@ -10,19 +10,19 @@
             <stream-factory>my_stream_factory</stream-factory>
         </main-alias>
         <classes>
-            <client>Http\Adapter\Guzzle6\Client</client>
+            <client>Http\Adapter\Guzzle7\Client</client>
             <message-factory>Http\Message\MessageFactory\GuzzleMessageFactory</message-factory>
             <uri-factory>Http\Message\UriFactory\GuzzleUriFactory</uri-factory>
             <stream-factory>Http\Message\StreamFactory\GuzzleStreamFactory</stream-factory>
-            <psr18-client>Http\Adapter\Guzzle6\Client</psr18-client>
+            <psr18-client>Http\Adapter\Guzzle7\Client</psr18-client>
             <psr17-request-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-request-factory>
             <psr17-response-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-response-factory>
             <psr17-stream-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-stream-factory>
             <psr17-uri-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-uri-factory>
             <psr17-uploaded-file-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-uploaded-file-factory>
             <psr17-server-request-factory>Nyholm\Psr7\Factory\Psr17Factory</psr17-server-request-factory>
         </classes>
-        <client name="test" factory="httplug.factory.guzzle6" http-methods-client="true">
+        <client name="test" factory="httplug.factory.guzzle7" http-methods-client="true">
             <plugin>httplug.plugin.redirect</plugin>
             <plugin>
                 <add-host host="http://localhost"/>

tests/Resources/Fixtures/config/full.yml

@@ -6,11 +6,11 @@ httplug:
         uri_factory: my_uri_factory
         stream_factory: my_stream_factory
     classes:
-        client: Http\Adapter\Guzzle6\Client
+        client: Http\Adapter\Guzzle7\Client
         message_factory: Http\Message\MessageFactory\GuzzleMessageFactory
         uri_factory: Http\Message\UriFactory\GuzzleUriFactory
         stream_factory: Http\Message\StreamFactory\GuzzleStreamFactory
-        psr18_client: Http\Adapter\Guzzle6\Client
+        psr18_client: Http\Adapter\Guzzle7\Client
         psr17_request_factory: Nyholm\Psr7\Factory\Psr17Factory
         psr17_response_factory: Nyholm\Psr7\Factory\Psr17Factory
         psr17_stream_factory: Nyholm\Psr7\Factory\Psr17Factory
@@ -19,7 +19,7 @@ httplug:
         psr17_server_request_factory: Nyholm\Psr7\Factory\Psr17Factory
     clients:
         test:
-            factory: httplug.factory.guzzle6
+            factory: httplug.factory.guzzle7
             http_methods_client: true
             plugins:
                 - 'httplug.plugin.redirect'

tests/Resources/app/config/config_test.yml

@@ -7,7 +7,7 @@ httplug:
         async_client: auto
     clients:
         acme:
-            factory: httplug.factory.guzzle6
+            factory: httplug.factory.guzzle7
             plugins:
                 -
                     decoder:

tests/Unit/ClientFactory/Guzzle7FactoryTest.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Http\HttplugBundle\Tests\Unit\ClientFactory;
+
+use Http\Adapter\Guzzle7\Client;
+use Http\HttplugBundle\ClientFactory\Guzzle7Factory;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @author Tobias Nyholm <[email protected]>
+ */
+class Guzzle7FactoryTest extends TestCase
+{
+    public function testCreateClient(): void
+    {
+        if (!class_exists(Client::class)) {
+            $this->markTestSkipped('Guzzle7 adapter is not installed');
+        }
+
+        $factory = new Guzzle7Factory();
+        $client = $factory->createClient();
+
+        $this->assertInstanceOf(Client::class, $client);
+    }
+}