Merge branch 'release/M3'

Author: Jens Schulze

.gitignore

@@ -6,5 +6,5 @@ cache.properties
 apigen.phar
 composer.phar
 composer.lock
-docroot/myapp.ini
+myapp.ini
 local/

.scrutinizer.yml

@@ -11,6 +11,8 @@ tools:
 before_commands:
     - composer install --prefer-source -o
 build:
+    environment:
+        php: '5.5.25'
     dependencies:
         before:
             #Only 5.4 uses APC

.travis.yml

@@ -11,19 +11,25 @@ matrix:
     - php: hhvm
     - php: nightly
 
+services:
+  - redis-server
+
 cache:
   directories:
   - vendor
 
 before_script:
+  - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
+  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - 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"
-  - composer install --prefer-source -o
+  - 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.4' ] ; then phpunit --testsuite=integration; fi
+  - if [ $TRAVIS_PHP_VERSION == '5.5' ] ; then phpunit --testsuite=integration; fi
   - ant behat
 
 after_success:
@@ -39,3 +45,7 @@ env:
     - secure: Q4zRyFxLw/7YlHG/iWzyR7V7Srm8LsQ3UgMshckUyqefhzhF19GefoPJdPdALyLVEYQMG3O/U1aebbyt8Puy5jWWKKiwFaQA+mMXzpBFcvhutgxByqBXdIysIhGU65No+WbiCKlpL2WPNtYvE1cMSjFfn7IX8ThGkBxhJQcha38=
     # SPHERE_PROJECT
     - secure: CPj46vCtmLaxGKXycJW+PmNXloXu5ruOV/Qg1mA6tU83oPjlxHVrqMOlb87ykf6U8X6XXAjMrgR0q3gBepPJg3HZmJyeOsVhwSU/jhfN7L1lR7BrQrPdLutvhuC6Fgj+b2Ubzh7PIt7pR6AYZyMCv5ofajW9aBcC5D556WJsSjE=
+notifications:
+  hipchat:
+    rooms:
+      secure: VD5RvUZYVg1aokw8OeMhNfDPc39o2r4Jjq8s6U2QvMXzoiopHpj6+VYX1AHbhxMpBGmsgKfzbYQ6XfubJUeHq+FMzW3YEekwcyqXKCfWi5tLCE7Epb0dCySatztVTkqlXzXaAM6NhzdFxG6kQPiA9OcSvRPZmSwjuX4eYXRokRw=

README.md

