Skip to content

Commit e513ab5

Browse files
authored
Merge pull request #1108 from magento-okapis/MAGETWO-69004-upgrade_captcha-2.2
- MAGETWO-69004: 2.2 Upgrade Testing - composer conflict
2 parents 51930d9 + 3ffd205 commit e513ab5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/code/Magento/Captcha/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"magento/module-checkout": "100.2.*",
99
"magento/module-backend": "100.2.*",
1010
"magento/framework": "100.2.*",
11-
"zendframework/zend-db": "~2.5.0",
12-
"zendframework/zend-captcha": "~2.5.0",
13-
"zendframework/zend-session": "~2.5.0"
11+
"zendframework/zend-db": "^2.8.2",
12+
"zendframework/zend-captcha": "^2.7.1",
13+
"zendframework/zend-session": "^2.7.3"
1414
},
1515
"type": "magento2-module",
1616
"version": "100.2.0-dev",

dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "magento/module-a",
33
"require": {
4-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.1.0",
4+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
55
"magento/framework": "0.1",
66
"magento/module-b": "0.1"
77
},

lib/internal/Magento/Framework/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"lib-libxml": "*",
2222
"ext-xsl": "*",
2323
"symfony/process": "~2.1",
24-
"zendframework/zend-stdlib": "~2.5.0",
25-
"zendframework/zend-http": "~2.5.0"
24+
"zendframework/zend-stdlib": "^2.7.7",
25+
"zendframework/zend-http": "^2.6.0"
2626
},
2727
"suggest": {
2828
"ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"

0 commit comments

Comments
 (0)