Buzz: migrate client factory to use PSR-17

Author: glaubinix

composer.json

@@ -44,7 +44,8 @@
     "conflict": {
         "php-http/guzzle6-adapter": "<1.1",
         "php-http/curl-client": "<2.0",
-        "php-http/socket-client": "<2.0"
+        "php-http/socket-client": "<2.0",
+        "kriswallsmith/buzz": "<0.17"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.7 || ^2.0",

src/ClientFactory/BuzzFactory.php

@@ -5,8 +5,7 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Buzz\Client\FileGetContents;
-use Http\Adapter\Buzz\Client as Adapter;
-use Http\Message\MessageFactory;
+use Psr\Http\Message\ResponseFactoryInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -15,33 +14,25 @@
 class BuzzFactory implements ClientFactory
 {
     /**
-     * @var MessageFactory
+     * @var ResponseFactoryInterface
      */
-    private $messageFactory;
+    private $responseFactory;
 
-    public function __construct(MessageFactory $messageFactory)
+    public function __construct(ResponseFactoryInterface $responseFactory)
     {
-        $this->messageFactory = $messageFactory;
+        $this->responseFactory = $responseFactory;
     }
 
     /**
      * {@inheritdoc}
      */
     public function createClient(array $config = [])
     {
-        if (!class_exists('Http\Adapter\Buzz\Client')) {
-            throw new \LogicException('To use the Buzz adapter you need to install the "php-http/buzz-adapter" package.');
+        if (!class_exists('Buzz\Client\FileGetContents')) {
+            throw new \LogicException('To use the Buzz you need to install the "kriswallsmith/buzz" package.');
         }
 
-        $client = new FileGetContents();
-        $options = $this->getOptions($config);
-
-        $client->setTimeout($options['timeout']);
-        $client->setVerifyPeer($options['verify_peer']);
-        $client->setVerifyHost($options['verify_host']);
-        $client->setProxy($options['proxy']);
-
-        return new Adapter($client, $this->messageFactory);
+        return new FileGetContents($this->responseFactory, $this->getOptions($config));
     }
 
     /**
@@ -53,14 +44,12 @@ private function getOptions(array $config = [])
 
         $resolver->setDefaults([
           'timeout' => 5,
-          'verify_peer' => true,
-          'verify_host' => 2,
+          'verify' => true,
           'proxy' => null,
         ]);
 
         $resolver->setAllowedTypes('timeout', 'int');
-        $resolver->setAllowedTypes('verify_peer', 'bool');
-        $resolver->setAllowedTypes('verify_host', 'int');
+        $resolver->setAllowedTypes('verify', 'bool');
         $resolver->setAllowedTypes('proxy', ['string', 'null']);
 
         return $resolver->resolve($config);

src/Resources/config/services.xml

@@ -80,7 +80,7 @@
         <!-- ClientFactories -->
         <service id="httplug.factory.auto" class="Http\HttplugBundle\ClientFactory\AutoDiscoveryFactory" public="false" />
         <service id="httplug.factory.buzz" class="Http\HttplugBundle\ClientFactory\BuzzFactory" public="false">
-            <argument type="service" id="httplug.message_factory"/>
+            <argument type="service" id="httplug.psr17_response_factory"/>
         </service>
         <service id="httplug.factory.curl" class="Http\HttplugBundle\ClientFactory\CurlFactory" public="false">
             <argument type="service" id="httplug.psr17_response_factory"/>

tests/Unit/ClientFactory/BuzzFactoryTest.php

@@ -4,10 +4,10 @@
 
 namespace Http\HttplugBundle\Tests\Unit\ClientFactory;
 
-use Http\Adapter\Buzz\Client;
+use Buzz\Client\FileGetContents;
 use Http\HttplugBundle\ClientFactory\BuzzFactory;
-use Http\Message\MessageFactory;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseFactoryInterface;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -16,13 +16,13 @@ class BuzzFactoryTest extends TestCase
 {
     public function testCreateClient(): void
     {
-        if (!class_exists(Client::class)) {
-            $this->markTestSkipped('Buzz adapter is not installed');
+        if (!class_exists(FileGetContents::class)) {
+            $this->markTestSkipped('Buzz client is not installed');
         }
 
-        $factory = new BuzzFactory($this->getMockBuilder(MessageFactory::class)->getMock());
+        $factory = new BuzzFactory($this->getMockBuilder(ResponseFactoryInterface::class)->getMock());
         $client = $factory->createClient();
 
-        $this->assertInstanceOf(Client::class, $client);
+        $this->assertInstanceOf(FileGetContents::class, $client);
     }
 }