Skip to content

Commit 0dcc9d6

Browse files
committed
Merge remote-tracking branch 'origin/AC-10874' into Hammer_PlatForm_Health_247Beta3_03Jan23
2 parents 00a616e + f5dec44 commit 0dcc9d6

File tree

3 files changed

+76
-105
lines changed

3 files changed

+76
-105
lines changed

app/code/Magento/Captcha/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/module-store": "*",
1515
"magento/module-authorization": "*",
1616
"laminas/laminas-captcha": "^2.12",
17-
"laminas/laminas-db": "^2.13.4"
17+
"laminas/laminas-db": "2.19.x-dev"
1818
},
1919
"type": "magento2-module",
2020
"license": [

composer.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
"preferred-install": "dist",
1717
"sort-packages": true
1818
},
19-
"repositories": [
20-
{
21-
"type": "vcs",
22-
"url": "git@github.com:magento/magento-zf-db.git"
23-
}
24-
],
2519
"require": {
2620
"php": "~8.1.0||~8.2.0||~8.3.0",
2721
"ext-bcmath": "*",
@@ -53,7 +47,7 @@
5347
"laminas/laminas-code": "^4.13",
5448
"laminas/laminas-di": "^3.13",
5549
"laminas/laminas-file": "^2.13",
56-
"magento/magento-zf-db": "2.19.x-dev",
50+
"laminas/laminas-db": "^2.19.x-dev",
5751
"laminas/laminas-oauth": "^2.6",
5852
"laminas/laminas-escaper": "^2.13",
5953
"laminas/laminas-eventmanager": "^3.11",

composer.lock

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

0 commit comments

Comments
 (0)