Skip to content

Commit 41631d5

Browse files
authored
Merge pull request #7531 from magento-atwix-pyrrans/delivery-bunch-w13
[Pyrrans] Delivery bunch 2022`W13
2 parents 44f6a52 + 08b24a8 commit 41631d5

File tree

7 files changed

+296
-267
lines changed

7 files changed

+296
-267
lines changed

app/code/Magento/AwsS3/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
"require": {
88
"php": "~7.4.0||~8.1.0",
99
"magento/framework": "*",
10-
"magento/module-remote-storage": "*",
11-
"league/flysystem": "^2.0",
12-
"league/flysystem-aws-s3-v3": "^2.0"
10+
"magento/module-remote-storage": "*"
1311
},
1412
"type": "magento2-module",
1513
"license": [

app/code/Magento/RemoteStorage/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"description": "N/A",
44
"require": {
55
"php": "~7.4.0||~8.1.0",
6-
"magento/framework": "*"
6+
"magento/framework": "*",
7+
"league/flysystem": "~2.4.3",
8+
"league/flysystem-aws-s3-v3": "^2.4.3"
79
},
810
"suggest": {
911
"magento/module-backend": "*",

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
"lib-libxml": "*",
3737
"colinmollenhour/cache-backend-file": "~1.4.1",
3838
"colinmollenhour/cache-backend-redis": "1.14.2",
39-
"colinmollenhour/credis": "1.12.1",
39+
"colinmollenhour/credis": "1.12.2",
4040
"colinmollenhour/php-redis-session-abstract": "~1.4.5",
4141
"composer/composer": "^1.9 || ^2.0",
4242
"elasticsearch/elasticsearch": "~7.17.0",
43-
"guzzlehttp/guzzle": "^7.3.0",
43+
"guzzlehttp/guzzle": "^7.4.2",
4444
"laminas/laminas-captcha": "^2.11",
4545
"laminas/laminas-code": "~4.5.0",
4646
"laminas/laminas-db": "^2.13.4",
@@ -62,8 +62,8 @@
6262
"laminas/laminas-stdlib": "^3.7.1",
6363
"laminas/laminas-uri": "^2.9.1",
6464
"laminas/laminas-validator": "^2.17.0",
65-
"league/flysystem": "~2.3.2",
66-
"league/flysystem-aws-s3-v3": "^2.0",
65+
"league/flysystem": "~2.4.3",
66+
"league/flysystem-aws-s3-v3": "^2.4.3",
6767
"magento/composer": "1.8.x-dev as 1.8.0",
6868
"magento/composer-dependency-version-audit-plugin": "~0.1",
6969
"magento/magento-composer-installer": "0.3.*@beta",
@@ -93,7 +93,7 @@
9393
"pdepend/pdepend": "~2.10.0",
9494
"phpmd/phpmd": "^2.9.1",
9595
"phpstan/phpstan": "~1.4.9",
96-
"phpunit/phpunit": "~9.5.18",
96+
"phpunit/phpunit": "~9.5.20",
9797
"sebastian/phpcpd": "^6.0.3",
9898
"squizlabs/php_codesniffer": "~3.6.0",
9999
"symfony/finder": "^5.2"

0 commit comments

Comments
 (0)