Skip to content

Commit e55418f

Browse files
authored
Merge pull request #34104 from andrewbess/php8-compatibility/update-composer-dependencies
The magento/zendframework1:dev-master composer dependency has been connected
2 parents 95f8d36 + c994b60 commit e55418f

File tree

4 files changed

+64
-57
lines changed

4 files changed

+64
-57
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"league/flysystem-aws-s3-v3": "^2.0",
6464
"magento/composer": "1.8.x-dev as 1.8.0",
6565
"magento/magento-composer-installer": ">=0.1.11",
66-
"magento/zendframework1": "~1.14.2",
66+
"magento/zendframework1": "dev-master as 1.14.6",
6767
"monolog/monolog": "^2.3",
6868
"pelago/emogrifier": "^5.0.0",
6969
"php-amqplib/php-amqplib": "~3.0.0",
@@ -80,7 +80,7 @@
8080
"wikimedia/less.php": "^3.0.0"
8181
},
8282
"require-dev": {
83-
"allure-framework/allure-phpunit": "~1.4",
83+
"allure-framework/allure-phpunit": "~1.4.0",
8484
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
8585
"friendsofphp/php-cs-fixer": "~3.0.0",
8686
"lusitanian/oauth": "~0.8.10",

composer.lock

Lines changed: 55 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/internal/Magento/Framework/Test/Unit/EscaperTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ public function testEscapeHtmlAttributeWithInlineTranslateEnabled(string $input,
201201
$stateMock
202202
);
203203

204-
205204
$actual = $this->escaper->escapeHtmlAttr($input);
206205
$this->assertEquals($output, $actual);
207206
}
@@ -387,11 +386,11 @@ public function escapeCssDataProvider(): array
387386
{
388387
return [
389388
[
390-
'data' => 1,
389+
'data' => 1,
391390
'expected' => '1',
392391
],
393392
[
394-
'data' => '*%string{foo}%::',
393+
'data' => '*%string{foo}%::',
395394
'expected' => '\2A \25 string\7B foo\7D \25 \3A \3A ',
396395
]
397396
];
@@ -418,19 +417,19 @@ public function encodeUrlParamDataProvider(): array
418417
{
419418
return [
420419
[
421-
'data' => "a3==",
420+
'data' => "a3==",
422421
'expected' => "a3%3D%3D",
423422
],
424423
[
425-
'data' => "example string",
424+
'data' => "example string",
426425
'expected' => "example%20string",
427426
],
428427
[
429-
'data' => 1,
428+
'data' => 1,
430429
'expected' => "1",
431430
],
432431
[
433-
'data' => null,
432+
'data' => null,
434433
'expected' => "",
435434
]
436435
];

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"laminas/laminas-stdlib": "^3.2.1",
3535
"laminas/laminas-uri": "^2.5.1",
3636
"laminas/laminas-validator": "^2.6.0",
37-
"magento/zendframework1": "~1.14.2",
37+
"magento/zendframework1": "dev-master as 1.14.6",
3838
"monolog/monolog": "^2.3",
3939
"ramsey/uuid": "~4.2.0",
4040
"symfony/console": "~4.4.0",

0 commit comments

Comments
 (0)