Merge branch 'release/v2.14.0'

jenschude · jenschude · commit a902110fd690 · 2021-03-02T14:15:38.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -202,7 +202,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.2
+          php-version: 7.3
           extensions: json, mbstring, intl, apcu
           tools: composer, phive
           ini-values: assert.exception=1, zend.assertions=1, apc.enabled=1, apc.enable_cli=1
@@ -224,7 +224,7 @@ jobs:
       - name: Install box
         env:
           GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: phive install humbug/box --force-accept-unsigned
+        run: phive install humbug/box@^3.11.1 --force-accept-unsigned
 
       - name: Compile phar
         run: tools/box compile
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
@@ -23,7 +24,7 @@ jobs:
         run: ./install-apigen.sh && php apigen.phar generate --debug --config build/apigen.neon
 
       - name: Install SSH Client 🔑
-        uses: webfactory/ssh-agent@v0.2.0
+        uses: webfactory/ssh-agent@v0.4.1
         with:
           ssh-private-key: ${{ secrets.DEPLOY_KEY }}
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [2.14.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.13.0...v2.14.0) (2021-03-02)
+
+### Features
+
+* **Store** support Custom fields for stores
+* **Cart** support cart replicate for stores
+
+### Bug Fixes
+
+* **ErrorResponse:** add getter for inner exception ([96413a7](https://github.com/commercetools/commercetools-php-sdk/commit/96413a76ffa90954cbf2f496f4c71e3634c01740)), closes [#601](https://github.com/commercetools/commercetools-php-sdk/issues/601)
+
+
 # [2.13.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.12.1...v2.13.0) (2021-01-11)
 
 
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
   "require-dev": {
     "guzzlehttp/guzzle": "^7.0 || ^6.0",
     "phpunit/phpunit": "^8.5",
-    "symplify/easy-coding-standard": "^7.2",
+    "symplify/easy-coding-standard-prefixed": "^8.3.48 || ^9.2.1",
     "doctrine/cache": "^1.6",
     "monolog/monolog": "^1.12",
     "symfony/yaml": "^4.0 || ^3.4.38",
diff --git a/ecs.php b/ecs.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(__DIR__ . '/tools/psr2.php');
+
+    $parameters = $containerConfigurator->parameters();
+    $parameters->set(Option::PATHS, [
+        __DIR__ . '/src',
+    ]);
+    $parameters->set(Option::SKIP, [
+        __DIR__ . 'src/Core/Builder'
+    ]);
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "commercetools PHP SDK changelog generator package description",
   "homepage": "https://github.com/commercetools/commercetools-php-sdk",
   "bugs": "https://github.com/commercetools/commercetools-php-sdk/issues",
diff --git a/phive.xml b/phive.xml
@@ -1,4 +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"/>
+  <phar name="humbug/box" version="^3.11.1" installed="3.11.1" location="./tools/box" copy="false"/>
 </phive>
diff --git a/src/Core/AbstractHttpClient.php b/src/Core/AbstractHttpClient.php
@@ -14,7 +14,7 @@
  */
 abstract class AbstractHttpClient
 {
-    const VERSION = '2.13.0-dev';
+    const VERSION = '2.14.0';
 
     /**
      * @var AdapterInterface
diff --git a/src/Core/Helper/Annotate/AnnotationGenerator.php b/src/Core/Helper/Annotate/AnnotationGenerator.php
@@ -588,7 +588,8 @@ function ($link) {
                     $factoryMethod = $requestClass->getMethod('ofDraft');
                     $params = $factoryMethod->getParameters();
                     $draftParam = current($params);
-                    $type = $draftParam->getClass();
+                    $typeClass = new \ReflectionClass($draftParam->getType()->getName());
+                    $type = $typeClass;
                     $uses[] = 'use ' . $type->getName() . ';';
                     if ($domain == 'CustomObjects') {
                         $methodParams[] = [
diff --git a/src/Core/Helper/Annotate/ReflectedClass.php b/src/Core/Helper/Annotate/ReflectedClass.php
@@ -231,7 +231,10 @@ protected function reflectConstructorArgs()
             if ($parameter->isOptional()) {
                 continue;
             }
-            $typeClass = $parameter->getClass();
+            if ($parameter->getType() == null) {
+                continue;
+            }
+            $typeClass = new \ReflectionClass($parameter->getType()->getName());
             $typeName = '';
             if (!is_null($typeClass)) {
                 $typeName = $typeClass->getShortName();
diff --git a/src/Core/Model/Store/Store.php b/src/Core/Model/Store/Store.php
@@ -8,6 +8,7 @@
 use Commercetools\Core\Model\Common\DateTimeDecorator;
 use Commercetools\Core\Model\Common\LocalizedString;
 use Commercetools\Core\Model\Common\Resource;
+use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use DateTime;
 
 /**
@@ -35,6 +36,8 @@
  * @method Store setDistributionChannels(array $distributionChannels = null)
  * @method array getSupplyChannels()
  * @method Store setSupplyChannels(array $supplyChannels = null)
+ * @method CustomFieldObject getCustom()
+ * @method Store setCustom(CustomFieldObject $custom = null)
  * @method StoreReference getReference()
  */
 class Store extends Resource
@@ -57,6 +60,7 @@ public function fieldDefinitions()
             'languages' => [static::TYPE => 'array'],
             'distributionChannels' => [static::TYPE => 'array'],
             'supplyChannels' => [static::TYPE => 'array'],
+            'custom' => [static::TYPE => CustomFieldObject::class],
         ];
     }
 }
diff --git a/src/Core/Model/Store/StoreDraft.php b/src/Core/Model/Store/StoreDraft.php
@@ -8,6 +8,8 @@
 use Commercetools\Core\Model\Common\Context;
 use Commercetools\Core\Model\Common\JsonObject;
 use Commercetools\Core\Model\Common\LocalizedString;
+use Commercetools\Core\Model\CustomField\CustomFieldObject;
+use Commercetools\Core\Model\CustomField\CustomFieldObjectDraft;
 
 /**
  * @package Commercetools\Core\Model\Store
@@ -27,6 +29,8 @@
  * @method StoreDraft setDistributionChannels(array $distributionChannels = null)
  * @method array getSupplyChannels()
  * @method StoreDraft setSupplyChannels(array $supplyChannels = null)
+ * @method CustomFieldObjectDraft getCustom()
+ * @method StoreDraft setCustom(CustomFieldObjectDraft $custom = null)
  */
 class StoreDraft extends JsonObject
 {
@@ -38,6 +42,7 @@ public function fieldDefinitions()
             'languages' => [static::TYPE => 'array'],
             'distributionChannels' => [static::TYPE => 'array'],
             'supplyChannels' => [static::TYPE => 'array'],
+            'custom' => [static::TYPE => CustomFieldObjectDraft::class],
         ];
     }
 
