Skip to content

Commit 1afe9b0

Browse files
committed
Merge remote-tracking branch 'origin/php8-develop' into 31345-update-laminas-code
2 parents 8063e14 + ca16be7 commit 1afe9b0

File tree

3 files changed

+74
-69
lines changed

3 files changed

+74
-69
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3535
"composer/composer": "^1.9 || ^2.0",
3636
"magento/magento-composer-installer": ">=0.1.11",
37-
"elasticsearch/elasticsearch": "~7.7.0",
37+
"elasticsearch/elasticsearch": "~7.11.0",
3838
"guzzlehttp/guzzle": "^6.3.3",
3939
"laminas/laminas-captcha": "^2.7.1",
4040
"laminas/laminas-code": "^3.5.1",
4141
"laminas/laminas-console": "^2.6.0",
42-
"laminas/laminas-crypt": "^2.6.0",
42+
"laminas/laminas-crypt": "^3.4.0",
4343
"laminas/laminas-db": "^2.8.2",
4444
"laminas/laminas-dependency-plugin": "^2.1.0",
4545
"laminas/laminas-di": "^2.6.1",
@@ -48,7 +48,7 @@
4848
"laminas/laminas-form": "^2.10.0",
4949
"laminas/laminas-http": "^2.6.0",
5050
"laminas/laminas-i18n": "^2.7.3",
51-
"laminas/laminas-json": "^2.6.1",
51+
"laminas/laminas-json": "^3.2.0",
5252
"laminas/laminas-log": "^2.9.1",
5353
"laminas/laminas-mail": "^2.9.0",
5454
"laminas/laminas-mime": "^2.5.0",

composer.lock

Lines changed: 70 additions & 65 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"composer/composer": "^1.9 || ^2.0",
2727
"guzzlehttp/guzzle": "^6.3.3",
2828
"laminas/laminas-code": "^3.5.1",
29-
"laminas/laminas-crypt": "^2.6.0",
29+
"laminas/laminas-crypt": "^3.4.0",
3030
"laminas/laminas-http": "^2.6.0",
3131
"laminas/laminas-mail": "^2.9.0",
3232
"laminas/laminas-mime": "^2.5.0",

0 commit comments

Comments
 (0)