Merge branch 'release/v1.0.0-RC10'

Author: Jens Schulze

.gitignore

@@ -8,7 +8,9 @@ cache.properties
 apigen.phar
 composer.phar
 composer.lock
+myapp.yml
 myapp.ini
 /local/
 /tools/node_modules
 requests.log
+env.list

.scrutinizer.yml

@@ -9,10 +9,12 @@ tools:
     php_cs_fixer:
         config: { level: psr2 }
 before_commands:
-    - composer install --prefer-source -o
+    - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
+    - composer global require hirak/prestissimo
+    - composer install --prefer-dist -o
 build:
     environment:
-        php: '5.5.25'
+        php: '7.0'
     dependencies:
         before:
             #Only 5.4 uses APC
@@ -24,7 +26,7 @@ build:
             -
                 command: vendor/bin/behat -f progress
             -
-                command: vendor/bin/phpunit --testsuite=unit --coverage-clover=coverage0
+                command: vendor/bin/phpunit -d zend.enable_gc=0 --coverage-clover=coverage0
                 coverage:
                     file: 'coverage0'
                     format: 'php-clover'

.travis.yml

@@ -22,10 +22,12 @@ before_script:
   - composer config -g github-oauth.github.com $GITHUB_OAUTH_TOKEN
   - 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' ] && [ `php-config --vernum` -ge 70000 ] ; then printf "yes\n" | pecl install -f apcu ; 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
+  - composer global require hirak/prestissimo
+  - composer self-update
+  - composer install -o --prefer-dist
 
 script:
   - ant phpcs-ci
@@ -36,16 +38,6 @@ script:
 after_success:
   - ./push-docs-to-gh-pages.sh
 
-env:
-  global:
-    # GH_TOKEN environment variable for pushing documentation:
-    - secure: "i0TL7GsZ8TIZgr7WB5qXEs8fF5sSJHGagLXEsn4DSgxI52GatfjeEaSJuAbbWV/Tg0jYidNevdhCpe7LT3IWwa2cLVRpaV1TDoQ6K4wo8zzMzAw4AMB8DO2dBY3Mz+puRN55YAV3OpEF/RiiIc7zXLW/+5H9UCOXrcnnpg6PpxE="
-    # SPHERE_CLIENT_ID
-    - secure: MEht7kleJ/K9/daNOjEpPNJnXxKyQZ36oEM8fImi612BoJmZp/uwjuKpqKscIyyLwXSpsr7c9w+V2CfSk3QI+NGLnhSNgjJWE2QXxzxD6OgM0gKFTDtBq//+k77Sx4UnQDi0pQPRZ1BrfBUqrxw4H07i53hXd/kmjZnknRcbODc=
-    # SPHERE_CLIENT_SECRET
-    - secure: Q4zRyFxLw/7YlHG/iWzyR7V7Srm8LsQ3UgMshckUyqefhzhF19GefoPJdPdALyLVEYQMG3O/U1aebbyt8Puy5jWWKKiwFaQA+mMXzpBFcvhutgxByqBXdIysIhGU65No+WbiCKlpL2WPNtYvE1cMSjFfn7IX8ThGkBxhJQcha38=
-    # SPHERE_PROJECT
-    - secure: CPj46vCtmLaxGKXycJW+PmNXloXu5ruOV/Qg1mA6tU83oPjlxHVrqMOlb87ykf6U8X6XXAjMrgR0q3gBepPJg3HZmJyeOsVhwSU/jhfN7L1lR7BrQrPdLutvhuC6Fgj+b2Ubzh7PIt7pR6AYZyMCv5ofajW9aBcC5D556WJsSjE=
 notifications:
   hipchat:
     rooms:

CHANGELOG.md

