Skip to content

Commit 582344c

Browse files
committed
Merge remote-tracking branch 'trigger/imported-andrewbess-magento2ce-34737' into ph-delivery
2 parents c3faca1 + a201c36 commit 582344c

File tree

6 files changed

+423
-1038
lines changed

6 files changed

+423
-1038
lines changed

app/code/Magento/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-store": "*",
1313
"magento/module-catalog-inventory": "*",
1414
"magento/framework": "*",
15-
"elasticsearch/elasticsearch": "~7.14.0"
15+
"elasticsearch/elasticsearch": "~7.15.0"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-catalog-search": "*",
99
"magento/module-search": "*",
1010
"magento/module-elasticsearch": "*",
11-
"elasticsearch/elasticsearch": "~7.14.0"
11+
"elasticsearch/elasticsearch": "~7.15.0"
1212
},
1313
"suggest": {
1414
"magento/module-config": "*"

app/code/Magento/Elasticsearch7/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "~7.4.0||~8.0.0",
66
"magento/framework": "*",
77
"magento/module-elasticsearch": "*",
8-
"elasticsearch/elasticsearch": "~7.14.0",
8+
"elasticsearch/elasticsearch": "~7.15.0",
99
"magento/module-advanced-search": "*",
1010
"magento/module-catalog-search": "*"
1111
},

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"colinmollenhour/cache-backend-file": "~1.4.1",
3333
"colinmollenhour/cache-backend-redis": "1.14.2",
3434
"colinmollenhour/credis": "1.12.1",
35-
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
35+
"colinmollenhour/php-redis-session-abstract": "~1.4.5",
3636
"composer/composer": "^1.9 || ^2.0",
37-
"elasticsearch/elasticsearch": "~7.14.0",
37+
"elasticsearch/elasticsearch": "~7.15.0",
3838
"guzzlehttp/guzzle": "^7.3.0",
3939
"laminas/laminas-captcha": "^2.11",
4040
"laminas/laminas-code": "~4.4.3",
@@ -59,16 +59,16 @@
5959
"laminas/laminas-uri": "^2.9.1",
6060
"laminas/laminas-validator": "^2.15.0",
6161
"laminas/laminas-view": "~2.14.1",
62-
"league/flysystem": "^2.0",
62+
"league/flysystem": "~2.3.2",
6363
"league/flysystem-aws-s3-v3": "^2.0",
6464
"magento/composer": "1.8.x-dev as 1.8.0",
6565
"magento/composer-dependency-version-audit-plugin": "~0.1",
6666
"magento/magento-composer-installer": ">=0.1.11",
67-
"magento/zendframework1": "1.14.6-beta1 as 1.14.6",
67+
"magento/zendframework1": "dev-master as 1.14.6",
6868
"monolog/monolog": "^2.3",
6969
"pelago/emogrifier": "^6.0.0",
7070
"php-amqplib/php-amqplib": "~3.1.0",
71-
"phpseclib/mcrypt_compat": "2.0.0",
71+
"phpseclib/mcrypt_compat": "~2.0.0",
7272
"phpseclib/phpseclib": "~3.0.9",
7373
"ramsey/uuid": "~4.2.0",
7474
"symfony/console": "~4.4.0",
@@ -77,19 +77,19 @@
7777
"tedivm/jshrink": "~1.4.0",
7878
"tubalmartin/cssmin": "4.1.1",
7979
"web-token/jwt-framework": "^v2.2.7",
80-
"webonyx/graphql-php": "~14.9.0",
80+
"webonyx/graphql-php": "~14.11.3",
8181
"wikimedia/less.php": "^3.0.0"
8282
},
8383
"require-dev": {
84-
"allure-framework/allure-phpunit": "~1.4.0",
84+
"allure-framework/allure-phpunit": "~1.5.0",
8585
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
86-
"friendsofphp/php-cs-fixer": "~3.0.0",
86+
"friendsofphp/php-cs-fixer": "~3.3.0",
8787
"lusitanian/oauth": "~0.8.10",
8888
"magento/magento-coding-standard": "*",
8989
"magento/magento2-functional-testing-framework": "^3.7",
9090
"pdepend/pdepend": "~2.10.0",
9191
"phpmd/phpmd": "^2.9.1",
92-
"phpstan/phpstan": "~1.1.0",
92+
"phpstan/phpstan": "~1.2.0",
9393
"phpunit/phpunit": "~9.5.0",
9494
"sebastian/phpcpd": "^6.0.3",
9595
"squizlabs/php_codesniffer": "~3.6.0",

0 commit comments

Comments
 (0)