Merge branch 'release/v1.0.0-RC9'

Author: Jens Schulze

.gitignore

@@ -11,3 +11,4 @@ composer.lock
 myapp.ini
 /local/
 /tools/node_modules
+requests.log

.travis.yml

@@ -1,15 +1,15 @@
 language: php
 php:
-  - "5.6"
-  - "5.5"
-  - "5.4"
-  - "nightly"
-  - "hhvm"
+  - 5.6
+  - 5.5
+  - 5.4
+  - 7.0
+  - hhvm
 
 matrix:
   allow_failures:
     - php: hhvm
-    - php: nightly
+    - php: 7.0
 
 services:
   - redis-server
@@ -20,16 +20,17 @@ cache:
 
 before_script:
   - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
-  - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] ; then echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi"
-  - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != 'nightly' ] && [ `php-config --vernum` -ge 50500 ] ; then pecl config-set preferred_state beta; printf "yes\n" | pecl install -f apcu ; else echo 'extension="apc.so"' >> ./tests/apc.ini ; fi"
-  - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ $TRAVIS_PHP_VERSION != 'nightly' ] ; then phpenv config-add ./tests/apc.ini; fi"
+  - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ `php-config --vernum` -lt 70000 ] ; then echo 'extension = redis.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi"
+  - sh -c "if [ $TRAVIS_PHP_VERSION != '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 [ $TRAVIS_PHP_VERSION != 'hhvm' ] && [ `php-config --vernum` -ge 70000 ] ; then printf "yes\n" | pecl install -f apcu ; echo 'extension="apcu.so"' >> ./tests/apc.ini ; fi"
+  - sh -c "if [ $TRAVIS_PHP_VERSION != 'hhvm' ] ; then phpenv config-add ./tests/apc.ini; fi"
   - if [ $TRAVIS_PHP_VERSION == '5.4' ] ; then ./set_guzzle5.sh; fi
   - composer install -o
 
 script:
   - ant phpcs-ci
   - phpunit --testsuite=unit
-  - if [ $TRAVIS_PHP_VERSION == '5.5' ] ; then phpunit --testsuite=integration; fi
+  - if [ $TRAVIS_PHP_VERSION == '5.6' ] ; then phpunit --testsuite=integration; fi
   - ant behat
 
 after_success:

CHANGELOG.md

