Merge branch 'release/v1.6.0'

Author: Jens Schulze

.travis.yml

@@ -1,45 +1,48 @@
 language: php
 php:
-  - 5.6
-  - 5.5
-  - 5.4
-  - 7.0
-  - hhvm
-
+- 7.0
+- 5.6
+- 5.5
+- 5.4
+- 7.1
+- hhvm
+- nightly
 matrix:
   allow_failures:
-    - php: hhvm
-
+  - php: 7.1
+  - php: hhvm
+  - php: nightly
 services:
-  - redis-server
-
+- redis-server
 cache:
   directories:
   - vendor
-
 before_script:
-  - PHP=$TRAVIS_PHP_VERSION
-  - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
-  - sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -lt 70000 ] ; then echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi"
-  - sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -ge 50400 ] && [ `php-config --vernum` -lt 70000 ]; then printf "yes\n" | pecl install -f apcu-4.0.10 ; fi"
-  - sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -ge 70000 ] ; then printf "yes\n" | pecl install -f apcu-5.1.3 ; fi"
-  - sh -c "if [ $PHP != 'hhvm' ] ; then phpenv config-add ./tests/apc.ini; fi"
-  - if [ $PHP == '5.4' ] ; then ./set_guzzle5.sh; fi
-  - composer global require hirak/prestissimo
-  - composer self-update
-  - if [ $PHP == '5.4' ] ; then composer update -o --prefer-dist --prefer-lowest; fi
-  - if [ $PHP != '5.4' ] ; then composer install -o --prefer-dist; fi
-
+- PHP=$TRAVIS_PHP_VERSION
+- composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
+- sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -lt 70000 ] ; then echo
+  'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  ; fi"
+- sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -ge 50400 ] && [ `php-config
+  --vernum` -lt 70000 ]; then printf "yes\n" | pecl install -f apcu-4.0.10 ; fi"
+- sh -c "if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -ge 70000 ] ; then printf
+  "yes\n" | pecl install -f apcu-5.1.7 ; fi"
+- sh -c "if [ $PHP != 'hhvm' ] ; then phpenv config-add ./tests/apc.ini; fi"
+- if [ $PHP == '5.4' ] ; then ./set_guzzle5.sh; fi
+- if [ $PHP != 'nightly' ] && [ $PHP != '7.1' ]; then composer global require hirak/prestissimo;
+  fi
+- if [ $PHP == '5.4' ] ; then composer update -o --prefer-dist --prefer-lowest; fi
+- if [ $PHP != '5.4' ] ; then composer install -o --prefer-dist; fi
 script:
-  - ant phpcs-ci
-  - phpunit --testsuite=unit
-  - if [ $PHP == '7.0' ] ; then phpunit --testsuite=integration; fi
-  - ant behat
-
+- ant phpcs-ci
+- phpunit --testsuite=unit
+- if [ $PHP == '7.0' ] ; then phpunit --testsuite=integration; fi
+- ant behat
 after_success:
-  - ./push-docs-to-gh-pages.sh
-
+- ./push-docs-to-gh-pages.sh
 notifications:
   hipchat:
     rooms:
       secure: VD5RvUZYVg1aokw8OeMhNfDPc39o2r4Jjq8s6U2QvMXzoiopHpj6+VYX1AHbhxMpBGmsgKfzbYQ6XfubJUeHq+FMzW3YEekwcyqXKCfWi5tLCE7Epb0dCySatztVTkqlXzXaAM6NhzdFxG6kQPiA9OcSvRPZmSwjuX4eYXRokRw=
+  slack:
+    secure: ZZ4PVXEv9FXuk81pRBCYAPZYeKnqvYYPd5DKB3E9WWKZQAZExMtSvqa7cDcbvQRk7jsD6E1RvTIn42p2jjypXN8ZKbmjsshrVd02fhmmwP7cQk9s3WE1fZhYt7CnCu0EJHOK3/fC3ddOXFJ/xlFvM3DXDd1RRZfBzVz5XWeQDr8=

CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="1.6.0"></a>
+# [1.6.0](https://github.com/commercetools/commercetools-php-sdk/compare/v1.5.1...v1.6.0) (2017-01-09)
+
+
+### Bug Fixes
+
+* **Cart:** rewind line items in helper method ([cbd2426](https://github.com/commercetools/commercetools-php-sdk/commit/cbd2426)), closes [#281](https://github.com/commercetools/commercetools-php-sdk/issues/281)
+* **Client:** typo in call to getOauthManager ([e9cc4a7](https://github.com/commercetools/commercetools-php-sdk/commit/e9cc4a7)), closes [#277](https://github.com/commercetools/commercetools-php-sdk/issues/277)
+
+### Features
+
+* **Cart:** add product type reference to line item ([e795540](https://github.com/commercetools/commercetools-php-sdk/commit/e795540)), closes [#280](https://github.com/commercetools/commercetools-php-sdk/issues/280)
+* **Channel:** add geo location information to channels ([b4d6024](https://github.com/commercetools/commercetools-php-sdk/commit/b4d6024)), closes [#272](https://github.com/commercetools/commercetools-php-sdk/issues/272)
+* **Channel:** add setGeolocation update action ([db4b46e](https://github.com/commercetools/commercetools-php-sdk/commit/db4b46e))
+* **Customer:** add shipping and billing address ids ([6e48320](https://github.com/commercetools/commercetools-php-sdk/commit/6e48320)), closes [#278](https://github.com/commercetools/commercetools-php-sdk/issues/278)
+* **GraphQL:** support GraphQL variables ([61eca3e](https://github.com/commercetools/commercetools-php-sdk/commit/61eca3e)), closes [#271](https://github.com/commercetools/commercetools-php-sdk/issues/271)
+* **ProductSearch:** add productCount to FacetResult ([8e0c946](https://github.com/commercetools/commercetools-php-sdk/commit/8e0c946)), closes [#279](https://github.com/commercetools/commercetools-php-sdk/issues/279)
+* **Subscriptions:** Support AwsSNS for subscriptions ([f4e2c0e](https://github.com/commercetools/commercetools-php-sdk/commit/f4e2c0e)), closes [#282](https://github.com/commercetools/commercetools-php-sdk/issues/282)
+
+
+
 <a name="1.5.1"></a>
 ## [1.5.1](https://github.com/commercetools/commercetools-php-sdk/compare/v1.5.0...v1.5.1) (2016-11-21)
 

composer.json

@@ -61,7 +61,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "1.5-dev"
+      "dev-develop": "1.7-dev"
     },
     "incenteev-parameters": [
       {

index.php

@@ -0,0 +1,6 @@
+<?php
+/**
+ * This is a bootstrap file for a phar distribution of the SDK in order to be able to use
+ * `require 'commercetools-php-sdk.phar';`
+ */
+require __DIR__ . '/vendor/autoload.php';

src/AbstractHttpClient.php

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

src/Client.php

@@ -283,7 +283,7 @@ function ($httpResponse) use ($httpRequest) {
      */
     protected function createHttpRequest(ClientRequestInterface $request)
     {
-        $token = $this->getOAuthManager()->getToken();
+        $token = $this->getOauthManager()->getToken();
 
         $httpRequest = $request->httpRequest();
         $httpRequest = $httpRequest

src/Model/Cart/Cart.php

@@ -115,6 +115,7 @@ public function getLineItemCount()
             foreach ($this->getLineItems() as $lineItem) {
                 $count+= $lineItem->getQuantity();
             }
+            $this->getLineItems()->rewind();
         }
         return $count;
     }

src/Model/Cart/LineItem.php

@@ -15,6 +15,7 @@
 use Commercetools\Core\Model\TaxCategory\TaxRate;
 use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use Commercetools\Core\Model\Common\TaxedItemPrice;
+use Commercetools\Core\Model\ProductType\ProductTypeReference;
 
 /**
  * @package Commercetools\Core\Model\Cart
@@ -50,6 +51,8 @@
  * @method LineItem setTaxedPrice(TaxedItemPrice $taxedPrice = null)
  * @method string getPriceMode()
  * @method LineItem setPriceMode(string $priceMode = null)
+ * @method ProductTypeReference getProductType()
+ * @method LineItem setProductType(ProductTypeReference $productType = null)
  */
 class LineItem extends JsonObject
 {
@@ -76,7 +79,8 @@ public function fieldDefinitions()
             'discountedPricePerQuantity' => [
                 static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
             ],
-            'priceMode' => [static::TYPE => 'string']
+            'priceMode' => [static::TYPE => 'string'],
+            'productType' => [static::TYPE => '\Commercetools\Core\Model\ProductType\ProductTypeReference']
         ];
     }
 
@@ -100,6 +104,7 @@ public function getDiscountedPrice()
         foreach ($this->getDiscountedPricePerQuantity() as $discountedPricePerQuantity) {
             $centAmount += $discountedPricePerQuantity->getDiscountedTotal()->getCentAmount();
         }
+        $this->getDiscountedPricePerQuantity()->rewind();
         return Money::ofCurrencyAndAmount($currencyCode, $centAmount);
     }
 }

src/Model/Channel/Channel.php

@@ -11,6 +11,7 @@
 use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use Commercetools\Core\Model\Review\ReviewRatingStatistics;
 use Commercetools\Core\Model\Common\Address;
+use Commercetools\Core\Model\Common\GeoLocation;
 
 /**
  * @package Commercetools\Core\Model\Channel
@@ -37,6 +38,8 @@
  * @method Channel setReviewRatingStatistics(ReviewRatingStatistics $reviewRatingStatistics = null)
  * @method Address getAddress()
  * @method Channel setAddress(Address $address = null)
+ * @method GeoLocation getGeoLocation()
+ * @method Channel setGeoLocation(GeoLocation $geoLocation = null)
  * @method ChannelReference getReference()
  */
 class Channel extends Resource
@@ -61,6 +64,7 @@ public function fieldDefinitions()
             'reviewRatingStatistics' => [static::TYPE => '\Commercetools\Core\Model\Review\ReviewRatingStatistics'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
             'address' => [static::TYPE => '\Commercetools\Core\Model\Common\Address'],
+            'geoLocation' => [static::TYPE => '\Commercetools\Core\Model\Common\GeoLocation'],
         ];
     }
 }

src/Model/Channel/ChannelDraft.php

@@ -10,6 +10,7 @@
 use Commercetools\Core\Model\Common\LocalizedString;
 use Commercetools\Core\Model\CustomField\CustomFieldObjectDraft;
 use Commercetools\Core\Model\Common\Address;
+use Commercetools\Core\Model\Common\GeoLocation;
 
 /**
  * @package Commercetools\Core\Model\Channel
@@ -26,6 +27,8 @@
  * @method ChannelDraft setCustom(CustomFieldObjectDraft $custom = null)
  * @method Address getAddress()
  * @method ChannelDraft setAddress(Address $address = null)
+ * @method GeoLocation getGeoLocation()
+ * @method ChannelDraft setGeoLocation(GeoLocation $geoLocation = null)
  */
 class ChannelDraft extends JsonObject
 {
@@ -38,6 +41,7 @@ public function fieldDefinitions()
             'description' => [static::TYPE => '\Commercetools\Core\Model\Common\LocalizedString'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObjectDraft'],
             'address' => [static::TYPE => '\Commercetools\Core\Model\Common\Address'],
+            'geoLocation' => [static::TYPE => '\Commercetools\Core\Model\Common\GeoLocation'],
         ];
     }
 

src/Model/Common/GeoLocation.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * @author @jayS-de <jens.schulze@commercetools.de>
+ */
+
+namespace Commercetools\Core\Model\Common;
+
+/**
+ * @package Commercetools\Core\Model\Common
+ *
+ * @method string getType()
+ * @method GeoLocation setType(string $type = null)
+ * @method array getCoordinates()
+ * @method GeoLocation setCoordinates(array $coordinates = null)
+ */
+class GeoLocation extends JsonObject
+{
+    const TYPE_NAME = 'Point';
+
+    /**
+     * @param array $data
+     * @param Context|callable $context
+     */
+    public function __construct(array $data = [], $context = null)
+    {
+        parent::__construct($data, $context);
+        $name = static::TYPE_NAME;
+        if (!empty($name)) {
+            $this->setType(static::TYPE_NAME);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function fieldDefinitions()
+    {
+        return [
+            'type' => [static::TYPE => 'string'],
+            'coordinates' => [static::TYPE => 'array']
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @param Context|callable $context
+     * @return static
+     */
+    public static function fromArray(array $data, $context = null)
+    {
+        if (isset($data['type'])) {
+            $className = static::getGeoTypeByTypeName($data['type']);
+            if (class_exists($className)) {
+                return new $className($data, $context);
+            }
+        }
+        return new static($data, $context);
+    }
+
+    protected static function getGeoTypeByTypeName($apiType)
+    {
+        $className = '\Commercetools\Core\Model\Common\\Geo' . ucfirst($apiType);
+        return $className;
+    }
+}

src/Model/Common/GeoPoint.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @author @jayS-de <jens.schulze@commercetools.de>
+ */
+
+namespace Commercetools\Core\Model\Common;
+
+/**
+ * @package Commercetools\Core\Model\Common
+ *
+ * @method string getType()
+ * @method GeoPoint setType(string $type = null)
+ * @method array getCoordinates()
+ * @method GeoPoint setCoordinates(array $coordinates = null)
+ */
+class GeoPoint extends GeoLocation
+{
+    const TYPE_NAME = 'Point';
+}

src/Model/Customer/Customer.php

@@ -60,6 +60,10 @@
  * @method CustomFieldObject getCustom()
  * @method Customer setCustom(CustomFieldObject $custom = null)
  * @method string getLocale()
+ * @method array getShippingAddressIds()
+ * @method Customer setShippingAddressIds(array $shippingAddressIds = null)
+ * @method array getBillingAddressIds()
+ * @method Customer setBillingAddressIds(array $billingAddressIds = null)
  * @method CustomerReference getReference()
  */
 class Customer extends Resource
@@ -100,6 +104,8 @@ public function fieldDefinitions()
             'customerGroup' => [static::TYPE => '\Commercetools\Core\Model\CustomerGroup\CustomerGroupReference'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
             'locale' => [static::TYPE => 'string'],
+            'shippingAddressIds' => [static::TYPE => 'array'],
+            'billingAddressIds' => [static::TYPE => 'array'],
         ];
     }
 

src/Model/Customer/CustomerDraft.php

@@ -54,6 +54,10 @@
  * @method CustomFieldObjectDraft getCustom()
  * @method CustomerDraft setCustom(CustomFieldObjectDraft $custom = null)
  * @method string getLocale()
+ * @method array getBillingAddresses()
+ * @method CustomerDraft setBillingAddresses(array $billingAddresses = null)
+ * @method array getShippingAddresses()
+ * @method CustomerDraft setShippingAddresses(array $shippingAddresses = null)
  */
 class CustomerDraft extends JsonObject
 {
@@ -84,6 +88,8 @@ public function fieldDefinitions()
             'defaultBillingAddress' => [static::TYPE => 'int'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObjectDraft'],
             'locale' => [static::TYPE => 'string'],
+            'billingAddresses' => [static::TYPE => 'array'],
+            'shippingAddresses' => [static::TYPE => 'array'],
         ];
     }
 

src/Model/Product/FacetTerm.php

@@ -13,14 +13,17 @@
  * @method FacetTerm setTerm(string $term = null)
  * @method int getCount()
  * @method FacetTerm setCount(int $count = null)
+ * @method int getProductCount()
+ * @method FacetTerm setProductCount(int $productCount = null)
  */
 class FacetTerm extends JsonObject
 {
     public function fieldDefinitions()
     {
         return [
             'term' => [static::TYPE => 'string'],
-            'count' => [static::TYPE => 'int']
+            'count' => [static::TYPE => 'int'],
+            'productCount' => [static::TYPE => 'int'],
         ];
     }
 }