diff --git a/CHANGELOG.md b/CHANGELOG.md index f42c97313f..6899e215c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ + +## [2.5.1](https://github.com/commercetools/commercetools-php-sdk/compare/v2.5.0...v2.5.1) (2018-10-24) + + +### Bug Fixes + +* **Money:** fix fraction digits type ([f870109](https://github.com/commercetools/commercetools-php-sdk/commit/f870109)), closes [#429](https://github.com/commercetools/commercetools-php-sdk/issues/429) + + + # [2.5.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.4.0...v2.5.0) (2018-08-16) diff --git a/bin/ctp-tlscheck.php b/bin/ctp-tlscheck.php index 53e6613e17..ee1e0e97c0 100755 --- a/bin/ctp-tlscheck.php +++ b/bin/ctp-tlscheck.php @@ -3,13 +3,13 @@ class Tls12Checker { - const API_URI = 'api-tls12.commercetools.com'; + const API_URI = 'api.commercetools.com'; const URIS = [ - 'auth-tls12.commercetools.com', - 'api-tls12.commercetools.com', - 'auth-tls12.commercetools.co', - 'api-tls12.commercetools.co', + 'auth.commercetools.com', + 'api.commercetools.com', + 'auth.commercetools.co', + 'api.commercetools.co', 'api.sphere.io', 'api.commercetools.co', ]; diff --git a/composer.json b/composer.json index 00a2078d54..cb7722ee93 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "cache/filesystem-adapter": "^1.0", "cache/void-adapter": "^1.0", "incenteev/composer-parameter-handler": "^2.1", - "commercetools/commercetools-api-reference": "dev-master" + "commercetools/commercetools-api-reference": "dev-master#646973bdc9a5da9216fa8ae774ed51110186e3fa" }, "replaces": { "commercetools/commons": "*" @@ -75,7 +75,7 @@ }, "extra": { "branch-alias": { - "dev-develop": "2.3-dev" + "dev-develop": "2.6-dev" }, "incenteev-parameters": [ { diff --git a/package.json b/package.json index e00cdb960e..f23638e339 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "commercetools-php-sdk-changelog", - "version": "2.6.0", + "version": "2.5.1", "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/src/Core/AbstractHttpClient.php b/src/Core/AbstractHttpClient.php index 7fe3c6c4b4..011d5578de 100644 --- a/src/Core/AbstractHttpClient.php +++ b/src/Core/AbstractHttpClient.php @@ -14,7 +14,7 @@ */ abstract class AbstractHttpClient { - const VERSION = '2.5.0'; + const VERSION = '2.5.1'; /** * @var AdapterInterface diff --git a/src/Core/Model/Common/CentPrecisionMoney.php b/src/Core/Model/Common/CentPrecisionMoney.php index 24955495d7..98e19e24fb 100644 --- a/src/Core/Model/Common/CentPrecisionMoney.php +++ b/src/Core/Model/Common/CentPrecisionMoney.php @@ -13,8 +13,8 @@ * @method CentPrecisionMoney setCentAmount(int $centAmount = null) * @method string getType() * @method CentPrecisionMoney setType(string $type = null) - * @method string getFractionDigits() - * @method CentPrecisionMoney setFractionDigits(string $fractionDigits = null) + * @method int getFractionDigits() + * @method CentPrecisionMoney setFractionDigits(int $fractionDigits = null) */ class CentPrecisionMoney extends Money { @@ -33,7 +33,7 @@ public function fieldDefinitions() static::CURRENCY_CODE => [self::TYPE => 'string'], static::CENT_AMOUNT => [self::TYPE => 'int'], static::TYPE => [self::TYPE => 'string'], - static::FRACTION_DIGITS => [self::TYPE => 'string'] + static::FRACTION_DIGITS => [self::TYPE => 'int'] ]; } diff --git a/src/Core/Model/Common/HighPrecisionMoney.php b/src/Core/Model/Common/HighPrecisionMoney.php index bdc24954a3..ad775276f9 100644 --- a/src/Core/Model/Common/HighPrecisionMoney.php +++ b/src/Core/Model/Common/HighPrecisionMoney.php @@ -13,8 +13,8 @@ * @method HighPrecisionMoney setCentAmount(int $centAmount = null) * @method string getType() * @method HighPrecisionMoney setType(string $type = null) - * @method string getFractionDigits() - * @method HighPrecisionMoney setFractionDigits(string $fractionDigits = null) + * @method int getFractionDigits() + * @method HighPrecisionMoney setFractionDigits(int $fractionDigits = null) * @method int getPreciseAmount() * @method HighPrecisionMoney setPreciseAmount(int $preciseAmount = null) * @method string getHighPrecision() @@ -39,7 +39,7 @@ public function fieldDefinitions() static::CURRENCY_CODE => [self::TYPE => 'string'], static::CENT_AMOUNT => [self::TYPE => 'int'], static::TYPE => [self::TYPE => 'string'], - static::FRACTION_DIGITS => [self::TYPE => 'string'], + static::FRACTION_DIGITS => [self::TYPE => 'int'], static::PRECISE_AMOUNT => [self::TYPE => 'int'], ]; }