Skip to content

Commit f0c22c9

Browse files
committed
Merge remote-tracking branch 'magento2/platform-health' into platform-health
2 parents fc915a2 + 9309f4c commit f0c22c9

File tree

6 files changed

+59
-52
lines changed

6 files changed

+59
-52
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.11.0"
15+
"elasticsearch/elasticsearch": "~7.14.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.11.0"
11+
"elasticsearch/elasticsearch": "~7.14.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.3.0||~7.4.0",
66
"magento/framework": "*",
77
"magento/module-elasticsearch": "*",
8-
"elasticsearch/elasticsearch": "~7.11.0",
8+
"elasticsearch/elasticsearch": "~7.14.0",
99
"magento/module-advanced-search": "*",
1010
"magento/module-catalog-search": "*"
1111
},

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
"colinmollenhour/credis": "1.12.1",
3535
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3636
"composer/composer": "^1.9 || ^2.0",
37-
"elasticsearch/elasticsearch": "~7.13.1",
37+
"elasticsearch/elasticsearch": "~7.14.0",
3838
"guzzlehttp/guzzle": "^6.3.3",
3939
"laminas/laminas-captcha": "^2.10",
4040
"laminas/laminas-code": "~4.4.2",
4141
"laminas/laminas-db": "^2.12.0",
4242
"laminas/laminas-dependency-plugin": "^2.1.0",
4343
"laminas/laminas-di": "^3.2.0",
44+
"laminas/laminas-escaper": "~2.8.0",
4445
"laminas/laminas-eventmanager": "^3.0.0",
4546
"laminas/laminas-feed": "^2.13.0",
4647
"laminas/laminas-http": "^2.6.0",
@@ -68,7 +69,7 @@
6869
"php-amqplib/php-amqplib": "~3.0.0",
6970
"phpseclib/mcrypt_compat": "1.0.8",
7071
"phpseclib/phpseclib": "2.0.*",
71-
"ramsey/uuid": "~4.1.0",
72+
"ramsey/uuid": "~4.2.0",
7273
"symfony/console": "~4.4.0",
7374
"symfony/event-dispatcher": "~4.4.0",
7475
"symfony/process": "~4.4.0",
@@ -91,7 +92,7 @@
9192
"phpstan/phpstan": "^0.12.77",
9293
"phpunit/phpunit": "~9.5.0",
9394
"sebastian/phpcpd": "^6.0.3",
94-
"squizlabs/php_codesniffer": "~3.5.4",
95+
"squizlabs/php_codesniffer": "~3.6.0",
9596
"symfony/finder": "^5.2"
9697
},
9798
"suggest": {

composer.lock

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

lib/internal/Magento/Framework/composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"composer/composer": "^1.9 || ^2.0",
2828
"guzzlehttp/guzzle": "^6.3.3",
2929
"laminas/laminas-code": "~4.4.2",
30+
"laminas/laminas-escaper": "~2.8.0",
3031
"laminas/laminas-http": "^2.6.0",
3132
"laminas/laminas-mail": "^2.9.0",
3233
"laminas/laminas-mime": "^2.8.0",
@@ -36,12 +37,12 @@
3637
"laminas/laminas-validator": "^2.6.0",
3738
"magento/zendframework1": "~1.14.2",
3839
"monolog/monolog": "^2.3",
39-
"ramsey/uuid": "~4.1.0",
40+
"ramsey/uuid": "~4.2.0",
4041
"symfony/console": "~4.4.0",
4142
"symfony/process": "~4.4.0",
4243
"tedivm/jshrink": "~1.4.0",
43-
"wikimedia/less.php": "^3.0.0",
44-
"web-token/jwt-framework": "^v2.2.7"
44+
"web-token/jwt-framework": "^v2.2.7",
45+
"wikimedia/less.php": "^3.0.0"
4546
},
4647
"archive": {
4748
"exclude": [

0 commit comments

Comments
 (0)