Merge branch 'release/v1.1'

Author: Jens Schulze

.gitignore

@@ -14,3 +14,5 @@ myapp.ini
 /tools/node_modules
 requests.log
 env.list
+humbug.*
+/cache

CHANGELOG.md

@@ -1,3 +1,31 @@
+<a name="1.1.0"></a>
+# [1.1.0](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.1...v1.1.0) (2016-05-27)
+
+
+### Bug Fixes
+
+* **JsonObject:** fix JsonObject::hasField method to return if the field has a value set ([c2eaed5](https://github.com/sphereio/commercetools-php-sdk/commit/c2eaed5)), closes [#173](https://github.com/sphereio/commercetools-php-sdk/issues/173)
+
+### Features
+
+* **Cache:** add support for PSR-6 cache adapter ([e6cbd27](https://github.com/sphereio/commercetools-php-sdk/commit/e6cbd27)), closes [#194](https://github.com/sphereio/commercetools-php-sdk/issues/194)
+* **Cart:** support new cart tax modes ([f6bfeeb](https://github.com/sphereio/commercetools-php-sdk/commit/f6bfeeb)), closes [#207](https://github.com/sphereio/commercetools-php-sdk/issues/207)
+* **Customer:** support anonymous cart sign in mode for customer login ([e94ac48](https://github.com/sphereio/commercetools-php-sdk/commit/e94ac48)), closes [#212](https://github.com/sphereio/commercetools-php-sdk/issues/212)
+* **Error:** add DiscountCodeNonApplicable error ([a42e90d](https://github.com/sphereio/commercetools-php-sdk/commit/a42e90d)), closes [#198](https://github.com/sphereio/commercetools-php-sdk/issues/198)
+* **Product:** add changeMasterVariant update action ([48d1a42](https://github.com/sphereio/commercetools-php-sdk/commit/48d1a42)), closes [#204](https://github.com/sphereio/commercetools-php-sdk/issues/204)
+* **Product:** add getAllVariants helper method to product data ([006e984](https://github.com/sphereio/commercetools-php-sdk/commit/006e984)), closes [#213](https://github.com/sphereio/commercetools-php-sdk/issues/213)
+* **Product:** add image move to position update action ([c24839b](https://github.com/sphereio/commercetools-php-sdk/commit/c24839b)), closes [#206](https://github.com/sphereio/commercetools-php-sdk/issues/206)
+* **Product:** add scopedPrice and scopePriceDiscounted to ProductVariant model ([f7d25d8](https://github.com/sphereio/commercetools-php-sdk/commit/f7d25d8)), closes [#201](https://github.com/sphereio/commercetools-php-sdk/issues/201)
+* **Product:** add support to publish product on creation ([ee71818](https://github.com/sphereio/commercetools-php-sdk/commit/ee71818)), closes [#203](https://github.com/sphereio/commercetools-php-sdk/issues/203)
+* **Product:** support availableQuantity for product variant availability ([dbc4c48](https://github.com/sphereio/commercetools-php-sdk/commit/dbc4c48)), closes [#202](https://github.com/sphereio/commercetools-php-sdk/issues/202)
+* **Product:** support fuzzy query for product suggest ([1d59870](https://github.com/sphereio/commercetools-php-sdk/commit/1d59870)), closes [#205](https://github.com/sphereio/commercetools-php-sdk/issues/205)
+* **Query:** add support for multiple where query parameters ([591c926](https://github.com/sphereio/commercetools-php-sdk/commit/591c926)), closes [#196](https://github.com/sphereio/commercetools-php-sdk/issues/196)
+* **Request:** support reference expansion for CRUD requests ([0f29ea7](https://github.com/sphereio/commercetools-php-sdk/commit/0f29ea7)), closes [#199](https://github.com/sphereio/commercetools-php-sdk/issues/199)
+* **Review:** add review messages ([f20c858](https://github.com/sphereio/commercetools-php-sdk/commit/f20c858))
+* **UpdateRequest:** add hasActions method to update requests ([cb98ffd](https://github.com/sphereio/commercetools-php-sdk/commit/cb98ffd))
+
+
+
 <a name="1.0.1"></a>
 ## [1.0.1](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0...v1.0.1) (2016-05-17)
 

README.md

@@ -15,7 +15,8 @@ The [PHP API documentation](http://sphereio.github.io/commercetools-php-sdk/docs
 
 ### Install & Integrate the SDK into your Project
 
-The SDK requires a PHP version of 5.4 or higher with the apc(u) PHP extension for its default cache. If you provide an own Cache interface, apc(u) is not necessary.
+The SDK requires a PHP version of 5.4 or higher. The SDK tries to use the APC(u) as it's default cache. If you provide an own cache interface or a [PSR-6](https://packagist.org/providers/psr/cache-implementation) compliant cache adapter, APC(u) is not necessary. The [cache/filesystem-adapter](https://packagist.org/packages/cache/filesystem-adapter) is tried to be used if no APC(u) is installed. See also client [documentation](http://sphereio.github.io/commercetools-php-sdk/docs/master/class-Commercetools.Core.Client.html).
+
 The curl extension is recommended but not strictly necessary because the SDK is using the [Guzzle library](https://github.com/guzzle/guzzle) library, which falls back to PHP stream wrappers if curl is not available.
 The intl extension is required to directly output Money objects as a String.
 
@@ -115,25 +116,23 @@ xcode-select --install
 brew tap homebrew/dupes
 brew tap homebrew/versions
 brew tap homebrew/homebrew-php
-brew install php55
-brew install php55-intl
-brew install php55-apcu
-brew install php55-xdebug
+brew install php56
+brew install php56-intl
+brew install php56-xdebug
 brew install ant
 # you probably also need to fix a (=any) timezone in your php.ini:
-echo "date.timezone='Europe/Berlin'" >> /usr/local/etc/php/5.5/conf.d/60-user.ini
+echo "date.timezone='Europe/Berlin'" >> /usr/local/etc/php/5.6/conf.d/60-user.ini
 # initialize the dependencies:
 php composer.phar update
 ```
 
 ### Linux preparations :
- * install php 5.4+, apc(u), xdebug and ant according to their distro's package system.
- * make sure the curl, intl, mbstring, apcu and openssl extensions are activated in php.ini
+ * install php 5.5+, xdebug and ant according to their distro's package system.
+ * make sure the curl, intl, mbstring and openssl extensions are activated in php.ini
 
 ### Windows preparations:
- * [install php](http://windows.php.net/download/) 5.4+, i.e. extract ZIP and make add php.exe location to your PATH. Use WAMP etc. if you like, but plain PHP commandline is all you really need (you can test example code in the built-in webserver).
+ * [install php](http://windows.php.net/download/) 5.5+, i.e. extract ZIP and make add php.exe location to your PATH. Use WAMP etc. if you like, but plain PHP commandline is all you really need (you can test example code in the built-in webserver).
  * enable the curl, intl, mbstring and openssl extenstions in php.ini
- * [install apcu](http://robert-rusu.blogspot.de/2014/06/install-apcu-on-windows.html) OR a redis extension and server
  * make a working ant available in the PATH
  * and [install composer](https://getcomposer.org/doc/00-intro.md#installation-windows).
 

composer.json

@@ -29,6 +29,7 @@
     "guzzlehttp/guzzle": "^5.0 || ^6.0",
     "guzzlehttp/psr7": "^1.1",
     "pimple/pimple": "^3.0",
+    "psr/cache": "^1.0",
     "ext-intl": "*",
     "ext-mbstring": "*"
   },
@@ -47,6 +48,8 @@
     "phpunit/phpcov": "*",
     "fabpot/php-cs-fixer": "@stable",
     "symfony/yaml": "*",
+    "cache/array-adapter": "^0.4.0",
+    "cache/filesystem-adapter": "^0.3.0",
     "incenteev/composer-parameter-handler": "^2.0"
   },
   "scripts": {

docroot/index.php

@@ -5,6 +5,9 @@
  */
 namespace Commercetools\Core;
 
+use Cache\Adapter\Filesystem\FilesystemCachePool;
+use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Commercetools\Core\Model\Common\Context;
@@ -34,7 +37,11 @@
 $log = new Logger('name');
 $log->pushHandler(new StreamHandler('./requests.log'));
 
-$client = Client::ofConfigAndLogger($config, $log);
+$filesystemAdapter = new Local(__DIR__.'/');
+$filesystem        = new Filesystem($filesystemAdapter);
+$cache = new FilesystemCachePool($filesystem);
+
+$client = Client::ofConfigCacheAndLogger($config, $cache, $log);
 
 $products = $client->execute($request)->toObject();
 

features/request/Product/ProductUpdate.feature

@@ -922,6 +922,35 @@ Feature: I want to send a Product Update Request
     }
     """
 
+  Scenario:
+    Given a "product" is identified by "id" and version 1
+    And i want to update a "product"
+    And add the "moveImageToPosition" action to "product" with values
+    """
+        {
+          "action": "moveImageToPosition",
+          "variantId": 1,
+          "imageUrl": "http://example.org/image.jpg",
+          "position": 3
+        }
+    """
+    Then the path should be "products/id"
+    And the method should be "POST"
+    And the request should be
+    """
+    {
+      "version": 1,
+      "actions": [
+        {
+          "action": "moveImageToPosition",
+          "variantId": 1,
+          "imageUrl": "http://example.org/image.jpg",
+          "position": 3
+        }
+      ]
+    }
+    """
+
   Scenario:
     Given a "product" is identified by "id" and version 1
     And i want to update a "product"

set_guzzle5.sh

@@ -2,3 +2,11 @@
 SRC='"guzzlehttp/guzzle": "^6.0"'
 DST='"guzzlehttp/guzzle": "^5.0", "guzzlehttp/log-subscriber": "^1.0"'
 sed -ibak -e "s|$SRC|$DST|g" composer.json
+
+SRC='"cache/array-adapter": "^0.4.0",'
+DST=''
+sed -ibak -e "s|$SRC|$DST|g" composer.json
+
+SRC='"cache/filesystem-adapter": "^0.3.0",'
+DST=''
+sed -ibak -e "s|$SRC|$DST|g" composer.json

src/AbstractHttpClient.php

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

src/Cache/AbstractCacheAdapter.php

@@ -7,6 +7,7 @@
 namespace Commercetools\Core\Cache;
 
 /**
+ * @deprecated use a PSR-6 cache adapter instead. Will be removed with v2.0
  * @package Commercetools\Core\Cache
  */
 abstract class AbstractCacheAdapter implements CacheAdapterInterface

src/Cache/ApcCacheAdapter.php

@@ -7,6 +7,7 @@
 namespace Commercetools\Core\Cache;
 
 /**
+ * @deprecated use a PSR-6 cache adapter instead. Will be removed with v2.0
  * @package Commercetools\Core\Cache
  */
 class ApcCacheAdapter extends AbstractCacheAdapter