Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 3d8cb58

Browse files
author
Joan He
authored
Merge pull request #117 from magento-engcom/MAGETWO-90119
MAGETWO-90119: Zendframework Dependency Version Conflict on update-co…
2 parents c653472 + a6c00cf commit 3d8cb58

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

lib/internal/Magento/Framework/composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
"config": {
1111
"sort-packages": true
1212
},
13+
"repositories": {
14+
"zf1": {
15+
"type": "vcs",
16+
"url": "https://github.com/magento-engcom/zf1-php-7.2-support.git"
17+
}
18+
},
1319
"require": {
1420
"php": "~7.1.3||~7.2.0",
1521
"ext-curl": "*",
@@ -24,7 +30,7 @@
2430
"lib-libxml": "*",
2531
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
2632
"composer/composer": "^1.6",
27-
"magento/zendframework1": "~1.13.0",
33+
"magento/zendframework1": "dev-master",
2834
"monolog/monolog": "^1.17",
2935
"oyejorge/less.php": "~1.7.0",
3036
"symfony/console": "~4.0.0",

0 commit comments

Comments
 (0)