Skip to content

Commit c4d9976

Browse files
committed
Merge branch 'platform-health' of https://github.com/anzin/magento2 into improvement/m2-32866-update-php-amqplib-to-latest-version
� Conflicts: � composer.lock
2 parents 90c6cdd + c9f8af4 commit c4d9976

File tree

6 files changed

+2030
-563
lines changed

6 files changed

+2030
-563
lines changed

app/code/Magento/Theme/view/frontend/web/css/tabs.css

Lines changed: 0 additions & 49 deletions
This file was deleted.

app/code/Magento/Theme/view/frontend/web/css/validate.css

Lines changed: 0 additions & 20 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"ext-pdo_mysql": "*",
2626
"ext-simplexml": "*",
2727
"ext-soap": "*",
28+
"ext-sodium": "*",
2829
"ext-xsl": "*",
2930
"ext-zip": "*",
3031
"lib-libxml": "*",
@@ -63,7 +64,6 @@
6364
"magento/magento-composer-installer": ">=0.1.11",
6465
"magento/zendframework1": "~1.14.2",
6566
"monolog/monolog": "^1.17",
66-
"paragonie/sodium_compat": "^1.6",
6767
"pelago/emogrifier": "^5.0.0",
6868
"php-amqplib/php-amqplib": "~3.0.0",
6969
"phpseclib/mcrypt_compat": "1.0.8",
@@ -85,7 +85,7 @@
8585
"lusitanian/oauth": "~0.8.10",
8686
"magento/magento-coding-standard": "*",
8787
"magento/magento2-functional-testing-framework": "^3.0",
88-
"pdepend/pdepend": "~2.7.1",
88+
"pdepend/pdepend": "~2.10.0",
8989
"phpcompatibility/php-compatibility": "^9.3",
9090
"phpmd/phpmd": "^2.9.1",
9191
"phpstan/phpstan": "^0.12.77",

0 commit comments

Comments
 (0)