diff --git a/src/Core/Request/InStores/InStoreRequests.php b/src/Core/Request/InStores/InStoreRequests.php
@@ -10,6 +10,7 @@
 use Commercetools\Core\Request\Carts\CartCreateRequest;
 use Commercetools\Core\Request\Carts\CartDeleteRequest;
 use Commercetools\Core\Request\Carts\CartQueryRequest;
+use Commercetools\Core\Request\Carts\CartReplicateRequest;
 use Commercetools\Core\Request\Carts\CartUpdateRequest;
 use Commercetools\Core\Request\Customers\CustomerByEmailTokenGetRequest;
 use Commercetools\Core\Request\Customers\CustomerByIdGetRequest;
@@ -53,6 +54,7 @@ class InStoreRequests
         CartCreateRequest::class => 1,
         CartUpdateRequest::class => 1,
         CartDeleteRequest::class => 1,
+        CartReplicateRequest::class => 1,
         MeCartByIdRequest::class => 1,
         MeActiveCartRequest::class => 1,
         MeCartQueryRequest::class => 1,
diff --git a/src/Core/Response/ErrorResponse.php b/src/Core/Response/ErrorResponse.php
@@ -52,4 +52,12 @@ public function getMessage()
         }
         return $this->message;
     }
+
+    /**
+     * @return \Exception
+     */
+    public function getException()
+    {
+        return $this->exception;
+    }
 }
