Merge branch 'release/v2.12.0'

Author: jenschude

.github/workflows/ci.yml

@@ -1,8 +1,10 @@
 # https://help.github.com/en/categories/automating-your-workflow-with-github-actions
 
 on:
-  - pull_request
-  - push
+  pull_request:
+  push:
+    branches: '*'
+    tags: 'v*'
 
 name: CI
 
@@ -138,6 +140,8 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    if: startsWith( github.ref, 'refs/tags/v') == false
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -182,3 +186,84 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         run: bash <(curl -s https://codecov.io/bash) || true
+
+  release:
+    if: startsWith( github.ref, 'refs/tags/v')
+    name: Create release
+
+    runs-on: ubuntu-latest
+    needs: ["coding-guidelines", "unit"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install PHP with extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.2
+          extensions: json, mbstring, intl, apcu
+          tools: composer, phive
+          ini-values: assert.exception=1, zend.assertions=1, apc.enabled=1, apc.enable_cli=1
+
+      - name: Install dependencies with composer
+        env:
+          COMMERCETOOLS_CLIENT_ID: ${{ secrets.COMMERCETOOLS_CLIENT_ID }}
+          COMMERCETOOLS_CLIENT_SECRET: ${{ secrets.COMMERCETOOLS_CLIENT_SECRET }}
+          COMMERCETOOLS_PROJECT: ${{ secrets.COMMERCETOOLS_PROJECT }}
+        run: composer install --no-ansi --no-interaction --no-progress --no-suggest --no-dev
+
+      - name: Retrieve branch name
+        id: branch_name
+        run: |
+          echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
+          echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
+          echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+
+      - name: Install box
+        env:
+          GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: phive install humbug/box --force-accept-unsigned
+
+      - name: Compile phar
+        run: tools/box compile
+
+      - uses: actions/upload-artifact@v1
+        with:
+          name: commercetools-php-sdk-${{ steps.branch_name.outputs.SOURCE_TAG }}.phar
+          path: commercetools-php-sdk.phar
+
+      - name: Read changeset
+        id: changeset
+        run: |
+          CHANGESET=`php tools/extract_changelog.php`
+          CHANGESET="${CHANGESET//'%'/'%25'}"
+          CHANGESET="${CHANGESET//$'\n'/'%0A'}"
+          CHANGESET="${CHANGESET//$'\r'/'%0D'}"
+          echo "::set-output name=changes::$CHANGESET"
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: false
+          body: |
+            ${{ steps.changeset.outputs.changes }}
+
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object,
+          # which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./commercetools-php-sdk.phar
+          asset_name: commercetools-php-sdk.phar
+          asset_content_type: application/php-archive

.gitignore

@@ -26,3 +26,5 @@ tests/integration/requests.log
 tests/fixtures/NotificationExtension.php
 tools/http-client.private.env.json
 yarn.lock
+.phpunit.result.cache
+tests/cache/commercetools_io_access_token*

CHANGELOG.md

@@ -1,3 +1,15 @@
+# [2.12.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.11.1...v2.12.0) (2020-10-12)
+
+
+### Features
+
+* **Error:** add response body to exception message for BadRequest ([a0511ab](https://github.com/commercetools/commercetools-php-sdk/commit/a0511ab887b3636063cac0dc39eb09578fa04d05))
+* **Order:** migrate the first tests and create the fixture ([39b16f2](https://github.com/commercetools/commercetools-php-sdk/commit/39b16f2c3910bf7fe09d88cedbe9afcdfef8ec96))
+* **Project:** support country taxRate fallback ([35001b8](https://github.com/commercetools/commercetools-php-sdk/commit/35001b8663e98e0494b34ee527efb4e325de27bd))
+* **Project:** support language used in stores error ([d170ea6](https://github.com/commercetools/commercetools-php-sdk/commit/d170ea66ee37416e402802a7d766d86dd901a591)), closes [#578](https://github.com/commercetools/commercetools-php-sdk/issues/578)
+
+
+
 # [2.11.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.10.0...v2.11.0) (2020-05-05)
 
 

box.json.dist

@@ -0,0 +1,9 @@
+{
+  "files": [
+    "index.php"
+  ],
+  "main": false,
+  "stub": false,
+  "output": "commercetools-php-sdk.phar",
+  "chmod": "644"
+}

composer.json

@@ -32,7 +32,7 @@
   "require": {
     "php": ">=5.6",
     "psr/log": "^1.0",
-    "guzzlehttp/guzzle": "^6.0 || ^5.3.3",
+    "guzzlehttp/guzzle": "^7.0 || ^6.0 || ^5.3.3 ",
     "guzzlehttp/psr7": "^1.1",
     "psr/cache": "^1.0",
     "psr/simple-cache": "^1.0",
@@ -41,7 +41,7 @@
     "ext-intl": "*"
   },
   "require-dev": {
-    "guzzlehttp/guzzle": "^6.0",
+    "guzzlehttp/guzzle": "^7.0 || ^6.0",
     "phpunit/phpunit": "^8.5",
     "symplify/easy-coding-standard": "^7.2",
     "doctrine/cache": "^1.6",

phive.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="humbug/box" version="^3.8.4" installed="3.8.4" location="./tools/box" copy="false"/>
+</phive>

set_guzzle5.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-SRC='"guzzlehttp/guzzle": "^6.0"'
+SRC='"guzzlehttp/guzzle": "^7.0 \|\| ^6.0"'
 DST='"guzzlehttp/guzzle": "^5.3.3", "react/promise": "^2.2.0", "guzzlehttp/ringphp": "^1.1.1"'
 sed -ibak -e "s|$SRC|$DST|g" composer.json

src/Core/AbstractHttpClient.php

@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '2.11.0';
+    const VERSION = '2.12.0';
 
     /**
      * @var AdapterInterface

src/Core/Builder/Request/MeShoppingListRequestBuilder.php

@@ -7,14 +7,16 @@
 use Commercetools\Core\Model\ShoppingList\MyShoppingListDraft;
 use Commercetools\Core\Model\ShoppingList\ShoppingList;
 use Commercetools\Core\Request\Me\MeShoppingListByIdGetRequest;
+use Commercetools\Core\Request\Me\MeShoppingListByKeyGetRequest;
 use Commercetools\Core\Request\Me\MeShoppingListCreateRequest;
+use Commercetools\Core\Request\Me\MeShoppingListDeleteByKeyRequest;
 use Commercetools\Core\Request\Me\MeShoppingListDeleteRequest;
 use Commercetools\Core\Request\Me\MeShoppingListQueryRequest;
+use Commercetools\Core\Request\Me\MeShoppingListUpdateByKeyRequest;
 use Commercetools\Core\Request\Me\MeShoppingListUpdateRequest;
 
 class MeShoppingListRequestBuilder
 {
-
     /**
      * @return MeShoppingListQueryRequest
      */
@@ -32,6 +34,15 @@ public function update(ShoppingList $shoppingList)
         return MeShoppingListUpdateRequest::ofIdAndVersion($shoppingList->getId(), $shoppingList->getVersion());
     }
 
+    /**
+     * @param ShoppingList $shoppingList
+     * @return MeShoppingListUpdateByKeyRequest
+     */
+    public function updateByKey(ShoppingList $shoppingList)
+    {
+        return MeShoppingListUpdateByKeyRequest::ofKeyAndVersion($shoppingList->getKey(), $shoppingList->getVersion());
+    }
+
     /**
      * @param string $shoppingListId
      * @return MeShoppingListByIdGetRequest
@@ -41,6 +52,15 @@ public function getById($shoppingListId)
         return MeShoppingListByIdGetRequest::ofId($shoppingListId);
     }
 
+    /**
+     * @param string $shoppingListKey
+     * @return MeShoppingListByKeyGetRequest
+     */
+    public function getByKey($shoppingListKey)
+    {
+        return MeShoppingListByKeyGetRequest::ofKey($shoppingListKey);
+    }
+
     /**
      * @param MyShoppingListDraft $myShoppingListDraft
      * @return MeShoppingListCreateRequest
@@ -58,4 +78,13 @@ public function delete(ShoppingList $shoppingList)
     {
         return MeShoppingListDeleteRequest::ofIdAndVersion($shoppingList->getId(), $shoppingList->getVersion());
     }
+
+    /**
+     * @param ShoppingList $shoppingList
+     * @return MeShoppingListDeleteByKeyRequest
+     */
+    public function deleteByKey(ShoppingList $shoppingList)
+    {
+        return MeShoppingListDeleteByKeyRequest::ofKeyAndVersion($shoppingList->getKey(), $shoppingList->getVersion());
+    }
 }

src/Core/Builder/Update/ProjectActionBuilder.php

@@ -5,6 +5,7 @@
 use Commercetools\Core\Error\InvalidArgumentException;
 use Commercetools\Core\Request\AbstractAction;
 use Commercetools\Core\Request\Project\Command\ProjectChangeCountriesAction;
+use Commercetools\Core\Request\Project\Command\ProjectChangeCountryTaxRateFallbackEnabledAction;
 use Commercetools\Core\Request\Project\Command\ProjectChangeCurrenciesAction;
 use Commercetools\Core\Request\Project\Command\ProjectChangeLanguagesAction;
 use Commercetools\Core\Request\Project\Command\ProjectChangeMessagesConfigurationAction;
@@ -28,6 +29,17 @@ public function changeCountries($action = null)
         return $this;
     }
 
+    /**
+     *
+     * @param ProjectChangeCountryTaxRateFallbackEnabledAction|callable $action
+     * @return $this
+     */
+    public function changeCountryTaxRateFallbackEnabled($action = null)
+    {
+        $this->addAction($this->resolveAction(ProjectChangeCountryTaxRateFallbackEnabledAction::class, $action));
+        return $this;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-project.html#change-currencies
      * @param ProjectChangeCurrenciesAction|callable $action