Merge pull request #298 from commercetools/version2

Version 2

Author: Jens Schulze

.travis.yml

@@ -1,45 +1,43 @@
+dist: trusty
+sudo: false
 language: php
 php:
 - 7.0
 - 5.6
-- 5.5
-- 5.4
 - 7.1
 - hhvm
 - nightly
+env:
+  - GUZZLE=5
+  - GUZZLE=6
 matrix:
   allow_failures:
-  - php: 7.1
   - php: hhvm
   - php: nightly
 services:
 - redis-server
 cache:
   directories:
   - vendor
-before_script:
+before_install:
 - 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
-- 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
+- if [ $GUZZLE == '5' ] ; then ./set_guzzle5.sh; fi
+- if [ $PHP != 'nightly' ] && [ $PHP != '7.1' ]; then composer global require hirak/prestissimo; fi
+- if [ $GUZZLE == '5' ] ; then composer update -o --prefer-dist --prefer-lowest; fi
+- if [ $GUZZLE != '5' ] ; then composer install -o --prefer-dist; fi
 script:
 - ant phpcs-ci
 - vendor/bin/phpunit --testsuite=unit
-- if [ $PHP == '7.0' ] ; then vendor/bin/phpunit --testsuite=integration; fi
+- if [ $PHP == '7.0' ] && [ $GUZZLE == '6' ] ; then vendor/bin/phpunit --testsuite=integration; fi
 - ant behat
 after_success:
-- ./push-docs-to-gh-pages.sh
+- if [ $PHP == '5.6' ] && [ $GUZZLE == '6' ] ; then ./push-docs-to-gh-pages.sh; fi
 notifications:
   hipchat:
     rooms:

composer.json

@@ -21,41 +21,52 @@
       "Commercetools\\Core\\": [
         "tests/unit/",
         "tests/integration/"
+      ],
+      "Commercetools\\Core\\Fixtures\\": [
+        "tests/fixtures/"
       ]
     }
   },
   "require": {
-    "php": ">=5.4",
+    "php": ">=5.6",
     "psr/log": "^1.0",
-    "guzzlehttp/guzzle": "^5.0 || ^6.0",
+    "guzzlehttp/guzzle": "^6.0 || ^5.0",
     "guzzlehttp/psr7": "^1.1",
-    "pimple/pimple": "^3.0",
     "psr/cache": "^1.0",
+    "psr/simple-cache": "^1.0",
+    "cache/apcu-adapter": "^0.2",
     "ext-intl": "*",
     "ext-mbstring": "*"
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0",
-    "phpunit/phpunit": "^5.0 || ^4.8",
+    "phpunit/phpunit": "^6.0 || ^5.7.14",
     "phpmd/phpmd": "@stable",
     "squizlabs/php_codesniffer": "^2.6",
     "sebastian/phpcpd": "@stable",
     "pdepend/pdepend": "@stable",
     "phploc/phploc": "^2.0",
     "mayflower/php-codebrowser": "^1.0",
-    "doctrine/cache": "^1.5",
+    "doctrine/cache": "^1.6",
     "monolog/monolog": "^1.12",
     "behat/behat": "^3.0",
     "phpunit/phpcov": "*",
     "friendsofphp/php-cs-fixer": "@stable",
-    "symfony/yaml": "*",
+    "symfony/yaml": "^3.0",
     "cache/array-adapter": "^0.4.0",
+    "cache/doctrine-adapter": "^0.5.0",
+    "cache/redis-adapter": "^0.4.0",
     "cache/filesystem-adapter": "^0.3.0",
+    "cache/void-adapter": "^0.3",
     "incenteev/composer-parameter-handler": "^2.1"
   },
   "replaces": {
     "commercetools/commons": "*"
   },
