Skip to content

Commit

Permalink
Merge pull request #7531 from magento-atwix-pyrrans/delivery-bunch-w13
Browse files Browse the repository at this point in the history
[Pyrrans] Delivery bunch 2022`W13
  • Loading branch information
Andrii Beziazychnyi authored Apr 8, 2022
2 parents 44f6a52 + 08b24a8 commit 41631d5
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 267 deletions.
4 changes: 1 addition & 3 deletions app/code/Magento/AwsS3/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"require": {
"php": "~7.4.0||~8.1.0",
"magento/framework": "*",
"magento/module-remote-storage": "*",
"league/flysystem": "^2.0",
"league/flysystem-aws-s3-v3": "^2.0"
"magento/module-remote-storage": "*"
},
"type": "magento2-module",
"license": [
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/RemoteStorage/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"description": "N/A",
"require": {
"php": "~7.4.0||~8.1.0",
"magento/framework": "*"
"magento/framework": "*",
"league/flysystem": "~2.4.3",
"league/flysystem-aws-s3-v3": "^2.4.3"
},
"suggest": {
"magento/module-backend": "*",
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"lib-libxml": "*",
"colinmollenhour/cache-backend-file": "~1.4.1",
"colinmollenhour/cache-backend-redis": "1.14.2",
"colinmollenhour/credis": "1.12.1",
"colinmollenhour/credis": "1.12.2",
"colinmollenhour/php-redis-session-abstract": "~1.4.5",
"composer/composer": "^1.9 || ^2.0",
"elasticsearch/elasticsearch": "~7.17.0",
"guzzlehttp/guzzle": "^7.3.0",
"guzzlehttp/guzzle": "^7.4.2",
"laminas/laminas-captcha": "^2.11",
"laminas/laminas-code": "~4.5.0",
"laminas/laminas-db": "^2.13.4",
Expand All @@ -62,8 +62,8 @@
"laminas/laminas-stdlib": "^3.7.1",
"laminas/laminas-uri": "^2.9.1",
"laminas/laminas-validator": "^2.17.0",
"league/flysystem": "~2.3.2",
"league/flysystem-aws-s3-v3": "^2.0",
"league/flysystem": "~2.4.3",
"league/flysystem-aws-s3-v3": "^2.4.3",
"magento/composer": "1.8.x-dev as 1.8.0",
"magento/composer-dependency-version-audit-plugin": "~0.1",
"magento/magento-composer-installer": "0.3.*@beta",
Expand Down Expand Up @@ -93,7 +93,7 @@
"pdepend/pdepend": "~2.10.0",
"phpmd/phpmd": "^2.9.1",
"phpstan/phpstan": "~1.4.9",
"phpunit/phpunit": "~9.5.18",
"phpunit/phpunit": "~9.5.20",
"sebastian/phpcpd": "^6.0.3",
"squizlabs/php_codesniffer": "~3.6.0",
"symfony/finder": "^5.2"
Expand Down
Loading

0 comments on commit 41631d5

Please sign in to comment.