diff --git a/tools/php_codesniffer/php-codesniffer-psr2.php b/tools/php_codesniffer/php-codesniffer-psr2.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+use PHP_CodeSniffer\Standards\Generic\Sniffs\ControlStructures\InlineControlStructureSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\ByteOrderMarkSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineEndingsSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\DisallowMultipleStatementsSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Functions\FunctionCallArgumentSpacingSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\UpperCaseConstantNameSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseConstantSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseKeywordSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\DisallowTabIndentSniff;
+use PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ScopeIndentSniff;
+use PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\ValidDefaultValueSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\ClassDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ElseIfDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\SwitchDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Files\ClosingTagSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Files\EndFileNewlineSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionClosingBraceSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\MethodDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\NamespaceDeclarationSniff;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\UseDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ControlSignatureSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ForEachLoopDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ForLoopDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\LowercaseDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\FunctionDeclarationArgumentSpacingSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\FunctionDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\LowercaseFunctionKeywordsSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\MultiLineFunctionDeclarationSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\Scope\MethodScopeSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ScopeClosingBraceSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ScopeKeywordSpacingSniff;
+use PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $services = $containerConfigurator->services();
+
+    $services->set(NamespaceDeclarationSniff::class);
+
+    $services->set(UseDeclarationSniff::class);
+
+    $services->set(ClassDeclarationSniff::class);
+
+    $services->set(PropertyDeclarationSniff::class);
+
+    $services->set(EndFileNewlineSniff::class);
+
+    $services->set(ClosingTagSniff::class);
+
+    $services->set(ControlStructureSpacingSniff::class);
+
+    $services->set(SwitchDeclarationSniff::class);
+
+    $services->set(ElseIfDeclarationSniff::class);
+
+    $services->set(FunctionCallSignatureSniff::class);
+
+    $services->set(MethodDeclarationSniff::class);
+
+    $services->set(FunctionClosingBraceSniff::class);
+
+    $services->set(ByteOrderMarkSniff::class);
+
+    $services->set(ValidClassNameSniff::class);
+
+    $services->set(UpperCaseConstantNameSniff::class);
+
+    $services->set(LineEndingsSniff::class)
+        ->property('eolChar', '\n');
+
+    $services->set(SuperfluousWhitespaceSniff::class)
+        ->property('ignoreBlankLines', true);
+
+    $services->set(DisallowMultipleStatementsSniff::class);
+
+    $services->set(ScopeIndentSniff::class)
+        ->property('ignoreIndentationTokens', ['T_COMMENT', 'T_DOC_COMMENT_OPEN_TAG']);
+
+    $services->set(DisallowTabIndentSniff::class);
+
+    $services->set(LowerCaseKeywordSniff::class);
+
+    $services->set(LowerCaseConstantSniff::class);
+
+    $services->set(MethodScopeSniff::class);
+
+    $services->set(ScopeKeywordSpacingSniff::class);
+
+    $services->set(FunctionDeclarationSniff::class);
+
+    $services->set(LowercaseFunctionKeywordsSniff::class);
+
+    $services->set(FunctionDeclarationArgumentSpacingSniff::class)
+        ->property('equalsSpacing', 1);
+
+    $services->set(ValidDefaultValueSniff::class);
+
+    $services->set(MultiLineFunctionDeclarationSniff::class);
+
+    $services->set(FunctionCallArgumentSpacingSniff::class);
+
+    $services->set(ControlSignatureSniff::class);
+
+    $services->set(ScopeClosingBraceSniff::class);
+
+    $services->set(ForEachLoopDeclarationSniff::class);
+
+    $services->set(ForLoopDeclarationSniff::class);
+
+    $services->set(LowercaseDeclarationSniff::class);
+
+    $services->set(InlineControlStructureSniff::class);
+
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set(Option::SKIP, [
+        ControlStructureSpacingSniff::class . '.SpacingAfterOpenBrace' => null,
+        ControlStructureSpacingSniff::class . '.SpaceBeforeCloseBrace' => null,
+        ControlStructureSpacingSniff::class . '.LineAfterClose' => null,
+        ControlStructureSpacingSniff::class . '.NoLineAfterClose' => null,
+        FunctionCallSignatureSniff::class . '.OpeningIndent' => null,
+    ]);
+};
diff --git a/tools/php_cs_fixer/php-cs-fixer-psr2.php b/tools/php_cs_fixer/php-cs-fixer-psr2.php
diff --git a/tools/psr2.php b/tools/psr2.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "commercetools-php-sdk-changelog",`
`3`		`- "version": "2.13.0",`
	`3`	`+ "version": "2.14.0",`
`4`	`4`	`"description": "commercetools PHP SDK changelog generator package description",`
`5`	`5`	`"homepage": "https://github.com/commercetools/commercetools-php-sdk",`
`6`	`6`	`"bugs": "https://github.com/commercetools/commercetools-php-sdk/issues",`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`	`abstract class AbstractHttpClient`
`16`	`16`	`{`
`17`		`- const VERSION = '2.13.0-dev';`
	`17`	`+ const VERSION = '2.14.0';`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @var AdapterInterface`