+  "suggest": {
+    "cache/redis-adapter": "For usage of a redis server to store the client access token",
+    "cache/doctrine-adapter": "For usage of a doctrine cache instance to store the client access token"
+  },
   "scripts": {
     "updateConfig": [
       "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
@@ -65,7 +76,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "1.7-dev"
+      "dev-develop": "1.7-dev",
+      "dev-version2": "2.0-dev"
     },
     "incenteev-parameters": [
       {

features/bootstrap/ApiContext.php

@@ -11,6 +11,7 @@
 use Commercetools\Core\Model\Common\Collection;
 use Commercetools\Core\Model\Common\JsonObject;
 use Commercetools\Core\Model\Product\Search\Filter;
+use Commercetools\Core\Request\Products\ProductProjectionSearchRequest;
 
 trait ApiContext
 {
@@ -278,7 +279,7 @@ public function iWantToQuery($context)
      */
     public function iWantToSearchProducts()
     {
-        $request = '\Commercetools\Core\Request\\Products\\ProductProjectionSearchRequest';
+        $request = ProductProjectionSearchRequest::class;
         $this->request = call_user_func($request. '::of');
     }
 

features/request/Customer/CustomerUpdate.feature

@@ -3,12 +3,11 @@ Feature: I want to send a Customer Update Request
   Scenario: Change user name and email
     Given a "customer" is identified by "id" and version "1"
     And i want to update a "customer"
-    And add the "changeName" action to "customer" with values
+    And add the "setFirstName" action to "customer" with values
     """
         {
-          "action": "changeName",
-          "firstName": "John",
-          "lastName": "Doe"
+          "action": "setFirstName",
+          "firstName": "John"
         }
     """
     And add the "changeEmail" action to "customer" with values
@@ -26,9 +25,8 @@ Feature: I want to send a Customer Update Request
       "version": 1,
       "actions": [
         {
-          "action": "changeName",
-          "firstName": "John",
-          "lastName": "Doe"
+          "action": "setFirstName",
+          "firstName": "John"
         },
         {
           "action": "changeEmail",
@@ -38,33 +36,6 @@ Feature: I want to send a Customer Update Request
     }
     """
 
-  Scenario: Change user name
-    Given a "customer" is identified by "id" and version "1"
-    And i want to update a "customer"
-    And add the "changeName" action to "customer" with values
-    """
-        {
-          "action": "changeName",
-          "firstName": "John",
-          "lastName": "Doe"
-        }
-    """
-    Then the path should be "customers/id"
-    And the method should be "POST"
-    And the request should be
-    """
-    {
-      "version": 1,
-      "actions": [
-        {
-          "action": "changeName",
-          "firstName": "John",
-          "lastName": "Doe"
-        }
-      ]
-    }
-    """
-
   Scenario: Change email address
     Given a "customer" is identified by "id" and version "1"
     And i want to update a "customer"

features/request/Product/ProductSearch.feature

@@ -8,7 +8,7 @@ Feature: I want to search products
     And the method should be "POST"
     And the body should be
     """
-    filter=name%3A%22Peter%22&limit=1
+    filter=name%3A%22Peter%22&limit=1&markMatchingVariants=false
     """
 
   Scenario: Search products with limit
@@ -18,7 +18,7 @@ Feature: I want to search products
     And the method should be "POST"
     And the body should be
     """
-    limit=10
+    limit=10&markMatchingVariants=false
     """
 
   Scenario: Search products with offset
@@ -28,7 +28,7 @@ Feature: I want to search products
     And the method should be "POST"
     And the body should be
     """
-    offset=10
+    markMatchingVariants=false&offset=10
     """
 
   Scenario: Search products sorted
@@ -38,7 +38,7 @@ Feature: I want to search products
     And the method should be "POST"
     And the body should be
     """
-    sort=name
+    markMatchingVariants=false&sort=name
     """
 
   Scenario: Search parameters should be sorted
@@ -49,5 +49,5 @@ Feature: I want to search products
     And the method should be "POST"
     And the body should be
     """
-    offset=10&sort=name
+    markMatchingVariants=false&offset=10&sort=name
     """

features/request/Product/ProductUpdate.feature

@@ -179,47 +179,6 @@ 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 "setMetaAttributes" action to "product" with values
-    """
-        {
-          "action": "setMetaAttributes",
-          "metaTitle": {
-            "en": "metaTitle"
-          },
-          "metaDescription": {
-            "en": "metaDescription"
-          },
-          "metaKeywords": {
-            "en": "metaKeywords"
-          }
-        }
-    """
-    Then the path should be "products/id"
-    And the method should be "POST"
-    And the request should be
-    """
-    {
-      "version": 1,
-      "actions": [
-        {
-          "action": "setMetaAttributes",
-          "metaTitle": {
-            "en": "metaTitle"
-          },
-          "metaDescription": {
-            "en": "metaDescription"
-          },
-          "metaKeywords": {
-            "en": "metaKeywords"
-          }
-        }
-      ]
-    }
-    """
-
   Scenario:
     Given a "product" is identified by "id" and version 1
     And i want to update a "product"
@@ -711,34 +670,6 @@ 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 "setSkuNotStageable" action to "product" with values
-    """
-        {
-          "action": "setSKU",
-          "variantId": 1,
-          "sku": "mySKU"
-        }
-    """
-    Then the path should be "products/id"
-    And the method should be "POST"
-    And the request should be
-    """
-    {
-      "version": 1,
-      "actions": [
-        {
-          "action": "setSKU",
-          "variantId": 1,
-          "sku": "mySKU"
-        }
-      ]
-    }
-    """
-
   Scenario:
     Given a "product" is identified by "id" and version 1
     And i want to update a "product"

set_guzzle5.sh

@@ -1,12 +1,4 @@
 #!/bin/bash
 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=''
+DST='"guzzlehttp/guzzle": "^5.3.1", "guzzlehttp/log-subscriber": "^1.0", "guzzlehttp/ringphp": "^1.0.7", "react/promise": "^2.2.0"'
 sed -ibak -e "s|$SRC|$DST|g" composer.json

src/AbstractHttpClient.php

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