Merge branch 'release/v1.4.0'

Author: Jens Schulze

CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/sphereio/commercetools-php-sdk/compare/v1.3.1...v1.4.0) (2016-10-05)
+
+### Features
+
+* **Cart:** support change of custom line item quantity and price ([63d78e5](https://github.com/sphereio/commercetools-php-sdk/commit/63d78e5)), closes [#256](https://github.com/sphereio/commercetools-php-sdk/issues/256)
+* **Cart:** support external line item total price ([417e78c](https://github.com/sphereio/commercetools-php-sdk/commit/417e78c)), closes [#247](https://github.com/sphereio/commercetools-php-sdk/issues/247)
+* **CustomObject:** add constructor using custom object draft ([7482d1b](https://github.com/sphereio/commercetools-php-sdk/commit/7482d1b)), closes [#258](https://github.com/sphereio/commercetools-php-sdk/issues/258)
+* **CustomObject:** add reference model for custom objects ([566cf22](https://github.com/sphereio/commercetools-php-sdk/commit/566cf22)), closes [#248](https://github.com/sphereio/commercetools-php-sdk/issues/248)
+* **Filter:** add method to create a subtree filter with an array of IDs ([ac487a3](https://github.com/sphereio/commercetools-php-sdk/commit/ac487a3)), closes [#257](https://github.com/sphereio/commercetools-php-sdk/issues/257)
+* **Inventory:** add inventory deleted message ([699a8c7](https://github.com/sphereio/commercetools-php-sdk/commit/699a8c7)), closes [#245](https://github.com/sphereio/commercetools-php-sdk/issues/245)
+* **Inventory:** support customizable inventory entries ([31f16db](https://github.com/sphereio/commercetools-php-sdk/commit/31f16db)), closes [#246](https://github.com/sphereio/commercetools-php-sdk/issues/246)
+* **Logger:** add correlation id to logger as context object ([512536b](https://github.com/sphereio/commercetools-php-sdk/commit/512536b))
+* **Product:** query product by slug with single language ([88cd9e2](https://github.com/sphereio/commercetools-php-sdk/commit/88cd9e2)), closes [#250](https://github.com/sphereio/commercetools-php-sdk/issues/250)
+* **Product:** support key for product and product variant ([39f356a](https://github.com/sphereio/commercetools-php-sdk/commit/39f356a)), closes [#259](https://github.com/sphereio/commercetools-php-sdk/issues/259)
+* **Reference:** resolve correct reference model by typeId ([8f76ec4](https://github.com/sphereio/commercetools-php-sdk/commit/8f76ec4))
+
+
+
 <a name="1.3.1"></a>
 ## [1.3.1](https://github.com/sphereio/commercetools-php-sdk/compare/v1.3.0...v1.3.1) (2016-08-30)
 

README.md

@@ -144,7 +144,7 @@ Clone the develop branch of the repository (we're using the [gitflow](http://nvi
 git clone [email protected]:sphereio/commercetools-php-sdk.git
 ```
 
-Please follow the [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style, ideally via your IDE settings (see below for phpStorm instructions).
+Please follow the [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style, ideally via your IDE settings (see below for PhpStorm instructions).
 
 Please make sure that exiting Unit and Integration tests don't fail and fully cover your new code with Unit Tests. You can run all tests locally:
 
@@ -172,9 +172,9 @@ php -S localhost:8000 -t docroot
 
 Now navigate to [http://localhost:8000](http://localhost:8000) in your browser.
 
-### phpStorm configuration
+### PhpStorm configuration
 
-To enable code style checks directly in phpStorm you have to configure the path to the phpcs at Preferences > Languages & Frameworks > PHP > Code Sniffer.
+To enable code style checks directly in PhpStorm you have to configure the path to the phpcs at Preferences > Languages & Frameworks > PHP > Code Sniffer.
 Now you can enable at Preferences > Editor > Inspections > PHP the "PHP code sniffer validation" with PSR-2 standard. Change the severity if needed.
 
 

composer.json

@@ -46,7 +46,7 @@
     "monolog/monolog": "^1.12",
     "behat/behat": "^3.0",
     "phpunit/phpcov": "*",
-    "fabpot/php-cs-fixer": "@stable",
+    "friendsofphp/php-cs-fixer": "@stable",
     "symfony/yaml": "*",
     "cache/array-adapter": "^0.4.0",
     "cache/filesystem-adapter": "^0.3.0",
@@ -60,6 +60,9 @@
     "post-install-cmd": "@updateConfig"
   },
   "extra": {
+    "branch-alias": {
+      "dev-develop": "1.4-dev"
+    },
     "incenteev-parameters": [
       {
         "file": "docroot/myapp.yml",

src/AbstractHttpClient.php

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

src/Client/Adapter/Guzzle6Adapter.php

@@ -5,6 +5,7 @@
 
 namespace Commercetools\Core\Client\Adapter;
 
+use Commercetools\Core\Response\AbstractApiResponse;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\MessageFormatter;
@@ -16,6 +17,7 @@
 use Psr\Log\LoggerInterface;
 use Commercetools\Core\Error\Message;
 use Commercetools\Core\Error\ApiException;
+use Psr\Log\LogLevel;
 
 class Guzzle6Adapter implements AdapterInterface
 {
@@ -44,7 +46,48 @@ public function __construct(array $options = [])
     public function setLogger(LoggerInterface $logger)
     {
         $this->logger = $logger;
-        $this->addHandler(Middleware::log($logger, new MessageFormatter()));
+        $this->addHandler(self::log($logger, new MessageFormatter()));
+    }
+
+    /**
+     * Middleware that logs requests, responses, and errors using a message
+     * formatter.
+     *
+     * @param LoggerInterface  $logger Logs messages.
+     * @param MessageFormatter $formatter Formatter used to create message strings.
+     * @param string           $logLevel Level at which to log requests.
+     *
+     * @return callable Returns a function that accepts the next handler.
+     */
+    private static function log(LoggerInterface $logger, MessageFormatter $formatter, $logLevel = LogLevel::INFO)
+    {
+        return function (callable $handler) use ($logger, $formatter, $logLevel) {
+            return function ($request, array $options) use ($handler, $logger, $formatter, $logLevel) {
+                return $handler($request, $options)->then(
+                    function ($response) use ($logger, $request, $formatter, $logLevel) {
+                        $message = $formatter->format($request, $response);
+                        $context[AbstractApiResponse::X_CORRELATION_ID] = $response->getHeader(
+                            AbstractApiResponse::X_CORRELATION_ID
+                        );
+                        $logger->log($logLevel, $message, $context);
+                        return $response;
+                    },
+                    function ($reason) use ($logger, $request, $formatter) {
+                        $response = null;
+                        $context = [];
+                        if ($reason instanceof RequestException) {
+                            $response = $reason->getResponse();
+                            $context[AbstractApiResponse::X_CORRELATION_ID] = $response->getHeader(
+                                AbstractApiResponse::X_CORRELATION_ID
+                            );
+                        }
+                        $message = $formatter->format($request, $response, $reason);
+                        $logger->notice($message, $context);
+                        return \GuzzleHttp\Promise\rejection_for($reason);
+                    }
+                );
+            };
+        };
     }
 
     public function addHandler($handler)

src/Error/Message.php

@@ -27,6 +27,7 @@ class Message
     const UNKNOWN_METHOD = 'Unknown method: %s';
     const UNKNOWN_FIELD = 'Unknown field: "%s" - called: %s(%s)';
     const WRONG_TYPE = 'Wrong type for field "%s". Expected %s.';
+    const WRONG_ARGUMENT_TYPE = 'Wrong type for argument "%s". Expected %s.';
     const EXPECTS_PARAMETER = 'Excepts parameter "%s" to be %s, null given.';
 
     const NO_LANGUAGES_PROVIDED = 'No languages provided';

src/Helper/State/Renderer/TransitionRenderer.php

@@ -20,17 +20,19 @@ public function render(State $state)
         $graph = '';
         $color = static::COMMAND_COLOR;
 
-        foreach ($state->getTransitions() as $transition) {
-            /**
-             * @var State $targetState
-             */
-            $targetState = $transition->getObj();
-            if ($targetState->getKey() === $state->getKey()) {
-                $graph .= '  edge[dir="back",style="solid",color="' . $color . '"] state_'
-                    . $state->getKey() . ' -> state_' . $state->getKey()  . ';' . PHP_EOL;
-            } else {
-                $graph .= '  edge[dir="forward",style="solid",color="' . $color . '"] state_'
-                    . $state->getKey() . ' -> state_' . $targetState->getKey() . ' ;' . PHP_EOL;
+        if ($state->getTransitions()) {
+            foreach ($state->getTransitions() as $transition) {
+                /**
+                 * @var State $targetState
+                 */
+                $targetState = $transition->getObj();
+                if ($targetState->getKey() === $state->getKey()) {
+                    $graph .= '  edge[dir="back",style="solid",color="' . $color . '"] state_'
+                        . $state->getKey() . ' -> state_' . $state->getKey()  . ';' . PHP_EOL;
+                } else {
+                    $graph .= '  edge[dir="forward",style="solid",color="' . $color . '"] state_'
+                        . $state->getKey() . ' -> state_' . $targetState->getKey() . ' ;' . PHP_EOL;
+                }
             }
         }
 

src/Model/Cart/ExternalLineItemTotalPrice.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * @author @jayS-de <[email protected]>
+ */
+
+namespace Commercetools\Core\Model\Cart;
+
+use Commercetools\Core\Model\Common\JsonObject;
+use Commercetools\Core\Model\DiscountCode\DiscountCodeReference;
+use Commercetools\Core\Model\Common\Money;
+
+/**
+ * @package Commercetools\Core\Model\Cart
+ * @link https://dev.commercetools.com/http-api-projects-carts.html#externallineitemtotalprice
+ * @method Money getPrice()
+ * @method ExternalLineItemTotalPrice setPrice(Money $price = null)
+ * @method Money getTotalPrice()
+ * @method ExternalLineItemTotalPrice setTotalPrice(Money $totalPrice = null)
+ */
+class ExternalLineItemTotalPrice extends JsonObject
+{
+    public function fieldDefinitions()
+    {
+        return [
+            'price' => [static::TYPE => '\Commercetools\Core\Model\Common\Money'],
+            'totalPrice' => [static::TYPE => '\Commercetools\Core\Model\Common\Money']
+        ];
+    }
+}

src/Model/Cart/LineItem.php

@@ -48,9 +48,14 @@
  * @method DiscountedPricePerQuantityCollection getDiscountedPricePerQuantity()
  * @method TaxedItemPrice getTaxedPrice()
  * @method LineItem setTaxedPrice(TaxedItemPrice $taxedPrice = null)
+ * @method string getPriceMode()
+ * @method LineItem setPriceMode(string $priceMode = null)
  */
 class LineItem extends JsonObject
 {
+    const PRICE_MODE_PLATFORM = 'Platform';
+    const PRICE_MODE_EXTERNAL_TOTAL = 'ExternalTotal';
+
     public function fieldDefinitions()
     {
         return [
@@ -71,6 +76,7 @@ public function fieldDefinitions()
             'discountedPricePerQuantity' => [
                 static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
             ],
+            'priceMode' => [static::TYPE => 'string']
         ];
     }
 

src/Model/Common/Reference.php

@@ -6,6 +6,25 @@
 
 namespace Commercetools\Core\Model\Common;
 
+use Commercetools\Core\Model\Cart\CartReference;
+use Commercetools\Core\Model\CartDiscount\CartDiscountReference;
+use Commercetools\Core\Model\Category\CategoryReference;
+use Commercetools\Core\Model\Channel\ChannelReference;
+use Commercetools\Core\Model\Customer\CustomerReference;
+use Commercetools\Core\Model\CustomerGroup\CustomerGroupReference;
+use Commercetools\Core\Model\CustomObject\CustomObjectReference;
+use Commercetools\Core\Model\DiscountCode\DiscountCodeReference;
+use Commercetools\Core\Model\Order\OrderReference;
+use Commercetools\Core\Model\Payment\PaymentReference;
+use Commercetools\Core\Model\Product\ProductReference;
+use Commercetools\Core\Model\ProductDiscount\ProductDiscountReference;
+use Commercetools\Core\Model\ProductType\ProductTypeReference;
+use Commercetools\Core\Model\ShippingMethod\ShippingMethodReference;
+use Commercetools\Core\Model\State\StateReference;
+use Commercetools\Core\Model\TaxCategory\TaxCategoryReference;
+use Commercetools\Core\Model\Type\TypeReference;
+use Commercetools\Core\Model\Zone\ZoneReference;
+
 /**
  * @package Commercetools\Core\Model\Common
  * @link https://dev.commercetools.com/http-api-types.html#reference
@@ -31,4 +50,49 @@ public function fieldDefinitions()
 
         return $fieldDefinitions;
     }
+
+    /**
+     * @param array $data
+     * @param Context|callable $context
+     * @return static
+     */
+    public static function fromArray(array $data, $context = null)
+    {
+        if (get_called_class() == 'Commercetools\Core\Model\Common\Reference' && isset($data[static::TYPE_ID])) {
+            $className = static::referenceType($data[static::TYPE_ID]);
+            if (class_exists($className)) {
+                return new $className($data, $context);
+            }
+        }
+        return new static($data, $context);
+    }
+
+    protected static function referenceType($typeId)
+    {
+        $types = [
+            CartReference::TYPE_CART => '\Commercetools\Core\Model\Cart\CartReference',
+            CartDiscountReference::TYPE_CART_DISCOUNT => '\Commercetools\Core\Model\CartDiscount\CartDiscountReference',
+            CategoryReference::TYPE_CATEGORY => '\Commercetools\Core\Model\Category\CategoryReference',
+            ChannelReference::TYPE_CHANNEL => '\Commercetools\Core\Model\Channel\ChannelReference',
+            CustomerReference::TYPE_CUSTOMER => '\Commercetools\Core\Model\Customer\CustomerReference',
+            CustomObjectReference::TYPE_CUSTOM_OBJECT => '\Commercetools\Core\Model\CustomObject\CustomObjectReference',
+            CustomerGroupReference::TYPE_CUSTOMER_GROUP =>
+                '\Commercetools\Core\Model\CustomerGroup\CustomerGroupReference',
+            DiscountCodeReference::TYPE_DISCOUNT_CODE => '\Commercetools\Core\Model\DiscountCode\DiscountCodeReference',
+            CustomObjectReference::TYPE_CUSTOM_OBJECT => '\Commercetools\Core\Model\CustomObject\CustomObjectReference',
+            PaymentReference::TYPE_PAYMENT => '\Commercetools\Core\Model\Payment\PaymentReference',
+            ProductReference::TYPE_PRODUCT => '\Commercetools\Core\Model\Product\ProductReference',
+            ProductDiscountReference::TYPE_PRODUCT_DISCOUNT =>
+                '\Commercetools\Core\Model\ProductDiscount\ProductDiscountReference',
+            ProductTypeReference::TYPE_PRODUCT_TYPE => '\Commercetools\Core\Model\ProductType\ProductTypeReference',
+            OrderReference::TYPE_ORDER => '\Commercetools\Core\Model\Order\OrderReference',
+            ShippingMethodReference::TYPE_SHIPPING_METHOD =>
+                '\Commercetools\Core\Model\ShippingMethod\ShippingMethodReference',
+            StateReference::TYPE_STATE => '\Commercetools\Core\Model\State\StateReference',
+            TaxCategoryReference::TYPE_TAX_CATEGORY => '\Commercetools\Core\Model\TaxCategory\TaxCategoryReference',
+            TypeReference::TYPE_TYPE => '\Commercetools\Core\Model\Type\TypeReference',
+            ZoneReference::TYPE_ZONE => '\Commercetools\Core\Model\Zone\ZoneReference',
+        ];
+        return isset($types[$typeId]) ? $types[$typeId] : '\Commercetools\Core\Model\Common\Reference';
+    }
 }