Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit 0d508af

Browse files
committed
Merge branch 'hotfix/fraction-digit-fix'
2 parents fa2b73b + 5bdc493 commit 0d508af

File tree

7 files changed

+25
-15
lines changed

7 files changed

+25
-15
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<a name="2.5.1"></a>
2+
## [2.5.1](https://github.com/commercetools/commercetools-php-sdk/compare/v2.5.0...v2.5.1) (2018-10-24)
3+
4+
5+
### Bug Fixes
6+
7+
* **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)
8+
9+
10+
111
<a name="2.5.0"></a>
212
# [2.5.0](https://github.com/commercetools/commercetools-php-sdk/compare/v2.4.0...v2.5.0) (2018-08-16)
313

bin/ctp-tlscheck.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
class Tls12Checker
55
{
6-
const API_URI = 'api-tls12.commercetools.com';
6+
const API_URI = 'api.commercetools.com';
77

88
const URIS = [
9-
'auth-tls12.commercetools.com',
10-
'api-tls12.commercetools.com',
11-
'auth-tls12.commercetools.co',
12-
'api-tls12.commercetools.co',
9+
'auth.commercetools.com',
10+
'api.commercetools.com',
11+
'auth.commercetools.co',
12+
'api.commercetools.co',
1313
'api.sphere.io',
1414
'api.commercetools.co',
1515
];

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"cache/filesystem-adapter": "^1.0",
5555
"cache/void-adapter": "^1.0",
5656
"incenteev/composer-parameter-handler": "^2.1",
57-
"commercetools/commercetools-api-reference": "dev-master"
57+
"commercetools/commercetools-api-reference": "dev-master#646973bdc9a5da9216fa8ae774ed51110186e3fa"
5858
},
5959
"replaces": {
6060
"commercetools/commons": "*"
@@ -75,7 +75,7 @@
7575
},
7676
"extra": {
7777
"branch-alias": {
78-
"dev-develop": "2.3-dev"
78+
"dev-develop": "2.6-dev"
7979
},
8080
"incenteev-parameters": [
8181
{

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "commercetools-php-sdk-changelog",
3-
"version": "2.6.0",
3+
"version": "2.5.1",
44
"description": "commercetools PHP SDK changelog generator package description",
55
"homepage": "https://github.com/commercetools/commercetools-php-sdk",
66
"bugs": "https://github.com/commercetools/commercetools-php-sdk/issues",

src/Core/AbstractHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515
abstract class AbstractHttpClient
1616
{
17-
const VERSION = '2.5.0';
17+
const VERSION = '2.5.1';
1818

1919
/**
2020
* @var AdapterInterface

src/Core/Model/Common/CentPrecisionMoney.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* @method CentPrecisionMoney setCentAmount(int $centAmount = null)
1414
* @method string getType()
1515
* @method CentPrecisionMoney setType(string $type = null)
16-
* @method string getFractionDigits()
17-
* @method CentPrecisionMoney setFractionDigits(string $fractionDigits = null)
16+
* @method int getFractionDigits()
17+
* @method CentPrecisionMoney setFractionDigits(int $fractionDigits = null)
1818
*/
1919
class CentPrecisionMoney extends Money
2020
{
@@ -33,7 +33,7 @@ public function fieldDefinitions()
3333
static::CURRENCY_CODE => [self::TYPE => 'string'],
3434
static::CENT_AMOUNT => [self::TYPE => 'int'],
3535
static::TYPE => [self::TYPE => 'string'],
36-
static::FRACTION_DIGITS => [self::TYPE => 'string']
36+
static::FRACTION_DIGITS => [self::TYPE => 'int']
3737
];
3838
}
3939

src/Core/Model/Common/HighPrecisionMoney.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* @method HighPrecisionMoney setCentAmount(int $centAmount = null)
1414
* @method string getType()
1515
* @method HighPrecisionMoney setType(string $type = null)
16-
* @method string getFractionDigits()
17-
* @method HighPrecisionMoney setFractionDigits(string $fractionDigits = null)
16+
* @method int getFractionDigits()
17+
* @method HighPrecisionMoney setFractionDigits(int $fractionDigits = null)
1818
* @method int getPreciseAmount()
1919
* @method HighPrecisionMoney setPreciseAmount(int $preciseAmount = null)
2020
* @method string getHighPrecision()
@@ -39,7 +39,7 @@ public function fieldDefinitions()
3939
static::CURRENCY_CODE => [self::TYPE => 'string'],
4040
static::CENT_AMOUNT => [self::TYPE => 'int'],
4141
static::TYPE => [self::TYPE => 'string'],
42-
static::FRACTION_DIGITS => [self::TYPE => 'string'],
42+
static::FRACTION_DIGITS => [self::TYPE => 'int'],
4343
static::PRECISE_AMOUNT => [self::TYPE => 'int'],
4444
];
4545
}

0 commit comments

Comments
 (0)