Merge branch 'release/v2.1.0'

Author: Jens Schulze

.travis.yml

@@ -37,7 +37,7 @@ script:
 - if [ $PHP == '7.0' ] && [ $GUZZLE == '6' ] ; then vendor/bin/phpunit --testsuite=integration; fi
 - ant behat
 after_success:
-- if [ $PHP == '5.6' ] && [ $GUZZLE == '6' ] ; then ./push-docs-to-gh-pages.sh; fi
+- if [ $PHP == '7.1' ] && [ $GUZZLE == '6' ] ; then ./push-docs-to-gh-pages.sh; fi
 notifications:
   hipchat:
     rooms:

CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="2.1.0"></a>
+# [2.1.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.0.0...v2.1.0) (2017-07-06)
+
+
+### Features
+
+* **Cart:** support external price for line items ([3a9d972](https://github.com/commercetools/commercetools-php-sdk/commit/3a9d972)), closes [#322](https://github.com/commercetools/commercetools-php-sdk/issues/322)
+* **CartDiscount:** support free gift line item ([ad58116](https://github.com/commercetools/commercetools-php-sdk/commit/ad58116)), closes [#325](https://github.com/commercetools/commercetools-php-sdk/issues/325)
+* **Category:** support category key functionality ([d2b63dd](https://github.com/commercetools/commercetools-php-sdk/commit/d2b63dd)), closes [#326](https://github.com/commercetools/commercetools-php-sdk/issues/326)
+* **Customer:** add get customer by email token request ([8de3b30](https://github.com/commercetools/commercetools-php-sdk/commit/8de3b30))
+* **Customer:** add salutation to customer ([c1c65fd](https://github.com/commercetools/commercetools-php-sdk/commit/c1c65fd)), closes [#324](https://github.com/commercetools/commercetools-php-sdk/issues/324)
+* **Messages:** add OrderPaymentStateChanged message ([6afb611](https://github.com/commercetools/commercetools-php-sdk/commit/6afb611)), closes [#312](https://github.com/commercetools/commercetools-php-sdk/issues/312)
+* **Messages:** add PaymentStatusInterfaceCodeSet message ([c5e0531](https://github.com/commercetools/commercetools-php-sdk/commit/c5e0531)), closes [#313](https://github.com/commercetools/commercetools-php-sdk/issues/313)
+* **Messages:** add ProductImageAdded message ([0e14d97](https://github.com/commercetools/commercetools-php-sdk/commit/0e14d97)), closes [#314](https://github.com/commercetools/commercetools-php-sdk/issues/314)
+* **Payment:** support key for payments ([1f40cef](https://github.com/commercetools/commercetools-php-sdk/commit/1f40cef)), closes [#315](https://github.com/commercetools/commercetools-php-sdk/issues/315)
+* **ProductType:** add change inputHint update action ([af666f6](https://github.com/commercetools/commercetools-php-sdk/commit/af666f6)), closes [#323](https://github.com/commercetools/commercetools-php-sdk/issues/323)
+* **ShippingMethod:** add isMatching flag to shipping rates ([c6b4328](https://github.com/commercetools/commercetools-php-sdk/commit/c6b4328))
+
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/commercetools/commercetools-php-sdk/compare/v1.7.0...v2.0.0) (2017-05-31)
 
@@ -17,6 +36,7 @@
 
 ### Features
 
+* **Product:** support tiered pricing ([93802cd](https://github.com/commercetools/commercetools-php-sdk/commit/93802cd)), closes [#303](https://github.com/commercetools/commercetools-php-sdk/issues/303)
 * **Cache:** support PSR-16 cache implementations ([c3ceac7](https://github.com/commercetools/commercetools-php-sdk/commit/c3ceac7)), closes [#297](https://github.com/commercetools/commercetools-php-sdk/issues/297)
 * **Client:** add logLevel configuration option ([8aa457a](https://github.com/commercetools/commercetools-php-sdk/commit/8aa457a)), closes [#300](https://github.com/commercetools/commercetools-php-sdk/issues/300)
 * **Client:** add possibility for additional headers when executing request ([74c5a15](https://github.com/commercetools/commercetools-php-sdk/commit/74c5a15))

build.xml

@@ -208,6 +208,7 @@
         <exec executable="php" dir="${basedir}" failonerror="true">
             <arg value="${basedir}/apigen.phar"/>
             <arg value="generate"/>
+            <arg value="--debug"/>
             <arg value="--config"/>
             <arg path="${basedir}/build/apigen.neon"/>
         </exec>

features/request/Customer/CustomerPasswordChange.feature

@@ -14,7 +14,7 @@ Feature: I want to change the customer's password
   Scenario: Get customer by password token
     Given a "customer" is identified by the token "tokenValue"
     Given i want to fetch a "Customer" by token
-    Then the path should be "customers?token=tokenValue"
+    Then the path should be "customers/password-token=tokenValue"
     And the method should be "GET"
 
   Scenario: Reset customers password

tools/package.json renamed to package.json

@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "2.0.0",
+  "version": "2.1.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",

push-docs-to-gh-pages.sh

@@ -9,9 +9,9 @@
 # to be called as "after_success: - ./push-docs-to-gh-pages.sh" in .travis.yml
 
 export SDK_VERSION=$TRAVIS_BRANCH;
-if [ $(phpenv version-name) = "5.6" ] ; then ant apigen; fi
+if [ $(phpenv version-name) = "7.1" ] ; then ant apigen; fi
 
-if [ "$TRAVIS_REPO_SLUG" == "commercetools/commercetools-php-sdk" ] && [ $(phpenv version-name) = "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
+if [ "$TRAVIS_REPO_SLUG" == "commercetools/commercetools-php-sdk" ] && [ $(phpenv version-name) = "7.1" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
   echo -e "Publishing documentation to gh-pages branch ...\n"
 
   cp -R build/docs $HOME/phpdoc-current

src/Core/AbstractHttpClient.php

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

src/Core/Helper/Annotate/AnnotationGenerator.php

@@ -61,6 +61,9 @@ protected function getJsonObjects(\RegexIterator $phpFiles)
         $jsonObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
+            if (strpos($class, 'Core\\Helper') > 0) {
+                continue;
+            }
 
             if (!empty($class)) {
                 if (in_array(JsonObject::class, class_parents($class))) {
@@ -77,6 +80,9 @@ protected function getCollectionObjects(\RegexIterator $phpFiles)
         $collectionObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
+            if (strpos($class, 'Core\\Helper') > 0) {
+                continue;
+            }
 
             if (!empty($class)) {
                 if (in_array(Collection::class, class_parents($class))) {
@@ -93,6 +99,9 @@ protected function getRequestObjects(\RegexIterator $phpFiles)
         $requestObjects = [];
         foreach ($phpFiles as $phpFile) {
             $class = $this->getClassName($phpFile->getRealPath());
+            if (strpos($class, 'Core\\Helper') > 0) {
+                continue;
+            }
 
             if (!empty($class)) {
                 if (in_array(AbstractApiRequest::class, class_parents($class))) {

src/Core/Model/Cart/Cart.php

@@ -5,6 +5,7 @@
 
 namespace Commercetools\Core\Model\Cart;
 
+use Commercetools\Core\Model\CartDiscount\CartDiscountReferenceCollection;
 use Commercetools\Core\Model\Common\Address;
 use Commercetools\Core\Model\Common\LocaleTrait;
 use Commercetools\Core\Model\Common\Resource;
@@ -68,6 +69,8 @@
  * @method Cart setTaxRoundingMode(string $taxRoundingMode = null)
  * @method int getDeleteDaysAfterLastModification()
  * @method Cart setDeleteDaysAfterLastModification(int $deleteDaysAfterLastModification = null)
+ * @method CartDiscountReferenceCollection getRefusedGifts()
+ * @method Cart setRefusedGifts(CartDiscountReferenceCollection $refusedGifts = null)
  * @method CartReference getReference()
  */
 class Cart extends Resource
@@ -114,7 +117,8 @@ public function fieldDefinitions()
             'anonymousId' => [static::TYPE => 'string'],
             'locale' => [static::TYPE => 'string'],
             'taxRoundingMode' => [static::TYPE => 'string'],
-            'deleteDaysAfterLastModification' => [static::TYPE => 'int']
+            'deleteDaysAfterLastModification' => [static::TYPE => 'int'],
+            'refusedGifts' => [static::TYPE => CartDiscountReferenceCollection::class],
         ];
     }
 

src/Core/Model/Cart/LineItem.php

@@ -53,11 +53,17 @@
  * @method LineItem setPriceMode(string $priceMode = null)
  * @method ProductTypeReference getProductType()
  * @method LineItem setProductType(ProductTypeReference $productType = null)
+ * @method string getLineItemMode()
+ * @method LineItem setLineItemMode(string $lineItemMode = null)
  */
 class LineItem extends JsonObject
 {
     const PRICE_MODE_PLATFORM = 'Platform';
     const PRICE_MODE_EXTERNAL_TOTAL = 'ExternalTotal';
+    const PRICE_MODE_EXTERNAL_PRICE = 'ExternalPrice';
+
+    const LINE_ITEM_MODE_STANDARD = 'Standard';
+    const LINE_ITEM_MODE_GIFT_LINE_ITEM = 'GiftLineItem';
 
     public function fieldDefinitions()
     {
@@ -80,7 +86,8 @@ public function fieldDefinitions()
                 static::TYPE => DiscountedPricePerQuantityCollection::class
             ],
             'priceMode' => [static::TYPE => 'string'],
-            'productType' => [static::TYPE => ProductTypeReference::class]
+            'lineItemMode' => [static::TYPE => 'string'],
+            'productType' => [static::TYPE => ProductTypeReference::class],
         ];
     }