Merge branch 'release/v1.5.0'

Author: Jens Schulze

CHANGELOG.md

@@ -1,8 +1,8 @@
 # <img src="build/theme/resources/CT_cube_200px.png" width="40" align="center"></img> commercetools PHP SDK
 
-[![Build Status](https://img.shields.io/travis/sphereio/commercetools-php-sdk/master.svg?style=flat-square)](https://travis-ci.org/sphereio/commercetools-php-sdk) [![Scrutinizer](https://img.shields.io/scrutinizer/g/sphereio/commercetools-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/sphereio/commercetools-php-sdk/) [![Scrutinizer](https://img.shields.io/scrutinizer/coverage/g/sphereio/commercetools-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/sphereio/commercetools-php-sdk/) [![Packagist](https://img.shields.io/packagist/v/commercetools/php-sdk.svg?style=flat-square)](https://packagist.org/packages/commercetools/php-sdk) [![Packagist](https://img.shields.io/packagist/dm/commercetools/php-sdk.svg?style=flat-square)](https://packagist.org/packages/commercetools/php-sdk)
+[![Build Status](https://img.shields.io/travis/commercetools/commercetools-php-sdk/master.svg?style=flat-square)](https://travis-ci.org/commercetools/commercetools-php-sdk) [![Scrutinizer](https://img.shields.io/scrutinizer/g/commercetools/commercetools-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/commercetools/commercetools-php-sdk/) [![Scrutinizer](https://img.shields.io/scrutinizer/coverage/g/commercetools/commercetools-php-sdk.svg?style=flat-square)](https://scrutinizer-ci.com/g/commercetools/commercetools-php-sdk/) [![Packagist](https://img.shields.io/packagist/v/commercetools/php-sdk.svg?style=flat-square)](https://packagist.org/packages/commercetools/php-sdk) [![Packagist](https://img.shields.io/packagist/dm/commercetools/php-sdk.svg?style=flat-square)](https://packagist.org/packages/commercetools/php-sdk)
 
-The PHP SDK allows developers to build applications on the commercetools platform (technically speaking against the SPHERE.IO REST API) using PHP native interfaces, models and helpers instead of manually using the HTTP and JSON API.
+The PHP SDK allows developers to build applications on the commercetools platform (technically speaking against our 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.. The Client manages the OAuth2 security tokens, provides caches and interfaces for concurrent and asynchronous API calls.
 
@@ -11,11 +11,11 @@ The SDK is licensed under the permissive [MIT License](LICENSE). Don't hesitate
 
 ## Using the SDK
 
-The [PHP API documentation](http://sphereio.github.io/commercetools-php-sdk/docs/master) provides all the details you need in a searchable form (link points to latest stable release).
+The [PHP API documentation](http://commercetools.github.io/commercetools-php-sdk/docs/master) provides all the details you need in a searchable form (link points to latest stable release).
 
 ### Install & Integrate the SDK into your Project
 
-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 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://commercetools.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.
@@ -52,7 +52,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](https://github.com/sphereio/commercetools-php-sdk/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/commercetools/commercetools-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.
 
@@ -141,7 +141,7 @@ php composer.phar update
 Clone the develop branch of the repository (we're using the [gitflow](http://nvie.com/posts/a-successful-git-branching-model/) branching model, so master is for releases only):
 
 ```
-git clone [email protected]:sphereio/commercetools-php-sdk.git
+git clone [email protected]:commercetools/commercetools-php-sdk.git
 ```
 
 Please follow the [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style, ideally via your IDE settings (see below for PhpStorm instructions).

README.md

@@ -1,5 +1,5 @@
 title: PHP SDK
-baseUrl: http://sphereio.github.io/commercetools-php-sdk/docs/master
+baseUrl: http://commercetools.github.io/commercetools-php-sdk/docs/master
 
 source: [src/]
 destination: build/docs

build/apigen.neon

@@ -3,12 +3,12 @@
   "license": "MIT",
   "type": "project",
   "description": "The commercetools PHP SDK \n The official PHP Interface to the commercetools eCommerce API",
-  "homepage": "https://github.com/sphereio/commercetools-php-sdk",
+  "homepage": "https://github.com/commercetools/commercetools-php-sdk",
   "support": {
     "email": "[email protected]",
     "forum": "http://support.sphere.io",
-    "issues": "https://github.com/sphereio/commercetools-php-sdk/issues",
-    "docs": "http://sphereio.github.io/commercetools-php-sdk/docs/master/"
+    "issues": "https://github.com/commercetools/commercetools-php-sdk/issues",
+    "docs": "http://commercetools.github.io/commercetools-php-sdk/docs/master/"
   },
   "autoload": {
     "psr-4": {
@@ -61,7 +61,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "1.4-dev"
+      "dev-develop": "1.5-dev"
     },
     "incenteev-parameters": [
       {

composer.json

@@ -16,7 +16,7 @@
 use Commercetools\Core\Request\Products\ProductProjectionSearchRequest;
 use Symfony\Component\Yaml\Yaml;
 
-require __DIR__ . '../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 $appConfig = Yaml::parse(file_get_contents('myapp.yml'));
 $context = Context::of()->setLanguages(['en'])->setGraceful(true);

docroot/index.php

@@ -11,7 +11,7 @@
 export SDK_VERSION=$TRAVIS_BRANCH;
 if [ $(phpenv version-name) = "5.6" ] ; then ant apigen; fi
 
-if [ "$TRAVIS_REPO_SLUG" == "sphereio/commercetools-php-sdk" ] && [ $(phpenv version-name) = "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
+if [ "$TRAVIS_REPO_SLUG" == "commercetools/commercetools-php-sdk" ] && [ $(phpenv version-name) = "5.6" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
   echo -e "Publishing documentation to gh-pages branch ...\n"
 
   cp -R build/docs $HOME/phpdoc-current
@@ -20,7 +20,7 @@ if [ "$TRAVIS_REPO_SLUG" == "sphereio/commercetools-php-sdk" ] && [ $(phpenv ver
   cd $HOME
   git config --global user.email "[email protected]"
   git config --global user.name "travis CI"
-  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/sphereio/commercetools-php-sdk gh-pages > /dev/null 2>&1
+  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/commercetools/commercetools-php-sdk gh-pages > /dev/null 2>&1
 
   cd gh-pages
   git rm -rf ./docs/$TRAVIS_BRANCH

push-docs-to-gh-pages.sh

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '1.4.0';
+    const VERSION = '1.5.0';
 
     /**
      * @var AdapterInterface
@@ -110,10 +110,14 @@ abstract protected function getBaseUrl();
     protected function getUserAgent()
     {
         if (is_null($this->userAgent)) {
-            $agent = 'commercetools-php-sdk/' . static::VERSION . ' PHP/' . PHP_VERSION;
+            $agent = 'commercetools-php-sdk/' . static::VERSION;
+
+            $adapterClass = $this->getAdapterFactory()->getClass($this->getConfig()->getAdapter());
+            $agent .= ' (' . $adapterClass::getAdapterInfo();
             if (extension_loaded('curl') && function_exists('curl_version')) {
-                $agent .= ' curl/' . \curl_version()['version'];
+                $agent .= '; curl/' . \curl_version()['version'];
             }
+            $agent .= ') PHP/' . PHP_VERSION;
             $this->userAgent = $agent;
         }
 

src/AbstractHttpClient.php

@@ -50,7 +50,7 @@
  * ```php
  * $request = ProductProjectionSearchRequest::of();
  * $response = $request->executeWithClient($client);
- * $products = $request->mapResponse($response);
+ * $products = $request->mapFromResponse($response);
  * ```
  *
  * By using the request centric approach the IDE is capable of resolving the correct classes and give

src/Client.php

@@ -42,4 +42,10 @@ public function authenticate($oauthUri, $clientId, $clientSecret, $formParams);
      * @return AdapterPromiseInterface
      */
     public function executeAsync(RequestInterface $request);
+
+    /**
+     * returns used HTTP Client and version
+     * @return string
+     */
+    public static function getAdapterInfo();
 }

src/Client/Adapter/AdapterInterface.php

@@ -236,4 +236,9 @@ function (\GuzzleHttp\Message\ResponseInterface $response) {
 
         return $promise;
     }
+
+    public static function getAdapterInfo()
+    {
+        return 'GuzzleHttp/' . Client::VERSION;
+    }
 }