Skip to content

Commit af60567

Browse files
author
Robert He
committed
MAGETWO-69004: 2.2 Upgrade Testing - composer conflict
- remove duplicate requires in Magento_Framework
1 parent 042f928 commit af60567

File tree

2 files changed

+2
-5
lines changed
  • dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A
  • lib/internal/Magento/Framework

2 files changed

+2
-5
lines changed

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: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
"ext-gd": "*",
2020
"ext-openssl": "*",
2121
"lib-libxml": "*",
22-
"ext-xsl": "*",
23-
"symfony/process": "~2.1",
24-
"zendframework/zend-stdlib": "~2.5.0",
25-
"zendframework/zend-http": "~2.5.0"
22+
"ext-xsl": "*"
2623
},
2724
"suggest": {
2825
"ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"

0 commit comments

Comments
 (0)