@@ -1,17 +1,17 @@
 ![SPHERE.IO icon](https://admin.sphere.io/assets/images/sphere_logo_rgb_long.png)
 # SPHERE.IO PHP SDK
 
-> WARNING: As of now, this is a pre-release partial implementation.
-> See the [Milestone Plan](https://github.com/sphereio/sphere-php-sdk/milestones?direction=desc&sort=completeness&state=open) for details of what's planned. We love feedback and [Issue reports](https://github.com/sphereio/sphere-php-sdk/issues?q=is%3Aopen+is%3Aissue+sort%3Acreated-asc)!
+> STATUS: technically robust beta version, but we do not yet guarantee API compatibility until the 1.0.0 release.  Please take your time to thoroughly test the upcoming RC (Milestone 4) release. 
+> See the [Milestone Plan](https://github.com/sphereio/sphere-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/sphere-php-sdk/issues?q=is%3Aopen+is%3Aissue+sort%3Acreated-asc)!
 
 [![Build Status](https://img.shields.io/travis/sphereio/sphere-php-sdk/master.svg?style=flat-square)](https://travis-ci.org/sphereio/sphere-php-sdk) [![Scrutinizer](https://img.shields.io/scrutinizer/g/sphereio/sphere-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/sphereio/sphere-php-sdk/) [![Scrutinizer](https://img.shields.io/scrutinizer/coverage/g/sphereio/sphere-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/sphereio/sphere-php-sdk/) [![Packagist](https://img.shields.io/packagist/v/sphere/php-sdk.svg?style=flat-square)](https://packagist.org/packages/sphere/php-sdk) [![Packagist](https://img.shields.io/packagist/dm/sphere/php-sdk.svg?style=flat-square)](https://packagist.org/packages/sphere/php-sdk)
 
-The PHP SDK allows developers to build applications on the SPHERE.IO REST API using PHP native interfaces, models and helpers instead of manually using the HTTP and JSON API. Users gain lots of IDE Auto-Completion and type checks on a literal API.
+The PHP SDK allows developers to build applications on the SPHERE.IO REST API using PHP native interfaces, models and helpers instead of manually using the HTTP and JSON API. You gain lots of IDE Auto-Completion, type checks on a literal API, Warnings, Object Mapping, i18n support etc..
 It also manages the OAuth2 security, provides caches and an interface for concurrent and asynchronous API calls.
 
 The SDK is licensed under the permissive [MIT License](LICENSE). Don't hesitate to [contribute](#contribute)!
 
-## Install / Integrate into your Project
+## 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 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.
 
@@ -25,7 +25,7 @@ curl -sS https://getcomposer.org/installer | php
 Next, run the Composer command to install the latest version of the SDK:
 
 ```bash
-composer require sphere/php-sdk
+composer require sphere/php-sdk dev-master
 ```
 
 After installing, you need to require Composer's autoloader if that's not yet the case:
@@ -34,7 +34,7 @@ After installing, you need to require Composer's autoloader if that's not yet th
 require 'vendor/autoload.php';
 ```
 
-If you don't use Composer, just [download a zip archive](archive/master.zip) of the latest release, manually integrate it and configure your own autoloader.
+If you don't use Composer, just [download a zip archive](https://github.com/sphereio/sphere-php-sdk/archive/master.zip) of the latest release, manually integrate it and configure your own autoloader.
 
 Until the 1.0.0 release M0, M1 etc. milestone releases can contain incompatible changes.  From 1.0.0 on, the project will follow the [semantic versioning](http://semver.org) guidelines, i.e. everything but major version changes are backwards-compatible. This matches composer's default behavior.
 
@@ -44,6 +44,8 @@ Please read the [Changelog](CHANGELOG.md) before updating in any case.
 
 ## Use the SDK
 
+The [PHP API documentation](http://sphereio.github.io/sphere-php-sdk/docs/master) provides all the details you need in a searchable form.
+
 To get up and running, [create a free test project](http://admin.sphere.io) to get a SPHERE project with API credentials (Menu "Developers"->"API Clients").
 
 ```php
@@ -54,22 +56,27 @@ require '../vendor/autoload.php';
 use Sphere\Core\Request\Products\ProductsSearchRequest;
 use Sphere\Core\Client;
 
-header('Content-Type: text/html; charset=utf-8');
-
 $config = [
     'client_id' => 'my client id',
     'client_secret' => 'my client secret',
     'project' => 'my project id'
 ];
 
 /**
- * create search request
+ * create a search request and a client,
+ * execute the request and get the PHP Object
+ * (the client can and should be re-used)
  */
 $search = ProductsSearchRequest::of()->addParam('text.en', 'red');
 
 $client = new Client($config);
 $products = $client->execute($search)->toObject();
 
+/**
+ * show result (would be a view layer in real world)
+ */
+header('Content-Type: text/html; charset=utf-8');
+
 foreach ($products as $product) {
     echo $product->getName()->en . '<br/>';
 }
@@ -79,9 +86,7 @@ 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.
 
-The [API documentation](http://sphereio.github.io/sphere-php-sdk/docs/master) provides all the details you need in a searchable form.
-
-## Develop and Improve
+## Improve & Contribute to the SDK project
 
 prepare your development environment (if necessary).
 
@@ -93,6 +98,7 @@ 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 ant
@@ -144,7 +150,7 @@ To enable code style checks directly in phpStorm you have to configure the path
 Now you can enable at Preferences > Editor > Inspections > PHP the "PHP code sniffer validation" with PSR-2 standard. Change the severity if needed.
 
 
-## <a name="contribute"></a>Contribute
+### <a name="contribute"></a>Contribute
 
 On bigger effort changes, please open a GitHub [issue](issues) and ask if you can help or get help with your idea. For typos and documentation improvements just make a pull request.
 

composer.json

@@ -3,6 +3,13 @@
     "license": "MIT",
     "type": "project",
     "description": "The Sphere.IO PHP SDK",
+    "homepage": "https://github.com/sphereio/sphere-php-sdk",
+    "support": {
+      "email": "support@sphere.io",
+      "forum": "http://support.sphere.io",
+      "issues": "https://github.com/sphereio/sphere-php-sdk/issues",
+      "docs": "http://sphereio.github.io/sphere-php-sdk/docs/master/"
+    },
     "autoload": {
         "psr-4": { "Sphere\\Core\\": "src/" }
     },
@@ -16,22 +23,24 @@
     },
     "require": {
         "php": ">=5.4",
-        "psr/log": "~1.0",
-        "guzzlehttp/guzzle": "~5.0",
-        "guzzlehttp/log-subscriber": "~1.0",
-        "pimple/pimple": "~3.0"
+        "psr/log": "^1.0",
+        "guzzlehttp/guzzle": "^5.0 || ^6.0",
+        "guzzlehttp/psr7": "^1.0",
+        "pimple/pimple": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "phpmd/phpmd": "~1.0",
-        "squizlabs/php_codesniffer": "~1.0",
-        "pdepend/pdepend": "~1.1",
-        "phploc/phploc": "~2.0",
-        "sebastian/phpcpd": "~1.4",
-        "mayflower/php-codebrowser": "~1.0",
-        "doctrine/cache": "~1.4",
-        "monolog/monolog": "~1.12",
-        "behat/behat": "~3.0",
+        "guzzlehttp/guzzle": "^6.0",
+        "phpunit/phpunit": "^4.0",
+        "phpmd/phpmd": "^1.0",
+        "squizlabs/php_codesniffer": "^1.0",
+        "pdepend/pdepend": "^1.1",
+        "phploc/phploc": "^2.0",
+        "sebastian/phpcpd": "^1.4",
+        "mayflower/php-codebrowser": "^1.0",
+        "doctrine/cache": "^1.4",
+        "monolog/monolog": "^1.12",
+        "behat/behat": "^3.0",
+        "phpspec/prophecy-phpunit": "^1.0",
         "phpunit/phpcov": "*"
     },
     "suggest": {

features/bootstrap/FeatureContext.php

@@ -80,7 +80,7 @@ public function thePathShouldBe($expectedPath)
     {
         $httpRequest = $this->request->httpRequest();
 
-        assertSame($expectedPath, $httpRequest->getPath());
+        assertSame($expectedPath, (string)$httpRequest->getUri());
     }
 
     /**
@@ -90,7 +90,7 @@ public function theRequestShouldBe(PyStringNode $result)
     {
         $expectedResult = (string)$result;
         $httpRequest = $this->request->httpRequest();
-        $request = $httpRequest->getBody();
+        $request = (string)$httpRequest->getBody();
 
         assertJsonStringEqualsJsonString($expectedResult, $request);
     }
@@ -102,7 +102,7 @@ public function theMethodShouldBe($expectedMethod)
     {
         $httpRequest = $this->request->httpRequest();
 
-        assertSame(strtolower($expectedMethod), $httpRequest->getHttpMethod());
+        assertSame(strtoupper($expectedMethod), $httpRequest->getMethod());
     }
 
     protected function createRequestInstance($className, $params = [])
@@ -211,8 +211,13 @@ public function iWantToUpdateAContext($context)
      */
     public function theContextFieldIsValueAsType($field, $value, $type)
     {
-        $method = $type . 'val';
-        $this->theContextFieldIsValue($field, $method($value));
+        if ($type == 'bool') {
+            $value = (bool)$value;
+        } else {
+            $method = $type . 'val';
+            $value = $method($value);
+        }
+        $this->theContextFieldIsValue($field, $value);
     }
 
     /**
@@ -654,4 +659,15 @@ public function queryByCustomersId($customerId)
     {
         $this->request->byCustomerId($customerId);
     }
+
+    /**
+     * @Given i want to import a :context
+     */
+    public function iWantToImportAContext($context)
+    {
+        $context = $this->getContext($context);
+        $module = $this->getModuleName($context);
+        $request = '\Sphere\Core\Request\\' . $module . '\\' . $context . 'ImportRequest';
+        $this->createRequestInstance($request, [$this->getContextObject($context)]);
+    }
 }

features/request/Cart/CartCreate.feature

@@ -6,7 +6,7 @@ Feature: I want to create a new cart
 
   Scenario: create a anonymous cart
     When i want to create a "cart"
-    Then the path should be "carts"
+    Then the path should be "/carts"
     And the method should be "POST"
     And the request should be
     """

features/request/Cart/CartDelete.feature

@@ -2,5 +2,5 @@ Feature: I want to delete a cart
   Scenario: Delete cart
     Given a "cart" is identified by "id" and "version"
     And i want to delete a "Cart"
-    Then the path should be "carts/id?version=version"
+    Then the path should be "/carts/id?version=version"
     And the method should be "DELETE"

features/request/Cart/CartQuery.feature

@@ -2,49 +2,49 @@ Feature: I want to query carts
   Scenario: Fetch a cart by id
     Given a "cart" is identified by "id"
     Given i want to fetch a "Cart"
-    Then the path should be "carts/id"
+    Then the path should be "/carts/id"
     And the method should be "GET"
 
   Scenario: Query carts
     Given a "cart" is identified by "id"
     Given i want to fetch a "cart" by customerId
     And query by customers id "id"
-    Then the path should be "carts?customerId=id"
+    Then the path should be "/carts?customerId=id"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "Carts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "carts?where=name%3D%22Peter%22"
+    Then the path should be "/carts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "Carts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "carts?where=name%3D%22Peter%22"
+    Then the path should be "/carts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with limit
     Given i want to query "Carts"
     And limit the result to "10"
-    Then the path should be "carts?limit=10"
+    Then the path should be "/carts?limit=10"
     And the method should be "GET"
 
   Scenario: Query customers with offset
     Given i want to query "Carts"
     And offset the result with "10"
-    Then the path should be "carts?offset=10"
+    Then the path should be "/carts?offset=10"
     And the method should be "GET"
 
   Scenario: Query customers sorted
     Given i want to query "Carts"
     And sort them by "name"
-    Then the path should be "carts?sort=name"
+    Then the path should be "/carts?sort=name"
     And the method should be "GET"
 
   Scenario: Query parameters should be sorted
     Given i want to query "Carts"
     And sort them by "name"
     And offset the result with "10"
-    Then the path should be "carts?offset=10&sort=name"
+    Then the path should be "/carts?offset=10&sort=name"
     And the method should be "GET"