@@ -1,3 +1,74 @@
+<a name="1.0.0-RC9"></a>
+# [1.0.0-RC9](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC8...v1.0.0-RC9) (2016-01-11)
+
+
+### Bug Fixes
+
+* **Collection:** fix serialization of collection with primitive types ([0e1251f](https://github.com/sphereio/commercetools-php-sdk/commit/0e1251f))
+* **CustomField:** fix custom field object draft to reflect API changes ([90156aa](https://github.com/sphereio/commercetools-php-sdk/commit/90156aa))
+* **CustomFields:** fix custom type update actions to match changed API ([26efdcf](https://github.com/sphereio/commercetools-php-sdk/commit/26efdcf))
+* **CustomObject:** remove type for custom object value ([b37c604](https://github.com/sphereio/commercetools-php-sdk/commit/b37c604)), closes [#163](https://github.com/sphereio/commercetools-php-sdk/issues/163)
+* **Product:** fix type of priceId ([23c2de5](https://github.com/sphereio/commercetools-php-sdk/commit/23c2de5))
+* **ProductProjection:** fix context of getAllVariants helper method ([28526db](https://github.com/sphereio/commercetools-php-sdk/commit/28526db))
+
+### Features
+
+* **Cart:** add fields to cart draft ([8b2ab3b](https://github.com/sphereio/commercetools-php-sdk/commit/8b2ab3b))
+* **Category:** add CategoryCreated and CategorySlugChanged messages ([014dde2](https://github.com/sphereio/commercetools-php-sdk/commit/014dde2))
+* **CategoryCollection:** add getById to CategoryCollection ([1a79cbc](https://github.com/sphereio/commercetools-php-sdk/commit/1a79cbc))
+* **Channel:** add custom field to channel ([5e9601d](https://github.com/sphereio/commercetools-php-sdk/commit/5e9601d))
+* **Client:** add config option for accept encoding (e.g. enabling gzip compression) ([c57f2ee](https://github.com/sphereio/commercetools-php-sdk/commit/c57f2ee))
+* **Client:** add gzip as default acceptEncoding ([2ddd99d](https://github.com/sphereio/commercetools-php-sdk/commit/2ddd99d))
+* **CurrencyFormatter:** change currencyFormatter to use fraction digits from intl extension ([e8d058b](https://github.com/sphereio/commercetools-php-sdk/commit/e8d058b))
+* **Customer:** add CustomerCreated message ([12c9bff](https://github.com/sphereio/commercetools-php-sdk/commit/12c9bff))
+* **Customer:** add getter for default shipping and billing address ([7b776f9](https://github.com/sphereio/commercetools-php-sdk/commit/7b776f9)), closes [#162](https://github.com/sphereio/commercetools-php-sdk/issues/162)
+* **CustomFields:** update custom field draft to API changes ([dfae984](https://github.com/sphereio/commercetools-php-sdk/commit/dfae984))
+* **CustomObject:** add delete by id request ([9eb8ba7](https://github.com/sphereio/commercetools-php-sdk/commit/9eb8ba7))
+* **Inventory:** add SetSupplyChannel action ([d453e5e](https://github.com/sphereio/commercetools-php-sdk/commit/d453e5e))
+* **Payment:** add change transaction state, timestamp and interactionId actions ([3eee823](https://github.com/sphereio/commercetools-php-sdk/commit/3eee823))
+* **Payment:** add PaymentTransactionChanged message ([7c3e6d8](https://github.com/sphereio/commercetools-php-sdk/commit/7c3e6d8))
+* **Payment:** add state and id to payment transaction ([b7ee577](https://github.com/sphereio/commercetools-php-sdk/commit/b7ee577))
+* **Product:** add price field to variant for price selection ([ea8169e](https://github.com/sphereio/commercetools-php-sdk/commit/ea8169e))
+* **Product:** add ProductCreated and ProductSlugChanged messages ([dbb8a28](https://github.com/sphereio/commercetools-php-sdk/commit/dbb8a28))
+* **Product:** support resource identifier for product type at product creation ([d7e1980](https://github.com/sphereio/commercetools-php-sdk/commit/d7e1980))
+* **ProductSearch:** add matching variant to ProductVariant object ([2e336df](https://github.com/sphereio/commercetools-php-sdk/commit/2e336df))
+* **ProductSearch:** add price select methods for search ([ad8b4cd](https://github.com/sphereio/commercetools-php-sdk/commit/ad8b4cd))
+* **ProductSearch:** add price select methods to ProductProjectionSearchRequest ([51f889d](https://github.com/sphereio/commercetools-php-sdk/commit/51f889d))
+* **ProductSearch:** add price select parameters ([f1717b8](https://github.com/sphereio/commercetools-php-sdk/commit/f1717b8))
+* **ProductType:** add get, update and delete by key requests ([0ad3973](https://github.com/sphereio/commercetools-php-sdk/commit/0ad3973))
+* **ProductType:** add getByName and getById to ProductTypeCollection ([2b2e005](https://github.com/sphereio/commercetools-php-sdk/commit/2b2e005))
+* **Request:** add min and max for query limit ([66947e6](https://github.com/sphereio/commercetools-php-sdk/commit/66947e6))
+
+
+### BREAKING CHANGES
+
+* CustomObject: CustomObjectCreateRequest expects CustomObjectDraft object
+
+  Before:
+  ```
+  $request = CustomObjectCreateRequest::ofObject(CustomObject::of()->setContainer('test')->setKey('test-key')->setValue(json_encode($value)));
+  ```
+
+  After:
+  ```
+  $request = CustomObjectCreateRequest::ofObject(CustomObjectDraft::ofContainerKeyAndValue('test', 'test-key', $value));
+  ```
+* CustomFields: the type reference had been changed at the API
+
+  Before:
+  ```
+  $customFieldObjectDraft->setTypeId('type-12345');
+  $customFieldObjectDraft->setTypeKey('type-key');
+  ```
+
+  After:
+  ```
+  $customFieldObjectDraft->setType(TypeReference::ofId('type-12345'));
+  $customFieldObjectDraft->setType(TypeReference::ofKey('type-key'));
+  ```
+
+
+
 <a name="1.0.0-RC8"></a>
 # [1.0.0-RC8](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC7...v1.0.0-RC8) (2015-10-30)
 

README.md

@@ -1,6 +1,6 @@
 # <img src="build/theme/resources/CT_cube_200px.png" width="40" align="center"></img> commercetools PHP SDK
 
->  STATUS: Release Candidate 8.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
+>  STATUS: Release Candidate 9.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
 >
 > See the [Milestone Plan](https://github.com/sphereio/commercetools-php-sdk/milestones?direction=desc&sort=completeness&state=open) for details of what's planned in detail. We love feedback and [Issue reports](https://github.com/sphereio/commercetools-php-sdk/issues?q=is%3Aopen+is%3Aissue+sort%3Acreated-asc)!
 > Up-to-Date planning status can be found on this [Waffle Board](https://waffle.io/sphereio/commercetools-php-sdk)
@@ -189,7 +189,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.  @ct-jensschulze will review it and pull or come back to you.
+ 4. make a pull request.  @jayS-de will review it and pull or come back to you.
 
 
 

composer.json

@@ -41,10 +41,9 @@
     "pdepend/pdepend": "@stable",
     "phploc/phploc": "^2.0",
     "mayflower/php-codebrowser": "^1.0",
-    "doctrine/cache": "^1.4",
+    "doctrine/cache": "^1.5",
     "monolog/monolog": "^1.12",
     "behat/behat": "^3.0",
-    "phpspec/prophecy-phpunit": "^1.0",
     "phpunit/phpcov": "*",
     "fabpot/php-cs-fixer": "@stable"
   }

docroot/annotations.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  */
 
 namespace Commercetools\Core;

docroot/index.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  * @created: 04.02.15, 13:31
  */
 namespace Commercetools\Core;

features/bootstrap/ApiContext.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  */
 
 namespace Commercetools\Core;
@@ -55,11 +55,7 @@ protected function getContext($context)
     public function iHaveAContextDraftWithValuesJson($context, PyStringNode $json)
     {
         $context = $this->getContext($context);
-        if ($context == 'CustomObject') {
-            $class = '\Commercetools\Core\Model\\CustomObject\\CustomObject';
-        } else {
-            $class = '\Commercetools\Core\Model\\' . $context . '\\' . $context . 'Draft';
-        }
+        $class = '\Commercetools\Core\Model\\' . $context . '\\' . $context . 'Draft';
 
         $rawData = json_decode((string)$json, true);
         $object = call_user_func_array($class.'::fromArray', [$rawData]);
@@ -183,6 +179,19 @@ public function iWantToFetchAContext($context)
      * @Given i want to fetch a :context by key
      */
     public function iWantToFetchAContextByKey($context)
+    {
+        $context = $this->getContext($context);
+        $module = $this->getModuleName($context);
+        $request = '\Commercetools\Core\Request\\' . $module . '\\' . $context . 'ByKeyGetRequest';
+        $requestContext = $context . 'Request';
+        $key = $this->objects[$requestContext]['id'];
+        $this->request = call_user_func_array($request. '::ofKey', [$key]);
+    }
+
+    /**
+     * @Given i want to fetch a :context by container and key
+     */
+    public function iWantToFetchAContextByContainerAndKey($context)
     {
         $context = $this->getContext($context);
         $module = $this->getModuleName($context);
@@ -267,10 +276,40 @@ public function iWantToUpdateAContext($context)
         $this->request = call_user_func_array($request. '::ofIdAndVersion', [$id, $version]);
     }
 
+    /**
+     * @Given i want to update a :context by key
+     */
+    public function iWantToUpdateAContextByKey($context)
+    {
+        $context = $this->getContext($context);
+        $module = $this->getModuleName($context);
+        $request = '\Commercetools\Core\Request\\' . $module . '\\' . $context . 'UpdateByKeyRequest';
+
+        $requestContext = $context . 'Request';
+        $id = $this->objects[$requestContext]['id'];
+        $version = $this->objects[$requestContext]['version'];
+        $this->request = call_user_func_array($request. '::ofKeyAndVersion', [$id, $version]);
+    }
+
+
     /**
      * @Given i want to delete a :context by key
      */
-    public function iWantToDeleteAByKey($context)
+    public function iWantToDeleteAContextByKey($context)
+    {
+        $context = $this->getContext($context);
+        $module = $this->getModuleName($context);
+        $request = '\Commercetools\Core\Request\\' . ucfirst($module) . '\\' . ucfirst($context) . 'DeleteByKeyRequest';
+        $requestContext = $context . 'Request';
+        $id = $this->objects[$requestContext]['id'];
+        $version = $this->objects[$requestContext]['version'];
+        $this->request = call_user_func_array($request. '::ofKeyAndVersion', [$id, $version]);
+    }
+
+    /**
+     * @Given i want to delete a :context by container and key
+     */
+    public function iWantToDeleteAContextByContainerAndKey($context)
     {
         $context = $this->getContext($context);
         $module = $this->getModuleName($context);

features/request/CustomObject/CustomObjectDelete.feature

@@ -1,6 +1,6 @@
 Feature: I want to delete a custom object
   Scenario: Delete custom object
     Given a "customObject" is identified by "container" and key "key"
-    And i want to delete a "customObject" by key
+    And i want to delete a "customObject" by container and key
     Then the path should be "custom-objects/container/key"
     And the method should be "DELETE"

features/request/CustomObject/CustomObjectQuery.feature

@@ -1,7 +1,7 @@
 Feature: I want to query customObjects
   Scenario: Fetch a customObject by id
     Given a "customObject" is identified by "container" and key "key"
-    Given i want to fetch a "customObject" by key
+    Given i want to fetch a "customObject" by container and key
     Then the path should be "custom-objects/container/key"
     And the method should be "GET"
 

features/request/ProductType/ProductTypeDelete.feature

@@ -4,3 +4,9 @@ Feature: I want to delete a product type
     And i want to delete a "productType"
     Then the path should be "product-types/id?version=1"
     And the method should be "DELETE"
+
+  Scenario: Delete product type by key
+    Given a "productType" is identified by "mytype" and version 1
+    And i want to delete a "productType" by key
+    Then the path should be "product-types/key=mytype?version=1"
+    And the method should be "DELETE"

features/request/ProductType/ProductTypeQuery.feature

@@ -5,6 +5,12 @@ Feature: I want to query productTypes
     Then the path should be "product-types/id"
     And the method should be "GET"
 
+  Scenario: Fetch a productType by id
+    Given a "productType" is identified by "mytype"
+    Given i want to fetch a "productType" by key
+    Then the path should be "product-types/key=mytype"
+    And the method should be "GET"
+
   Scenario: Query customers with filter applied
     Given i want to query "productTypes"
     And filter them with criteria 'name="Peter"'

features/request/ProductType/ProductTypeUpdate.feature

@@ -13,6 +13,20 @@ Feature: I want to update a product type
     }
     """
 
+  Scenario: Empty update by key
+    Given a "productType" is identified by "mytype" and version 1
+    And i want to update a "productType" by key
+    Then the path should be "product-types/key=mytype"
+    And the method should be "POST"
+    And the request should be
+    """
+    {
+      "version": 1,
+      "actions": [
+      ]
+    }
+    """
+
   Scenario: change name
     Given a "productType" is identified by "id" and version 1
     And i want to update a "productType"

push-docs-to-gh-pages.sh

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

src/AbstractHttpClient.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  * @created: 22.01.15, 13:51
  */
 
@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '1.0.0-RC8';
+    const VERSION = '1.0.0-RC9';
 
     /**
      * @var AdapterInterface
@@ -76,10 +76,14 @@ public function getConfig()
     public function getHttpClient($options = [])
     {
         if (is_null($this->httpClient)) {
+            $headers = ['User-Agent' => $this->getUserAgent()];
+            if (!is_null($this->getConfig()->getAcceptEncoding())) {
+                $headers['Accept-Encoding'] = $this->getConfig()->getAcceptEncoding();
+            }
             $options = array_merge(
                 [
                     'base_uri' => $this->getBaseUrl(),
-                    'headers' => ['User-Agent' => $this->getUserAgent()]
+                    'headers' => $headers
                 ],
                 $options
             );

src/Cache/AbstractCacheAdapter.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  * @created 19.01.15, 17:10
  */
 

src/Cache/ApcCacheAdapter.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ * @author @jayS-de <jens.schulze@commercetools.de>
  * @created 20.01.15, 13:42
  */