Merge branch 'release/v2.11.0'

Author: jenschude

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [2.11.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.10.0...v2.11.0) (2020-05-05)
+
+
+### Features
+
+* **Error:** add helper methods to retrieve errors from exceptions ([fd09c89](https://github.com/commercetools/commercetools-php-sdk/commit/fd09c89ce1570913fdf2426b11b0309afbb42171))
+* **Error:** improve message for unknown ApiException ([24a91ad](https://github.com/commercetools/commercetools-php-sdk/commit/24a91adef569491c77ab2d76a584909963ac48ab))
+* **Message:** support InventoryEntryQuantitySet message ([043aebe](https://github.com/commercetools/commercetools-php-sdk/commit/043aebe7dba96b825efcd720f936e50d276a349d))
+* **Search:** add helper method to retrieve facets from search response ([2a24040](https://github.com/commercetools/commercetools-php-sdk/commit/2a24040b498cefd8cbc62178b68654869ffb6f5b))
+
+
+
 # [2.10.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.9.0...v2.10.0) (2020-04-02)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "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/AbstractHttpClient.php

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '2.10.0';
+    const VERSION = '2.11.0';
 
     /**
      * @var AdapterInterface

src/Core/Error/ApiException.php

@@ -1,7 +1,4 @@
 <?php
-/**
- * @author @jenschude <[email protected]>
- */
 
 namespace Commercetools\Core\Error;
 
@@ -31,7 +28,7 @@ public function __construct(
         ResponseInterface $response = null,
         Exception $previous = null
     ) {
-        $code = $response ? $response->getStatusCode() : 0;
+        $code = $response ? $response->getStatusCode() : ($previous ? $previous->getCode() : 0);
         parent::__construct($message, $code, $previous);
         $this->request = $request;
         $this->response = $response;
@@ -48,7 +45,8 @@ public static function create(
         Exception $previous = null
     ) {
         if (is_null($response)) {
-            return new self('Error completing request', $request, null, $previous);
+            $message = $previous ? 'Error completing request: ' . $previous->getMessage() : "Error completing request";
+            return new self($message, $request, null, $previous);
         }
 
         $level = floor($response->getStatusCode() / 100);

src/Core/Error/ClientErrorException.php

@@ -11,4 +11,10 @@
  */
 class ClientErrorException extends ApiServiceException
 {
+    public function getErrorContainer()
+    {
+        $errors = parent::getErrors();
+
+        return ErrorContainer::fromArray($errors);
+    }
 }

src/Core/Error/ConcurrentModificationException.php

@@ -14,4 +14,12 @@
  */
 class ConcurrentModificationException extends ClientErrorException
 {
+    public function getCurrentVersion()
+    {
+        $error = $this->getErrorContainer()->getByCode(ConcurrentModificationError::CODE);
+        if ($error instanceof ConcurrentModificationError) {
+            return $error->getCurrentVersion();
+        }
+        return null;
+    }
 }

src/Core/Model/Message/InventoryEntryQuantitySetMessage.php

@@ -0,0 +1,56 @@
+<?php
+
+
+namespace Commercetools\Core\Model\Message;
+
+use Commercetools\Core\Model\Common\DateTimeDecorator;
+use DateTime;
+use Commercetools\Core\Model\Common\Reference;
+
+/**
+ * @package Commercetools\Core\Model\Message
+ * @link https://docs.commercetools.com/http-api-message-types#inventoryentryquantityset-message
+ * @method string getId()
+ * @method InventoryEntryQuantitySetMessage setId(string $id = null)
+ * @method int getVersion()
+ * @method InventoryEntryQuantitySetMessage setVersion(int $version = null)
+ * @method DateTimeDecorator getCreatedAt()
+ * @method InventoryEntryQuantitySetMessage setCreatedAt(DateTime $createdAt = null)
+ * @method DateTimeDecorator getLastModifiedAt()
+ * @method InventoryEntryQuantitySetMessage setLastModifiedAt(DateTime $lastModifiedAt = null)
+ * @method int getSequenceNumber()
+ * @method InventoryEntryQuantitySetMessage setSequenceNumber(int $sequenceNumber = null)
+ * @method Reference getResource()
+ * @method InventoryEntryQuantitySetMessage setResource(Reference $resource = null)
+ * @method int getResourceVersion()
+ * @method InventoryEntryQuantitySetMessage setResourceVersion(int $resourceVersion = null)
+ * @method string getType()
+ * @method InventoryEntryQuantitySetMessage setType(string $type = null)
+ * @method UserProvidedIdentifiers getResourceUserProvidedIdentifiers()
+ * phpcs:disable
+ * @method InventoryEntryQuantitySetMessage setResourceUserProvidedIdentifiers(UserProvidedIdentifiers $resourceUserProvidedIdentifiers = null)
+ * phpcs:enable
+ * @method int getOldQuantityOnStock()
+ * @method InventoryEntryQuantitySetMessage setOldQuantityOnStock(int $oldQuantityOnStock = null)
+ * @method int getNewQuantityOnStock()
+ * @method InventoryEntryQuantitySetMessage setNewQuantityOnStock(int $newQuantityOnStock = null)
+ * @method int getOldAvailableQuantity()
+ * @method InventoryEntryQuantitySetMessage setOldAvailableQuantity(int $oldAvailableQuantity = null)
+ * @method int getNewAvailableQuantity()
+ * @method InventoryEntryQuantitySetMessage setNewAvailableQuantity(int $newAvailableQuantity = null)
+ */
+class InventoryEntryQuantitySetMessage extends Message
+{
+    const MESSAGE_TYPE = 'InventoryEntryQuantitySet';
+
+    public function fieldDefinitions()
+    {
+        $definitions = parent::fieldDefinitions();
+        $definitions['oldQuantityOnStock'] = [static::TYPE => 'int'];
+        $definitions['newQuantityOnStock'] = [static::TYPE => 'int'];
+        $definitions['oldAvailableQuantity'] = [static::TYPE => 'int'];
+        $definitions['newAvailableQuantity'] = [static::TYPE => 'int'];
+
+        return $definitions;
+    }
+}

src/Core/Request/Products/ProductProjectionSearchRequest.php

@@ -195,4 +195,15 @@ public function httpRequest()
         $body = $this->convertToString($this->params);
         return new HttpRequest(HttpMethod::POST, $this->getPath(), $body, 'application/x-www-form-urlencoded');
     }
+
+    public function mapFacetsFromResponse($response)
+    {
+        if ($response instanceof ResponseInterface) {
+            $response = $this->buildResponse($response);
+        }
+        if ($response->isError()) {
+            return null;
+        }
+        return $response->getFacets();
+    }
 }

src/Core/Response/PagedSearchResponse.php

@@ -28,7 +28,7 @@ class PagedSearchResponse extends PagedQueryResponse
     public function getFacets()
     {
         if (is_null($this->facets)) {
-            $this->facets = FacetResultCollection::fromArray($this->getResponseKey(static::FACETS));
+            $this->facets = FacetResultCollection::fromArray($this->getResponseKey(static::FACETS), $this->getContext());
         }
         return $this->facets;
     }

tests/fixtures/Error/ApiExceptionTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Commercetools\Core\Fixtures\Error;
+
+use Commercetools\Core\Error\ApiException;
+use GuzzleHttp\Psr7\Request;
+use PHPUnit\Framework\TestCase;
+
+class ApiExceptionTest extends TestCase
+{
+
+    public function testIncompleteRequest()
+    {
+        $request = $this->createMock(Request::class);
+        $e = ApiException::create($request, null);
+        $this->assertSame(0, $e->getCode());
+        $this->assertSame('Error completing request', $e->getMessage());
+    }
+
+    public function testIncompleteRequestWithPrevious()
+    {
+        $request = $this->createMock(Request::class);
+        $previous = new \Exception("foo", 4);
+
+        $e = ApiException::create($request, null, $previous);
+        $this->assertSame(4, $e->getCode());
+        $this->assertSame('Error completing request: foo', $e->getMessage());
+    }
+}