Skip to content

Commit 5493217

Browse files
andrewbessandrewbess
committed
Merge remote-tracking branch 'origin/AC-2577-composer-update-minor' into AC-2425-update-elasticsearch-7.17
2 parents d6756f9 + 8b49da3 commit 5493217

File tree

8 files changed

+548
-700
lines changed

8 files changed

+548
-700
lines changed

‎app/code/Magento/Captcha/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"magento/module-authorization": "*",
1616
"laminas/laminas-captcha": "^2.11.0",
1717
"laminas/laminas-db": "^2.13.4",
18-
"laminas/laminas-session": "^2.12.0"
18+
"laminas/laminas-session": "^2.12.1"
1919
},
2020
"type": "magento2-module",
2121
"license": [

‎app/code/Magento/GraphQl/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-webapi": "*",
1010
"magento/module-new-relic-reporting": "*",
1111
"magento/module-authorization": "*",
12-
"webonyx/graphql-php": "~14.11.3"
12+
"webonyx/graphql-php": "~14.11.5"
1313
},
1414
"suggest": {
1515
"magento/module-graph-ql-cache": "*"

‎app/code/Magento/Tax/Test/Unit/Model/Calculation/UnitBaseCalculatorTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929
*/
3030
class UnitBaseCalculatorTest extends TestCase
3131
{
32-
const STORE_ID = 2300;
33-
const QUANTITY = 1;
34-
const UNIT_PRICE = 500;
35-
const RATE = 10;
36-
const STORE_RATE = 11;
37-
38-
const CODE = 'CODE';
39-
const TYPE = 'TYPE';
40-
const ROW_TAX = 44.958682408681;
41-
const ROW_TAX_ROUNDED = 44.95;
42-
const PRICE_INCL_TAX = 495.4954954955;
43-
const PRICE_INCL_TAX_ROUNDED = 495.50;
32+
public const STORE_ID = 2300;
33+
public const QUANTITY = 1;
34+
public const UNIT_PRICE = 500;
35+
public const RATE = 10;
36+
public const STORE_RATE = 11;
37+
38+
public const CODE = 'CODE';
39+
public const TYPE = 'TYPE';
40+
public const ROW_TAX = 44.958682408681;
41+
public const ROW_TAX_ROUNDED = 44.95;
42+
public const PRICE_INCL_TAX = 495.4954954955;
43+
public const PRICE_INCL_TAX_ROUNDED = 495.50;
4444

4545
/** @var MockObject */
4646
protected $taxDetailsItemDataObjectFactoryMock;
@@ -161,13 +161,13 @@ public function testCalculateWithTaxInPrice()
161161
$this->assertSame($this->taxDetailsItem, $this->model->calculate($mockItem, self::QUANTITY));
162162
$this->assertSame(self::CODE, $this->taxDetailsItem->getCode());
163163
$this->assertSame(self::TYPE, $this->taxDetailsItem->getType());
164-
$this->assertSame(self::ROW_TAX_ROUNDED, $this->taxDetailsItem->getRowTax());
164+
$this->assertEquals(self::ROW_TAX_ROUNDED, $this->taxDetailsItem->getRowTax());
165165
$this->assertEquals(self::PRICE_INCL_TAX_ROUNDED, $this->taxDetailsItem->getPriceInclTax());
166166

167167
$this->assertSame($this->taxDetailsItem, $this->model->calculate($mockItem, self::QUANTITY, false));
168168
$this->assertSame(self::CODE, $this->taxDetailsItem->getCode());
169169
$this->assertSame(self::TYPE, $this->taxDetailsItem->getType());
170-
$this->assertSame(self::ROW_TAX, $this->taxDetailsItem->getRowTax());
170+
$this->assertEquals(self::ROW_TAX, $this->taxDetailsItem->getRowTax());
171171
$this->assertEquals(self::PRICE_INCL_TAX, $this->taxDetailsItem->getPriceInclTax());
172172
}
173173

‎composer.json

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,23 @@
4545
"laminas/laminas-code": "~4.5.0",
4646
"laminas/laminas-db": "^2.13.4",
4747
"laminas/laminas-dependency-plugin": "^2.2.0",
48-
"laminas/laminas-di": "^3.3.0",
49-
"laminas/laminas-escaper": "~2.9.0",
48+
"laminas/laminas-di": "^3.4.0",
49+
"laminas/laminas-escaper": "~2.10.0",
5050
"laminas/laminas-eventmanager": "^3.4.0",
5151
"laminas/laminas-feed": "^2.15.0",
5252
"laminas/laminas-http": "^2.15.0",
5353
"laminas/laminas-json": "^3.3.0",
54-
"laminas/laminas-mail": "^2.15.1",
54+
"laminas/laminas-mail": "^2.16.0",
5555
"laminas/laminas-mime": "^2.9.1",
5656
"laminas/laminas-modulemanager": "^2.11.0",
57-
"laminas/laminas-mvc": "^3.3.0",
58-
"laminas/laminas-server": "^2.11.0",
57+
"laminas/laminas-mvc": "^3.3.3",
58+
"laminas/laminas-server": "^2.11.1",
5959
"laminas/laminas-servicemanager": "^3.10.0",
60-
"laminas/laminas-session": "^2.12.0",
60+
"laminas/laminas-session": "^2.12.1",
6161
"laminas/laminas-soap": "^2.10.0",
62-
"laminas/laminas-stdlib": "^3.6.0",
63-
"laminas/laminas-text": "^2.9.0",
62+
"laminas/laminas-stdlib": "^3.7.1",
6463
"laminas/laminas-uri": "^2.9.1",
65-
"laminas/laminas-validator": "^2.15.0",
66-
"laminas/laminas-view": "~2.14.1",
64+
"laminas/laminas-validator": "^2.17.0",
6765
"league/flysystem": "~2.3.2",
6866
"league/flysystem-aws-s3-v3": "^2.0",
6967
"magento/composer": "1.8.x-dev as 1.8.0",
@@ -72,30 +70,30 @@
7270
"magento/zendframework1": "1.14.6-beta2 as 1.14.6",
7371
"monolog/monolog": "^2.3",
7472
"pelago/emogrifier": "^6.0.0",
75-
"php-amqplib/php-amqplib": "~3.1.0",
76-
"phpseclib/mcrypt_compat": "~2.0.0",
77-
"phpseclib/phpseclib": "~3.0.9",
73+
"php-amqplib/php-amqplib": "~3.2.0",
74+
"phpseclib/mcrypt_compat": "~2.0.2",
75+
"phpseclib/phpseclib": "~3.0.13",
7876
"ramsey/uuid": "~4.2.0",
7977
"symfony/console": "~4.4.0",
8078
"symfony/event-dispatcher": "~4.4.0",
8179
"symfony/process": "~4.4.0",
8280
"tedivm/jshrink": "~1.4.0",
8381
"tubalmartin/cssmin": "4.1.1",
8482
"web-token/jwt-framework": "^v2.2.7",
85-
"webonyx/graphql-php": "~14.11.3",
83+
"webonyx/graphql-php": "~14.11.5",
8684
"wikimedia/less.php": "^3.0.0"
8785
},
8886
"require-dev": {
8987
"allure-framework/allure-phpunit": "~1.5.0",
90-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
88+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
9189
"friendsofphp/php-cs-fixer": "~3.4.0",
9290
"lusitanian/oauth": "~0.8.10",
9391
"magento/magento-coding-standard": "*",
9492
"magento/magento2-functional-testing-framework": "^3.7",
9593
"pdepend/pdepend": "~2.10.0",
9694
"phpmd/phpmd": "^2.9.1",
97-
"phpstan/phpstan": "~1.2.0",
98-
"phpunit/phpunit": "~9.5.0",
95+
"phpstan/phpstan": "~1.4.9",
96+
"phpunit/phpunit": "~9.5.18",
9997
"sebastian/phpcpd": "^6.0.3",
10098
"squizlabs/php_codesniffer": "~3.6.0",
10199
"symfony/finder": "^5.2"

0 commit comments

Comments
 (0)