Merge branch 'release/v1.0.0-RC11'

Author: Jens Schulze

CHANGELOG.md

@@ -1,3 +1,82 @@
+<a name="1.0.0-RC11"></a>
+# [1.0.0-RC11](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC10...v1.0.0-RC11) (2016-04-06)
+
+
+### Bug Fixes
+
+* **Product:** change type of price collection ([8cc1262](https://github.com/sphereio/commercetools-php-sdk/commit/8cc1262))
+
+### Code Refactoring
+
+* **Customer:** adjust customer email verification request to API changes ([2e3dd32](https://github.com/sphereio/commercetools-php-sdk/commit/2e3dd32))
+* **Customer:** adjust customer password change request to API changes ([318e93f](https://github.com/sphereio/commercetools-php-sdk/commit/318e93f))
+
+### Features
+
+* **Client:** add support for oauth scopes ([5545dfd](https://github.com/sphereio/commercetools-php-sdk/commit/5545dfd))
+* **Client:** log response body and headers of api exceptions ([f371979](https://github.com/sphereio/commercetools-php-sdk/commit/f371979)), closes [#186](https://github.com/sphereio/commercetools-php-sdk/issues/186)
+* **Product:** add update action for stageable SKU ([870a1f8](https://github.com/sphereio/commercetools-php-sdk/commit/870a1f8))
+* **Response:** add getter for correlation id ([6029a02](https://github.com/sphereio/commercetools-php-sdk/commit/6029a02)), closes [#69](https://github.com/sphereio/commercetools-php-sdk/issues/69)
+
+
+### BREAKING CHANGES
+
+* Product: renamed the ProductSetSKUAction to ProductSetSKUNotStageableAction
+
+  Before:
+  
+  ```
+  ProductSetSKUAction::ofVariantId()
+  ```
+
+  After:
+  
+  ```
+  ProductSetSKUNotStageableAction::ofVariantId() // old behavior action
+  ProductSetSkuAction::ofVariantId() // stageable action
+  ```
+* Product: fix type of price collections
+  
+  Before:
+  
+  ```
+  ProductAddVariantAction::of()->setPrices(PriceCollection::of()->add(Price::of()))
+  ```
+
+  After:
+  
+  ```
+  ProductAddVariantAction::of()->setPrices(PriceDraftCollection::of()->add(PriceDraft::of()))
+  ```
+* Customer: adjust customer email verification request to API changes
+
+  Before:
+  
+  ```
+  CustomerEmailConfirmRequest::ofIdVersionAndToken($id, $version, $token)
+  ```
+
+  After:
+  
+  ```
+  CustomerEmailConfirmRequest::ofToken($token)
+  ```
+* Customer: adjust customer password change request to API changes
+
+  Before:
+  
+  ```
+  CustomerPasswordResetRequest::ofIdVersionTokenAndPassword($id, $version, $token, $newPassword)
+  ```
+
+  After:
+  
+  ```
+  CustomerPasswordResetRequest::ofTokenAndPassword($token, $newPassword)
+  ```
+
+
+
 <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)
 

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 10.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
+>  STATUS: Release Candidate 11.  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)

composer.json

@@ -34,7 +34,7 @@
   },
   "require-dev": {
     "guzzlehttp/guzzle": "^6.0",
-    "phpunit/phpunit": "^4.0",
+    "phpunit/phpunit": "^5.0 || ^4.0",
     "phpmd/phpmd": "@stable",
     "squizlabs/php_codesniffer": "@stable",
     "sebastian/phpcpd": "@stable",
@@ -47,9 +47,7 @@
     "phpunit/phpcov": "*",
     "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"
+    "incenteev/composer-parameter-handler": "^2.0"
   },
   "scripts": {
     "updateConfig": [
@@ -65,6 +63,8 @@
         "env-map": {
           "client_id": "COMMERCETOOLS_CLIENT_ID",
           "client_secret": "COMMERCETOOLS_CLIENT_SECRET",
+          "view_products-client_id": "COMMERCETOOLS_CLIENT_ID_VIEW",
+          "view_products-client_secret": "COMMERCETOOLS_CLIENT_SECRET_VIEW",
           "project": "COMMERCETOOLS_PROJECT",
           "oauth_url": "COMMERCETOOLS_OAUTH_URL",
           "api_url": "COMMERCETOOLS_API_URL"

docroot/myapp.yml.dist

@@ -1,6 +1,8 @@
 parameters:
   client_id: Your Commercetools client ID
   client_secret: Your Commercetools client secret
+  view_products-client_id: Your Commercetools client ID
+  view_products-client_secret: Your Commercetools client secret
   project: Your Commercetools project key
   oauth_url: https://auth.sphere.io/oauth/token
   api_url: https://api.sphere.io

features/bootstrap/ApiContext.php

@@ -534,12 +534,9 @@ public function iWantToResetTheContextPasswordToNewPasswordWithToken($context, $
         $context = $this->getContext($context);
         $module = $this->getModuleName($context);
         $request = '\Commercetools\Core\Request\\' . $module . '\\' . $context . 'PasswordResetRequest';
-        $requestContext = $context . 'Request';
-        $id = $this->objects[$requestContext]['id'];
-        $version = $this->objects[$requestContext]['version'];
         $this->request = call_user_func_array(
-            $request. '::ofIdVersionTokenAndPassword',
-            [$id, $version, $token, $newPassword]
+            $request. '::ofTokenAndPassword',
+            [$token, $newPassword]
         );
     }
 
@@ -551,12 +548,9 @@ public function iWantToConfirmTheContextEmailWithToken($context, $token)
         $context = $this->getContext($context);
         $module = $this->getModuleName($context);
         $request = '\Commercetools\Core\Request\\' . $module . '\\' . $context . 'EmailConfirmRequest';
-        $requestContext = $context . 'Request';
-        $id = $this->objects[$requestContext]['id'];
-        $version = $this->objects[$requestContext]['version'];
         $this->request = call_user_func_array(
-            $request. '::ofIdVersionAndToken',
-            [$id, $version, $token]
+            $request. '::ofToken',
+            [$token]
         );
     }
 

features/request/Customer/CustomerEmailConfirmation.feature

@@ -14,15 +14,12 @@ Feature: I want to confirm a customer's email
     """
 
   Scenario: Confirm Token for email change
-    Given a "customer" is identified by "id" and version 1
     Given i want to confirm the "Customer" email with token "token"
     Then the path should be "customers/email/confirm"
     And the method should be "POST"
     And the request should be
     """
     {
-      "id": "id",
-      "version": 1,
       "tokenValue": "token"
     }
     """

features/request/Customer/CustomerPasswordChange.feature

@@ -18,15 +18,12 @@ Feature: I want to change the customer's password
     And the method should be "GET"
 
   Scenario: Reset customers password
-    Given a "customer" is identified by "id" and version 1
-    And i want to reset the "customer" password to "newPassword" with token "token"
+    Given i want to reset the "customer" password to "newPassword" with token "token"
     Then the path should be "customers/password/reset"
     And the method should be "POST"
     And the request should be
     """
     {
-      "id": "id",
-      "version": 1,
       "tokenValue": "token",
       "newPassword": "newPassword"
     }

features/request/Product/ProductUpdate.feature

@@ -715,7 +715,7 @@ 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 "setSKU" action to "product" with values
+    And add the "setSkuNotStageable" action to "product" with values
     """
         {
           "action": "setSKU",

src/AbstractHttpClient.php

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '1.0.0-RC10';
+    const VERSION = '1.0.0-RC11';
 
     /**
      * @var AdapterInterface

src/Cache/NullCacheAdapter.php

@@ -11,14 +11,16 @@
  */
 class NullCacheAdapter extends AbstractCacheAdapter
 {
+    protected $cache = [];
+
     /**
      * @param $key
      * @param $options
      * @return bool
      */
     public function has($key, $options = null)
     {
-        return false;
+        return isset($this->cache[$key]);
     }
 
     /**
@@ -28,6 +30,9 @@ public function has($key, $options = null)
      */
     public function fetch($key, $options = null)
     {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
         return false;
     }
 
@@ -40,6 +45,8 @@ public function fetch($key, $options = null)
      */
     public function store($key, $data, $lifeTime = null, $options = null)
     {
+        $this->cache[$key] = $data;
+
         return true;
     }
 
@@ -50,6 +57,7 @@ public function store($key, $data, $lifeTime = null, $options = null)
      */
     public function remove($key, $options = null)
     {
+        unset($this->cache[$key]);
         return true;
     }
 }

src/Client.php

@@ -6,6 +6,7 @@
 
 namespace Commercetools\Core;
 
+use Commercetools\Core\Response\ErrorResponse;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -231,7 +232,8 @@ public function execute(ClientRequestInterface $request)
         $httpRequest = $this->createHttpRequest($request);
 
         try {
-            $response = $this->getHttpClient()->execute($httpRequest);
+            $httpResponse = $this->getHttpClient()->execute($httpRequest);
+            $response = $request->buildResponse($httpResponse);
         } catch (ApiException $exception) {
             if ($exception instanceof InvalidTokenException && !$this->tokenRefreshed) {
                 $this->tokenRefreshed = true;
@@ -241,11 +243,12 @@ public function execute(ClientRequestInterface $request)
             if ($this->getConfig()->getThrowExceptions() || !$exception->getResponse() instanceof ResponseInterface) {
                 throw $exception;
             }
-            $response = $exception->getResponse();
+            $httpResponse = $exception->getResponse();
+            $this->logException($exception);
+            $response = new ErrorResponse($exception, $request, $httpResponse);
         }
-        $this->logDeprecatedRequest($response, $httpRequest);
+        $this->logDeprecatedRequest($httpResponse, $httpRequest);
 
-        $response = $request->buildResponse($response);
 
         return $response;
     }
@@ -303,14 +306,22 @@ public function executeBatch()
             $request = $this->batchRequests[$key];
             $httpRequest = $requests[$key];
             if ($httpResponse instanceof ApiException) {
+                $exception = $httpResponse;
                 if ($this->getConfig()->getThrowExceptions() ||
                     !$httpResponse->getResponse() instanceof ResponseInterface
                 ) {
-                    throw $httpResponse;
+                    throw $exception;
                 }
-                $httpResponse = $httpResponse->getResponse();
+                $this->logException($httpResponse);
+                $httpResponse = $exception->getResponse();
+                $responses[$request->getIdentifier()] = new ErrorResponse(
+                    $exception,
+                    $request,
+                    $httpResponse
+                );
+            } else {
+                $responses[$request->getIdentifier()] = $request->buildResponse($httpResponse);
             }
-            $responses[$request->getIdentifier()] = $request->buildResponse($httpResponse);
             $this->logDeprecatedRequest($httpResponse, $httpRequest);
         }
         unset($this->batchRequests);
@@ -319,6 +330,30 @@ public function executeBatch()
         return $responses;
     }
 
+    /**
+     * @param $exception
+     * @return $this
+     */
+    protected function logException(ApiException $exception)
+    {
+        if (is_null($this->logger)) {
+            return $this;
+        }
+        $response = $exception->getResponse();
+
+        $context = [];
+        if ($response instanceof ResponseInterface) {
+            $context = [
+                'responseStatusCode' => $response->getStatusCode(),
+                'responseHeaders' => $response->getHeaders(),
+                'responseBody' => (string)$response->getBody(),
+            ];
+        }
+        $this->logger->error($exception->getMessage(), $context);
+
+        return $this;
+    }
+
     /**
      * @param ResponseInterface $response
      * @param RequestInterface $request