Merge branch 'hotfix/v2.12.1'

Author: jenschude

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.12.1](https://github.com/commercetools/commercetools-php-sdk/compare/v2.12.0...v2.12.1) (2020-10-30)
+
+
+### Bug Fixes
+
+* **Client:** fix adapter factory to correctly identify the GuzzleAdapter ([221b690](https://github.com/commercetools/commercetools-php-sdk/commit/221b69018badbc26a49dcbcb619509c2daccb0b9))
+
+
+
 # [2.12.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.11.1...v2.12.0) (2020-10-12)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "commercetools PHP SDK changelog generator package description",
   "homepage": "https://github.com/commercetools/commercetools-php-sdk",
   "bugs": "https://github.com/commercetools/commercetools-php-sdk/issues",

src/Core/Client/Adapter/AdapterFactory.php

@@ -39,11 +39,8 @@ public function register($name, $adapterClass)
     public function getClass($name = null)
     {
         if (is_null($name)) {
-            if (defined('\GuzzleHttp\ClientInterface::MAJOR_VERSION')) {
-                $name = 'guzzle6';
-            } elseif (version_compare(Client::class . '::VERSION', '6.0.0', '>=')) {
-                $name = 'guzzle6';
-            } else {
+            $name = "guzzle6";
+            if (defined('\GuzzleHttp\Client::VERSION') && version_compare(constant('\GuzzleHttp\Client::VERSION'), '6.0.0', '<')) {
                 $name = 'guzzle5';
             }
         }

tests/integration/Cart/CartUpdateRequestTest.php

@@ -1820,10 +1820,10 @@ function (Cart $cart) use ($client, $discountCode, $cartDiscount) {
                                         $response = $this->execute($client, $request);
                                         $cart = $request->mapFromResponse($response);
 
-                                         $this->assertSame(
-                                             $discountCode->getId(),
-                                             $cart->getDiscountCodes()->current()->getDiscountCode()->getId()
-                                         );
+                                        $this->assertSame(
+                                            $discountCode->getId(),
+                                            $cart->getDiscountCodes()->current()->getDiscountCode()->getId()
+                                        );
                                         $this->assertSame(
                                             $cartDiscount->getId(),
                                             $cart->getLineItems()->current()
@@ -2622,6 +2622,15 @@ function (Cart $cart) use ($client, $project) {
                         $response = $this->execute($client, $request);
                         $request->mapFromResponse($response);
 
+                        $this->eventually(function () use ($client) {
+                            $request = RequestBuilder::of()->project()->get();
+                            $response = $this->execute($client, $request);
+                            $project = $request->mapFromResponse($response);
+
+                            $this->assertInstanceOf(CartScoreType::class, $project->getShippingRateInputType());
+                            return $project;
+                        });
+
                         $request = RequestBuilder::of()->carts()->update($cart)
                             ->addAction(
                                 CartSetShippingRateInputAction::of()

tests/unit/Client/AdapterFactoryTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Commercetools\Core\Client;
+
+use Commercetools\Core\Client\Adapter\AdapterFactory;
+use Commercetools\Core\Client\Adapter\Guzzle5Adapter;
+use Commercetools\Core\Client\Adapter\Guzzle6Adapter;
+use PHPUnit\Framework\TestCase;
+
+class AdapterFactoryTest extends TestCase
+{
+    public function testGetClassGuzzle5()
+    {
+        $adapter = new AdapterFactory();
+        if (defined('\GuzzleHttp\Client::VERSION') && strpos(constant('\GuzzleHttp\Client::VERSION'), '5.') === 0) {
+            $this->assertSame(Guzzle5Adapter::class, $adapter->getClass());
+        } else {
+            $this->markTestSkipped("No guzzle 5 installed");
+        }
+    }
+
+    public function testGetClassGuzzle6()
+    {
+        $adapter = new AdapterFactory();
+        if (defined('\GuzzleHttp\Client::VERSION') && strpos(constant('\GuzzleHttp\Client::VERSION'), '6.') === 0) {
+            $this->assertSame(Guzzle6Adapter::class, $adapter->getClass());
+        } else {
+            $this->markTestSkipped("No guzzle 6 installed");
+        }
+    }
+
+    public function testGetClassGuzzle7()
+    {
+        $adapter = new AdapterFactory();
+        if (defined('\GuzzleHttp\Client::MAJOR_VERSION') && constant('\GuzzleHttp\Client::MAJOR_VERSION') === 7) {
+            $this->assertSame(Guzzle6Adapter::class, $adapter->getClass());
+        } else {
+            $this->markTestSkipped("No guzzle 6 installed");
+        }
+    }
+
+    /**
+     * @dataProvider getClass
+     */
+    public function testGetClassByName($adapterName, $expectedClassName)
+    {
+        $adapter = new AdapterFactory();
+        $this->assertSame($expectedClassName, $adapter->getClass($adapterName));
+    }
+
+    /**
+     * @dataProvider getClass
+     */
+    public function testGetAdapterByName($adapterName, $expectedClassName)
+    {
+        $adapter = new AdapterFactory();
+        $this->assertInstanceOf($expectedClassName, $adapter->getAdapter($adapterName, []));
+    }
+
+
+    public function getClass()
+    {
+        return [
+            'guzzle6' => ['guzzle6', Guzzle6Adapter::class],
+            'guzzle5' => ['guzzle5', Guzzle5Adapter::class]
+        ];
+    }
+}