@@ -1,3 +1,73 @@
+<a name="1.0.0-RC10"></a>
+# [1.0.0-RC10](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC9...v1.0.0-RC10) (2016-03-22)
+
+
+### Bug Fixes
+
+* **CartDiscount:** fix cart discount target with correct type ([220c1da](https://github.com/sphereio/commercetools-php-sdk/commit/220c1da))
+* **Client:** fix guzzle5 adapter to send user agent ([3ae8748](https://github.com/sphereio/commercetools-php-sdk/commit/3ae8748))
+* **Collection:** fix add function for collection ([993cddd](https://github.com/sphereio/commercetools-php-sdk/commit/993cddd))
+* **Collection:** fix collection iterator for associative collections ([2442677](https://github.com/sphereio/commercetools-php-sdk/commit/2442677))
+* **Customer:** fix exception on getDefaultAddresses for empty customer address ([7bd63a4](https://github.com/sphereio/commercetools-php-sdk/commit/7bd63a4))
+* **DateDecorator:** fix date overflow for date decorator on serialization ([9009b8f](https://github.com/sphereio/commercetools-php-sdk/commit/9009b8f))
+* **Inventory:** fix setSupplyChannel action for inventory update ([f356179](https://github.com/sphereio/commercetools-php-sdk/commit/f356179))
+* **LocalizedString:** use graceful flag for language property getter ([621195d](https://github.com/sphereio/commercetools-php-sdk/commit/621195d))
+* **Payment:** correct type mapping for transaction state ([0c6f36d](https://github.com/sphereio/commercetools-php-sdk/commit/0c6f36d))
+* **Reference:** remove obj from serialized result if resource is embedded ([79f8cba](https://github.com/sphereio/commercetools-php-sdk/commit/79f8cba))
+* **Review:** fix locale serialization for review models ([973129d](https://github.com/sphereio/commercetools-php-sdk/commit/973129d))
+
+### Features
+
+* **Category:** add metaDescription, metaKeywords, metaTitle to Category and CategoryDraft model ([5468676](https://github.com/sphereio/commercetools-php-sdk/commit/5468676))
+* **Customer:** add update actions to set customer's firstName, middleName, lastName and title ([b122225](https://github.com/sphereio/commercetools-php-sdk/commit/b122225))
+* **GraphQL:** add request to query GraphQL endpoint ([182641a](https://github.com/sphereio/commercetools-php-sdk/commit/182641a))
+* **LineItem:** add helper function to calculate discounted price ([961a493](https://github.com/sphereio/commercetools-php-sdk/commit/961a493))
+* **Payment:** add change amount planned update action ([2815f98](https://github.com/sphereio/commercetools-php-sdk/commit/2815f98))
+* **Product:** add product setCategoryOrderHint action ([9f8de04](https://github.com/sphereio/commercetools-php-sdk/commit/9f8de04))
+* **Product:** add set prices update action ([a8c4206](https://github.com/sphereio/commercetools-php-sdk/commit/a8c4206))
+* **ProductSearch:** support POST for filters and facets ([caeb0a5](https://github.com/sphereio/commercetools-php-sdk/commit/caeb0a5))
+* **ProductType:** add change isSearchable update action ([95395f9](https://github.com/sphereio/commercetools-php-sdk/commit/95395f9))
+* **ProductType:** add inputTip to attribute definition ([09288a4](https://github.com/sphereio/commercetools-php-sdk/commit/09288a4))
+* **ProductType:** add key to product type ([4e1d393](https://github.com/sphereio/commercetools-php-sdk/commit/4e1d393))
+* **Review:** add by key requests ([ebc4ece](https://github.com/sphereio/commercetools-php-sdk/commit/ebc4ece))
+* **Review:** add update by key request ([710c89e](https://github.com/sphereio/commercetools-php-sdk/commit/710c89e))
+* **Review:** update Review requests and models to API changes ([6634658](https://github.com/sphereio/commercetools-php-sdk/commit/6634658))
+* **ShippingMethod:** add delete request for shipping methods ([e5510f6](https://github.com/sphereio/commercetools-php-sdk/commit/e5510f6))
+* **State:** add set, add and remove roles update action ([7c9a28d](https://github.com/sphereio/commercetools-php-sdk/commit/7c9a28d))
+* **Type:** add by key delete requests ([509616f](https://github.com/sphereio/commercetools-php-sdk/commit/509616f))
+* **Type:** add type change key action ([1c2ebf4](https://github.com/sphereio/commercetools-php-sdk/commit/1c2ebf4))
+* **Type:** add type update by key request ([72e4bd2](https://github.com/sphereio/commercetools-php-sdk/commit/72e4bd2))
+* **Types:** add delete type by key request ([2450b7a](https://github.com/sphereio/commercetools-php-sdk/commit/2450b7a))
+* **Types:** add request to get type by key ([2b34ae9](https://github.com/sphereio/commercetools-php-sdk/commit/2b34ae9)), closes [#169](https://github.com/sphereio/commercetools-php-sdk/issues/169)
+
+### DEPRECATION NOTE
+Facet, Filter, FilterRange and FilterRangeCollection in namespace Commercetools\Core\Model\Product have been marked as deprecated and will be removed in v1.0.0. Please use the classes found in namespace Commercetools\Core\Model\Product\Search instead.
+
+### BREAKING CHANGES
+* Changed named constructors for type update actions
+  
+  Before:
+  
+  ```
+  TypeAddLocalizedEnumValueAction::ofEnum(...)
+  TypeAddEnumValueAction::ofEnum(...)
+  TypeChangeEnumValueOrderAction::ofEnums(...)
+  TypeChangeLocalizedEnumValueOrderAction::ofEnums(...)
+  TypeChangeLabelAction::ofLabel(...)
+  ```
+  
+  After:
+  
+  ```
+  TypeAddLocalizedEnumValueAction::ofNameAndEnum(...)
+  TypeAddEnumValueAction::ofNameAndEnum(...)
+  TypeChangeEnumValueOrderAction::ofNameAndEnums(...)
+  TypeChangeLocalizedEnumValueOrderAction::ofNameAndEnums(...)
+  TypeChangeLabelAction::ofNameAndLabel(...)
+  ```
+
+
+
 <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)
 

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 9.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
+>  STATUS: Release Candidate 10.  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)
@@ -75,12 +75,16 @@ require '../vendor/autoload.php';
 
 use Commercetools\Core\Request\Products\ProductProjectionSearchRequest;
 use Commercetools\Core\Client;
+use Commercetools\Core\Config;
+use Commercetools\Core\Model\Common\Context;
 
 $config = [
     'client_id' => 'my client id',
     'client_secret' => 'my client secret',
     'project' => 'my project id'
 ];
+$context = Context::of()->setLanguages(['en'])->setLocale('en_US')->setGraceful(true);
+$config = Config::fromArray($config)->setContext($context);
 
 /**
  * create a search request and a client,
@@ -89,7 +93,7 @@ $config = [
  */
 $search = ProductProjectionSearchRequest::of()->addParam('text.en', 'red');
 
-$client = new Client($config);
+$client = Client::ofConfig($config);
 $products = $client->execute($search)->toObject();
 
 /**
@@ -156,13 +160,13 @@ ant
 
 ### Built In Test Server
 
-You can use the `docroot` directory with the built-in PHP web server. Add to the docroot directory a file called "myapp.ini". Add following content and setup with your API credentials:
+You can use the `docroot` directory with the built-in PHP web server. Add to the docroot directory a file called "myapp.yml". Add following content and setup with your API credentials:
 
-```ini
-[commercetools]
-client_id = 'my client id'
-client_secret = 'my client secret'
-project = 'my project id'
+```yaml
+parameters:
+	client_id: my client id
+	client_secret: my client secret
+	project: my project id
 ```
 
 Then activate the php builtin web server
@@ -180,6 +184,20 @@ 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.
 
 
+### Running tests using docker
+
+Running the test image:
+
+```sh
+echo "COMMERCETOOLS_CLIENT_ID=YourClientID" > env.list
+echo "COMMERCETOOLS_CLIENT_SECRET=YourClientSecret" >> env.list
+echo "COMMERCETOOLS_PROJECT=YourProjectKey" >> env.list
+echo "COMMERCETOOLS_OAUTH_URL=https://auth.sphere.io/oauth/token" >> env.list
+echo "COMMERCETOOLS_API_URL=https://api.sphere.io" >> env.list
+
+docker run --env-file env.list -v $PWD:/opt/app -w /opt/app --rm=true jaysde/php-test-base tools/docker-phpunit.sh
+```
+
 ### <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.

build/theme/@layout.latte

@@ -6,12 +6,12 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex" n:if="!$robots">
 
-	<title>ct SDK: {include title}{if 'overview' !== $active && $config->title}{/if}</title>
+	<title>CTP SDK {getenv('SDK_VERSION')}: {include title}{if 'overview' !== $active && $config->title}{/if}</title>
 
 	<link rel="stylesheet" href="{='resources/bootstrap.min.css'|staticFile}">
 	<link rel="stylesheet" href="{='resources/style.css'|staticFile}">
 	<link n:if="$config->googleCseId" rel="search" type="application/opensearchdescription+xml" title="{$config->title}" href="{$config->baseUrl}/opensearch.xml">
-
+    <link rel="shortcut icon" type="image/png" href="{='resources/favicon.png'|staticFile}">
 	<script n:if="$config->googleAnalytics">
 		var _gaq = _gaq || [];
 		_gaq.push(['_setAccount', {$config->googleAnalytics}]);
@@ -29,7 +29,7 @@
 	<nav id="navigation" class="navbar navbar-default navbar-fixed-top">
 		<div class="container-fluid">
 			<div class="navbar-header">
-				<a href="index.html" class="navbar-brand"><img src="{='resources/ct-logo.svg'|staticFile}" id="navbar-logo" alt="commercetools platform PHP SDK">{if $config->title}{$config->title}{else}Overview{/if}</a>
+				<a href="index.html" class="navbar-brand"><img src="{='resources/ct-logo.svg'|staticFile}" id="navbar-logo" alt="commercetools platform PHP SDK">{if $config->title}{$config->title} {getenv('SDK_VERSION')}{else}Overview{/if}</a>
 			</div>
 			<div class="collapse navbar-collapse">
 

build/theme/class.latte

@@ -86,11 +86,18 @@
                 <tr><th>Located at</td><td><a n:tag-if="$config->sourceCode" href="{$class|sourceUrl}" title="Go to source code">{$class->fileName|relativePath}</a></td></tr>
             {/if}
 
+            {var $sphereDoc = '//dev.commercetools.com/'}
             {foreach $template->annotationSort($template->annotationFilter($class->annotations)) as $annotation => $values}
                 {foreach $values as $value}
-                    {if $annotation == "apidoc"}
-                    <tr><th>API documentation</th><td><b><a href="{$value|noescape}" target="api-doc">{$value|noescape}</a></b></span></td></tr>
-                    {elseif $annotation == "description"}
+                    {if $annotation == "link"}
+                    {php if (strpos($value, $sphereDoc) === false) continue; }
+                    <tr><th>API documentation</th><td>
+                    <b><a href="{$value|noescape}" target="api-doc">{$value|noescape}</a></b></span></td></tr>
+                    {/if}
+                {/foreach}
+                {foreach $values as $value}
+                    {php if (strpos($value, $sphereDoc) !== false) continue; }
+                    {if $annotation == "description"}
                     <tr><td colspan="2">{$value|annotation:$annotation:$class|noescape}</td></tr>
                     {else}
                     <tr><th>{$annotation|annotationBeautify}</th><td>{$value|annotation:$annotation:$class|noescape}</td></tr>

build/theme/resources/favicon.png

@@ -45,6 +45,31 @@
     "monolog/monolog": "^1.12",
     "behat/behat": "^3.0",
     "phpunit/phpcov": "*",
-    "fabpot/php-cs-fixer": "@stable"
+    "fabpot/php-cs-fixer": "@stable",
+    "symfony/yaml": "*",
+    "incenteev/composer-parameter-handler": "^2.0",
+    "munkie/phpunit-teamcity-testlistener": "^1.2",
+    "micheh/teamcity-clover": "^0.6.0"
+  },
+  "scripts": {
+    "updateConfig": [
+      "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+    ],
+    "post-update-cmd": "@updateConfig",
+    "post-install-cmd": "@updateConfig"
+  },
+  "extra": {
+    "incenteev-parameters": [
+      {
+        "file": "docroot/myapp.yml",
+        "env-map": {
+          "client_id": "COMMERCETOOLS_CLIENT_ID",
+          "client_secret": "COMMERCETOOLS_CLIENT_SECRET",
+          "project": "COMMERCETOOLS_PROJECT",
+          "oauth_url": "COMMERCETOOLS_OAUTH_URL",
+          "api_url": "COMMERCETOOLS_API_URL"
+        }
+      }
+    ]
   }
 }

composer.json

@@ -11,15 +11,15 @@
 use Commercetools\Core\Model\Product\ProductProjection;
 use Commercetools\Core\Model\Product\ProductProjectionCollection;
 use Commercetools\Core\Request\Products\ProductProjectionSearchRequest;
+use Symfony\Component\Yaml\Yaml;
 
 require '../vendor/autoload.php';
 
-$appConfig = parse_ini_file('myapp.ini', true);
-
+$appConfig = Yaml::parse(file_get_contents('myapp.yml'));
 $context = Context::of()->setLanguages(['en'])->setGraceful(true);
 
 // create the api client config object
-$config = Config::fromArray($appConfig['commercetools'])->setContext($context);
+$config = Config::fromArray($appConfig['parameters'])->setContext($context);
 
 /**
  * create search request