Merge branch 'release/v2.3.0'

Author: Jens Schulze

.scrutinizer.yml

@@ -1,34 +1,35 @@
 tools:
-    php_sim: true
-    php_pdepend: true
-    php_analyzer: true
-    php_code_sniffer: true
-    php_changetracking: true
-    php_mess_detector: true
-    sensiolabs_security_checker: true
-    php_cs_fixer:
-        config: { level: psr2 }
+  php_sim: true
+  php_pdepend: true
+  php_analyzer: true
+  php_code_sniffer: true
+  php_changetracking: true
+  php_mess_detector: true
+  sensiolabs_security_checker: true
+  php_cs_fixer:
+    config: { level: psr2 }
 before_commands:
-    - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
-    - composer global require hirak/prestissimo
-    - composer install --prefer-dist -o
+  - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
+  - composer global require hirak/prestissimo
+  - composer install --prefer-dist -o
 build:
-    environment:
-        php: '7.0'
-    dependencies:
-        before:
-            #Only 5.4 uses APC
-            - if [[ "`phpenv version-name`" =~ "^5.4" ]] && [ "`phpenv version-name`" != "hhvm" ]; then echo -e "apc.enabled=1\napc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-            #+5.5 uses APCU
-            - if [[ ! "`phpenv version-name`" =~ "^5.4" ]] && [ "`phpenv version-name`" != "hhvm" ]; then printf "\n"| echo -e "apc.enabled=1\napc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-    tests:
+  environment:
+    php:
+      version: '7.1'
+      ini:
+        apc.enabled: 1
+        apc.enable_cli: 1
+  nodes:
+    my-tests:
+      tests:
         override:
-            -
-                command: vendor/bin/behat -f progress
-            -
-                command: vendor/bin/phpunit -d zend.enable_gc=0 --coverage-clover=coverage0
-                coverage:
-                    file: 'coverage0'
-                    format: 'php-clover'
+          -
+            command: vendor/bin/behat -f progress
+          -
+            command: vendor/bin/phpunit --coverage-clover=coverage0
+            coverage:
+              file: 'coverage0'
+              format: 'php-clover'
+          - command: php-scrutinizer-run
 filter:
