Skip to content

Commit 3c57282

Browse files
author
Robert He
committed
MAGETWO-69004: 2.2 Upgrade Testing - composer conflict
- changing versions of dependencies to match
1 parent af60567 commit 3c57282

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

app/code/Magento/Captcha/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
"magento/module-customer": "100.2.*",
88
"magento/module-checkout": "100.2.*",
99
"magento/module-backend": "100.2.*",
10-
"magento/framework": "100.2.*"
10+
"magento/framework": "100.2.*",
11+
"zendframework/zend-db": "^2.8.2",
12+
"zendframework/zend-captcha": "^2.7.1",
13+
"zendframework/zend-session": "^2.7.3"
1114
},
1215
"type": "magento2-module",
1316
"version": "100.2.0-dev",

lib/internal/Magento/Framework/composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
"ext-gd": "*",
2020
"ext-openssl": "*",
2121
"lib-libxml": "*",
22-
"ext-xsl": "*"
22+
"ext-xsl": "*",
23+
"symfony/process": "~2.1",
24+
"zendframework/zend-stdlib": "^2.7.7",
25+
"zendframework/zend-http": "^2.6.0"
2326
},
2427
"suggest": {
2528
"ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"

0 commit comments

Comments
 (0)