Merge branch '2.4-develop' into poison-pill

magento · Dec 12, 2022 · ec2a0cc · ec2a0cc
2 parents 19ce364 + 84e7dfa
commit ec2a0cc
Show file tree

Hide file tree

Showing 3 changed files with 340 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -68,7 +68,9 @@
         "magento/composer": "^1.9.0-beta1",
         "magento/composer-dependency-version-audit-plugin": "^0.1",
         "magento/magento-composer-installer": ">=0.4.0-beta1",
-        "magento/zendframework1": "^1.15",
+        "magento/zend-cache": "^1.16",
+        "magento/zend-db": "^1.16",
+        "magento/zend-pdf": "^1.16",
         "monolog/monolog": "^2.7",
         "opensearch-project/opensearch-php": "^1.0 || ^2.0",
         "pelago/emogrifier": "^6.0.0",
@@ -77,9 +79,9 @@
         "phpseclib/phpseclib": "^3.0",
         "ramsey/uuid": "^4.2",
         "symfony/console": "^5.4",
-        "symfony/string": "^5.4",
         "symfony/intl": "^5.4",
         "symfony/process": "^5.4",
+        "symfony/string": "^5.4",
         "tedivm/jshrink": "^1.4",
         "tubalmartin/cssmin": "^4.1",
         "web-token/jwt-framework": "^v2.2.7",