-    excluded_paths: [build/*, tests/*, docroot/*, features/*]
+    excluded_paths: [build/*, tests/*, docroot/*, features/*, src/Core/Helper/Annotate/*, src/Core/Helper/State/*, src/Core/Helper/Subscriber/*]

.travis.yml

@@ -20,11 +20,12 @@ cache:
   directories:
   - vendor
 before_install:
+- openssl aes-256-cbc -K $encrypted_17acaeff100f_key -iv $encrypted_17acaeff100f_iv -in github_deploy_key.enc -out github_deploy_key -d
+- chmod 600 github_deploy_key
+- eval $(ssh-agent -s)
+- ssh-add github_deploy_key
 - PHP=$TRAVIS_PHP_VERSION
 - if [ $PHP != 'hhvm' ] ; then echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
-- if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -lt 70000 ]; then printf "yes\n" | pecl install -f apcu-4.0.10 ; fi
-- if [ $PHP != 'hhvm' ] && [ `php-config --vernum` -ge 70000 ] ; then printf "yes\n" | pecl install -f apcu ; fi
-- if [ $PHP != 'hhvm' ] ; then phpenv config-add ./tests/apc.ini; fi
 before_script:
 - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
 - if [ $GUZZLE == '5' ] ; then ./set_guzzle5.sh; fi
@@ -35,7 +36,7 @@ script:
 - ant phpcs-ci
 - if [ $GUZZLE == '5' ] || [ $PHP == '5.6' ] || [ $PHP == 'hhvm' ] ; then vendor/bin/phpunit -c phpunit5.xml.dist --testsuite=unit; fi
 - if [ $GUZZLE == '6' ] && [ $PHP != '5.6' ] ; then vendor/bin/phpunit --testsuite=unit; fi
-- if [ $PHP == '7.0' ] && [ $GUZZLE == '6' ] ; then vendor/bin/phpunit --testsuite=integration; fi
+- if [ $PHP == '7.0' ] && [ $GUZZLE == '6' ] && [ $TRAVIS_PULL_REQUEST == 'false' ]; then vendor/bin/phpunit --testsuite=integration; fi
 - ant behat
 after_success:
 - if [ $PHP == '7.1' ] && [ $GUZZLE == '6' ] ; then ./push-docs-to-gh-pages.sh; fi

CHANGELOG.md

@@ -1,3 +1,45 @@
+<a name="2.3.0"></a>
+# [2.3.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.2.1...v2.3.0) (2018-03-13)
+
+
+### Bug Fixes
+
+* **Context:** fix setting of uninitialized properties in context object ([adbb71f](https://github.com/commercetools/commercetools-php-sdk/commit/adbb71f)), closes [#379](https://github.com/commercetools/commercetools-php-sdk/issues/379)
+* **Query:** fix undesired sort of query parameter sort ([f22bd65](https://github.com/commercetools/commercetools-php-sdk/commit/f22bd65)), closes [#386](https://github.com/commercetools/commercetools-php-sdk/issues/386)
+
+
+### Features
+
+* **CartDiscount:** support cart discount stacking mode ([64f18b8](https://github.com/commercetools/commercetools-php-sdk/commit/64f18b8)), closes [#354](https://github.com/commercetools/commercetools-php-sdk/issues/354)
+* **CartDiscount:** support multi buy discounts ([5207c2b](https://github.com/commercetools/commercetools-php-sdk/commit/5207c2b)), closes [#353](https://github.com/commercetools/commercetools-php-sdk/issues/353)
+* **Context:** add interface for CurrencyFormatter ([b35abff](https://github.com/commercetools/commercetools-php-sdk/commit/b35abff))
+* **CustomObject:** add CustomObjectByIdGetRequest ([2194d3e](https://github.com/commercetools/commercetools-php-sdk/commit/2194d3e))
+* **DiscountCode:** support custom fields for discount codes ([80aa86f](https://github.com/commercetools/commercetools-php-sdk/commit/80aa86f)), closes [#352](https://github.com/commercetools/commercetools-php-sdk/issues/352)
+* **DiscountCode:** support validFrom and validUntil for discount codes ([523929a](https://github.com/commercetools/commercetools-php-sdk/commit/523929a)), closes [#367](https://github.com/commercetools/commercetools-php-sdk/issues/367)
+* **DiscountCode:** support groups for discount codes ([53a8f05](https://github.com/commercetools/commercetools-php-sdk/commit/53a8f05)), closes [#362](https://github.com/commercetools/commercetools-php-sdk/issues/362)
+* **Order:** support delivery update actions ([d033399](https://github.com/commercetools/commercetools-php-sdk/commit/d033399)), closes [#369](https://github.com/commercetools/commercetools-php-sdk/issues/369)
+* **Order:** support get/update/delete order by orderNumber ([dc1a101](https://github.com/commercetools/commercetools-php-sdk/commit/dc1a101)), closes [#356](https://github.com/commercetools/commercetools-php-sdk/issues/356)
+* **Order:** support parcel delivery items ([6f35c31](https://github.com/commercetools/commercetools-php-sdk/commit/6f35c31)), closes [#357](https://github.com/commercetools/commercetools-php-sdk/issues/357)
+* **Cart:** support tax calculation mode ([2ef543b](https://github.com/commercetools/commercetools-php-sdk/commit/2ef543b)), closes [#376](https://github.com/commercetools/commercetools-php-sdk/issues/376)
+* **Payment:** support get/update/delete payment by key ([da32ce6](https://github.com/commercetools/commercetools-php-sdk/commit/da32ce6)), closes [#349](https://github.com/commercetools/commercetools-php-sdk/issues/349)
+* **State:** add constant for state role return ([b713135](https://github.com/commercetools/commercetools-php-sdk/commit/b713135)), closes [#363](https://github.com/commercetools/commercetools-php-sdk/issues/363)
+* **Order:** support address for order deliveries ([8ef8dea](https://github.com/commercetools/commercetools-php-sdk/commit/8ef8dea)), closes [#366](https://github.com/commercetools/commercetools-php-sdk/issues/366)
+* **Client:** support client instantiation with preconfigured bearer token ([d93a455](https://github.com/commercetools/commercetools-php-sdk/commit/d93a455)), closes [#359](https://github.com/commercetools/commercetools-php-sdk/issues/359)
+* **CartDiscount:** support custom field for cart discounts ([a8325c1](https://github.com/commercetools/commercetools-php-sdk/commit/a8325c1)), closes [#373](https://github.com/commercetools/commercetools-php-sdk/issues/373)
+* **CustomerGroup:** support custom field for customer groups ([23d1737](https://github.com/commercetools/commercetools-php-sdk/commit/23d1737)), closes [#360](https://github.com/commercetools/commercetools-php-sdk/issues/360)
+* **Assets:** support key for assets ([a3c9ea0](https://github.com/commercetools/commercetools-php-sdk/commit/a3c9ea0)), closes [#371](https://github.com/commercetools/commercetools-php-sdk/issues/371)
+* **Cart:** support origin for carts and orders ([37db8de](https://github.com/commercetools/commercetools-php-sdk/commit/37db8de)), closes [#361](https://github.com/commercetools/commercetools-php-sdk/issues/361)
+* **Product:** support revertStagedVariantChanges ([18d0be2](https://github.com/commercetools/commercetools-php-sdk/commit/18d0be2)), closes [#372](https://github.com/commercetools/commercetools-php-sdk/issues/372)
+* **ProductDiscount:** support validFrom and validUntil for product discounts ([c75e53c](https://github.com/commercetools/commercetools-php-sdk/commit/c75e53c)), closes [#368](https://github.com/commercetools/commercetools-php-sdk/issues/368)
+* **ProductType:** support changeAttributeConstraint update action ([52932d8](https://github.com/commercetools/commercetools-php-sdk/commit/52932d8)), closes [#370](https://github.com/commercetools/commercetools-php-sdk/issues/370)
+* **ShippingMethod:** support setPredicate on shipping methods ([ec2fce5](https://github.com/commercetools/commercetools-php-sdk/commit/ec2fce5)), closes [#375](https://github.com/commercetools/commercetools-php-sdk/issues/375)
+* **Product:** support staged flag for product meta update actions ([b60aab0](https://github.com/commercetools/commercetools-php-sdk/commit/b60aab0)), closes [#358](https://github.com/commercetools/commercetools-php-sdk/issues/358)
+* **ShippingMethod:** support shipping rate tiers ([#384](https://github.com/commercetools/commercetools-php-sdk/issues/384)) ([7611315](https://github.com/commercetools/commercetools-php-sdk/commit/7611315)), closes [#355](https://github.com/commercetools/commercetools-php-sdk/issues/355)
+* **ShoppingList:** support add line item by SKU ([7172e1c](https://github.com/commercetools/commercetools-php-sdk/commit/7172e1c)), closes [#374](https://github.com/commercetools/commercetools-php-sdk/issues/374)
+* **Customer:** support updateProductData of cart on customer login ([555ccb3](https://github.com/commercetools/commercetools-php-sdk/commit/555ccb3)), closes [#377](https://github.com/commercetools/commercetools-php-sdk/issues/377)
+
+
+
 <a name="2.2.1"></a>
 ## [2.2.1](https://github.com/commercetools/commercetools-php-sdk/compare/v2.2.0...v2.2.1) (2017-10-06)
 
@@ -137,7 +179,7 @@
 ### DEPRECATION NOTE
 
 The class ```Commercetools\Commons\Helper\PriceFinder``` has been deprecated. Please use the 
-[price selection](http://dev.commercetools.com/http-api-projects-products.html#price-selection) functionality of
+[price selection](http://docs.commercetools.com/http-api-projects-products.html#price-selection) functionality of
 the platform. E.g. ```ProductProjectionSearchRequest::of()->currency('EUR')->country('DE')```
 
 

CONTRIBUTING.md

@@ -0,0 +1,8 @@
+Feel free to open an issue for bigger effort changes and ask if you can help or get help with your idea. For typos and documentation improvements just make a pull request.
+
+Then:
+
+ 1. fork the repository on GitHub
+ 1. code and add tests that cover the created code. Your code should be warning-free.
+ 1. stick to PSR-2 and and don't reformat existing code.
+ 1. make a pull request. @jenschude will review it and pull or come back to you.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 commercetools GmbH and contributors
+Copyright (c) 2017 commercetools GmbH and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,4 @@
+1. code and add tests that cover the created code. Your code should be warning-free.
+   * [ ] tests existing
+1. stick to PSR-2 and and don't reformat existing code.
+   * [ ] code style check succesful

README.md

@@ -105,6 +105,30 @@ foreach ($products as $product) {
 
 In real world, you will not put your API credentials directly into code but use a config file or your framework's config or dependency injection system for that.
 
+#### Using the phar distribution
+
+Since version 1.6 the SDK is also released as a PHAR. You can find them in the [releases section](https://github.com/commercetools/commercetools-php-sdk/releases) at Github.
+
+Usage example:
+```php
+<?php
+
+require __DIR__ . '/commercetools-php-sdk.phar';
+
+$config = \Commercetools\Core\Config::fromArray([
+    'client_id' => 'myClientId',
+     'client_secret' => 'myClientSecret',
+      'project' => 'myProjectId'
+]);
+$client = \Commercetools\Core\Client::ofConfig($config);
+$request = \Commercetools\Core\Request\Project\ProjectGetRequest::of();
+
+$response = $client->execute($request);
+
+$project = $request->mapFromResponse($response);
+var_dump($project->toArray());
+```
+ 
 ## Improve & Contribute to the SDK project
 
 ### Mac OS X preparations:
@@ -209,7 +233,7 @@ Then:
  1. fork the repository on GitHub
  2. code and add tests that cover the created code. Your code should be warning-free.
  3. stick to PSR-2 and and don't reformat existing code.
- 4. make a pull request.  @jayS-de will review it and pull or come back to you.
+ 4. make a pull request.  @jenschude will review it and pull or come back to you.
 
 
 

build.xml

@@ -11,7 +11,7 @@
     <!-- <property name="toolsdir" value="${basedir}/vendor/bin/"/> -->
 
     <target name="build"
-            depends="prepare,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,unit-test,apigen"
+            depends="prepare,lint,phpcs-ci,unit-test,apigen"
             description=""/>
 
     <target name="build-parallel"
@@ -20,13 +20,7 @@
 
     <target name="tools-parallel" description="Run tools in parallel">
         <parallel threadCount="2">
-            <sequential>
-                <antcall target="pdepend"/>
-                <antcall target="phpmd-ci"/>
-            </sequential>
-            <antcall target="phpcpd-ci"/>
             <antcall target="phpcs-ci"/>
-            <antcall target="phploc-ci"/>
         </parallel>
     </target>
 
@@ -36,7 +30,6 @@
         <delete dir="${basedir}/build/docs"/>
         <delete dir="${basedir}/build/coverage"/>
         <delete dir="${basedir}/build/logs"/>
-        <delete dir="${basedir}/build/pdepend"/>
         <property name="clean.done" value="true"/>
     </target>
 
@@ -47,7 +40,6 @@
         <mkdir dir="${basedir}/build/docs"/>
         <mkdir dir="${basedir}/build/coverage"/>
         <mkdir dir="${basedir}/build/logs"/>
-        <mkdir dir="${basedir}/build/pdepend"/>
         <property name="prepare.done" value="true"/>
     </target>
 
@@ -67,63 +59,6 @@
         </apply>
     </target>
 
-    <target name="phploc"
-            description="Measure project size using PHPLOC and print human readable output. Intended for usage on the command line.">
-        <exec executable="${toolsdir}phploc${execPostfix}">
-            <arg value="--count-tests" />
-            <arg path="${basedir}/src" />
-            <arg path="${basedir}/tests" />
-        </exec>
-    </target>
-
-    <target name="phploc-ci"
-            depends="prepare"
-            description="Measure project size using PHPLOC and log result in CSV and XML format. Intended for usage within a continuous integration environment.">
-        <exec executable="${toolsdir}phploc${execPostfix}">
-            <arg value="--count-tests" />
-            <arg value="--log-csv" />
-            <arg path="${basedir}/build/logs/phploc.csv" />
-            <arg value="--log-xml" />
-            <arg path="${basedir}/build/logs/phploc.xml" />
-            <arg path="${basedir}/src" />
-            <arg path="${basedir}/tests" />
-        </exec>
-    </target>
-
-    <target name="pdepend"
-            depends="prepare"
-            description="Calculate software metrics using PHP_Depend and log result in XML format. Intended for usage within a continuous integration environment.">
-        <exec executable="${toolsdir}pdepend${execPostfix}">
-            <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-            <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-            <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-            <arg path="${basedir}/src" />
-        </exec>
-    </target>
-
-    <target name="phpmd"
-            description="Perform project mess detection using PHPMD and print human readable output. Intended for usage on the command line before committing.">
-        <exec executable="${toolsdir}phpmd${execPostfix}">
-            <arg path="${basedir}/src" />
-            <arg value="text" />
-            <arg value="codesize,controversial,design,naming,unusedcode"/>
-            <arg path="${basedir}/build/phpmd.xml" />
-        </exec>
-    </target>
-
-    <target name="phpmd-ci"
-            depends="prepare"
-            description="Perform project mess detection using PHPMD and log result in XML format. Intended for usage within a continuous integration environment.">
-        <exec executable="${toolsdir}phpmd${execPostfix}">
-            <arg path="${basedir}/src" />
-            <arg value="xml" />
-            <arg value="codesize,controversial,design,naming,unusedcode"/>
-            <arg path="${basedir}/build/phpmd.xml" />
-            <arg value="--reportfile" />
-            <arg path="${basedir}/build/logs/pmd.xml" />
-        </exec>
-    </target>
-
     <target name="phpcs"
             description="Find coding standard violations using PHP_CodeSniffer and print human readable output. Intended for usage on the command line before committing.">
         <exec executable="${toolsdir}phpcs${execPostfix}" failonerror="true">
@@ -146,23 +81,6 @@
         </exec>
     </target>
 
-    <target name="phpcpd"
-            description="Find duplicate code using PHPCPD and print human readable output. Intended for usage on the command line before committing.">
-        <exec executable="${toolsdir}phpcpd${execPostfix}">
-            <arg path="${basedir}/src" />
-        </exec>
-    </target>
-
-    <target name="phpcpd-ci"
-            depends="prepare"
-            description="Find duplicate code using PHPCPD and log result in XML format. Intended for usage within a continuous integration environment.">
-        <exec executable="${toolsdir}phpcpd${execPostfix}">
-            <arg value="--log-pmd" />
-            <arg path="${basedir}/build/logs/pmd-cpd.xml" />
-            <arg path="${basedir}/src" />
-        </exec>
-    </target>
-
     <target name="behat"
             depends="prepare"
             description="Run behat tests"

build/theme/class.latte

@@ -78,7 +78,7 @@
 		{if $class->internal}<b>PHP Extension:</b> <a href="{$class->extension|manualUrl}" title="Go to PHP documentation">{$class->extension->name|firstUpper}</a><br>{/if}
 		{if $class->inNamespace()}<b>Namespace:</b> {$class->namespaceName|namespaceLinks|noescape}<br>{/if}
 
-        {var $sphereDoc = '//dev.commercetools.com/'}
+        {var $sphereDoc = '//docs.commercetools.com/'}
 		{foreach $template->annotationSort($template->annotationFilter($class->annotations)) as $annotation => $values}
 			{foreach $values as $value}
 			    {if $annotation == "link"}