fix(Guzzle5Adapter): fix applying client options to guzzle5 http client

Author: Jens Schulze

src/Core/Client/Adapter/Guzzle5Adapter.php

@@ -35,7 +35,7 @@ class Guzzle5Adapter implements AdapterOptionInterface, CorrelationIdAware, Toke
      */
     protected $logger;
 
-    private $concurrency;
+    private $concurrency = self::DEFAULT_CONCURRENCY;
 
     /**
      * @param array $options
@@ -47,24 +47,22 @@ public function __construct(array $options = [])
             unset($options['base_uri']);
         }
         if (isset($options['concurrency'])) {
-            $options['pool_size'] = $options['concurrency'];
+            $this->concurrency = $options['concurrency'];
             unset($options['concurrency']);
         }
         if (isset($options['headers'])) {
             $options['defaults']['headers'] = $options['headers'];
             unset($options['headers']);
         }
-        $options = array_merge(
+        $options['defaults'] = array_merge(
             [
                 'allow_redirects' => false,
                 'verify' => true,
                 'timeout' => 60,
-                'connect_timeout' => 10,
-                'pool_size' => self::DEFAULT_CONCURRENCY
+                'connect_timeout' => 10
             ],
-            $options
+            isset($options['defaults']) ? $options['defaults'] : []
         );
-        $this->concurrency = $options['pool_size'];
 
         $this->client = new Client($options);
     }

tests/unit/Client/OAuth/ManagerTest.php

@@ -288,13 +288,18 @@ public function testOAuthUrl()
 
     public function testSetClientOptions()
     {
+        if (version_compare(HttpClient::VERSION, '6.0.0', '>=')) {
+            $clientOptions = ['verify' => false];
+        } else {
+            $clientOptions = ['defaults' => ['verify' => false]];
+        }
         $config = Config::of()->setClientId('')->setClientSecret('')->setProject('');
         $manager = new Manager($config);
 
         $this->assertInstanceOf(ConfigAware::class, $manager->getHttpClient());
         $this->assertTrue($manager->getHttpClient()->getConfig('verify'));
 
-        $config = Config::of()->setClientId('')->setClientSecret('')->setProject('')->setOAuthClientOptions(['verify' => false]);
+        $config = Config::of()->setClientId('')->setClientSecret('')->setProject('')->setOAuthClientOptions($clientOptions);
         $manager = new Manager($config);
 
         $this->assertInstanceOf(ConfigAware::class, $manager->getHttpClient());

tests/unit/ClientTest.php

@@ -810,14 +810,19 @@ public function testHtmlBody()
 
     public function testSetClientOptions()
     {
+        if (version_compare(HttpClient::VERSION, '6.0.0', '>=')) {
+            $clientOptions = ['verify' => false];
+        } else {
+            $clientOptions = ['defaults' => ['verify' => false]];
+        }
         $client = Client::ofConfig(
             Config::of()->setClientId('')->setClientSecret('')->setProject('')
         );
         $this->assertInstanceOf(ConfigAware::class, $client->getHttpClient());
         $this->assertTrue($client->getHttpClient()->getConfig('verify'));
 
         $client = Client::ofConfig(
-            Config::of()->setClientId('')->setClientSecret('')->setProject('')->setClientOptions(['verify' => false])
+            Config::of()->setClientId('')->setClientSecret('')->setProject('')->setClientOptions($clientOptions)
         );
         $this->assertInstanceOf(ConfigAware::class, $client->getHttpClient());
         $this->assertFalse($client->getHttpClient()->getConfig('verify'));