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

Commit cfd3b34

Browse files
committed
Merge remote-tracking branch 'engcom/ENGCOM-910-magento-engcom-php-7.2-support-90' into MAGETWO-89235-credis-zendview
2 parents d537e5b + 1155b29 commit cfd3b34

File tree

3 files changed

+199
-43
lines changed

3 files changed

+199
-43
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"braintree/braintree_php": "3.28.0",
3939
"colinmollenhour/cache-backend-file": "~1.4.1",
4040
"colinmollenhour/cache-backend-redis": "1.10.4",
41-
"colinmollenhour/credis": "1.8.2",
41+
"colinmollenhour/credis": "1.9.1",
4242
"colinmollenhour/php-redis-session-abstract": "~1.3.8",
4343
"composer/composer": "^1.6",
4444
"elasticsearch/elasticsearch": "~2.0|~5.1",
@@ -74,7 +74,7 @@
7474
"zendframework/zend-log": "^2.9.1",
7575
"zendframework/zend-mail": "^2.9.0",
7676
"zendframework/zend-modulemanager": "^2.7",
77-
"zendframework/zend-mvc": "~2.6.3",
77+
"zendframework/zend-mvc": "~2.7.12",
7878
"zendframework/zend-serializer": "^2.7.2",
7979
"zendframework/zend-server": "^2.6.1",
8080
"zendframework/zend-servicemanager": "^2.7.8",
@@ -84,7 +84,7 @@
8484
"zendframework/zend-text": "^2.6.0",
8585
"zendframework/zend-uri": "^2.5.1",
8686
"zendframework/zend-validator": "^2.6.0",
87-
"zendframework/zend-view": "^2.8.1"
87+
"zendframework/zend-view": "~2.10.0"
8888
},
8989
"require-dev": {
9090
"friendsofphp/php-cs-fixer": "~2.10.0",

composer.lock

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

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"zendframework/zend-code": "^3.1.0",
3434
"zendframework/zend-crypt": "^2.6.0",
3535
"zendframework/zend-http": "^2.6.0",
36-
"zendframework/zend-mvc": "~2.6.3",
36+
"zendframework/zend-mvc": "~2.7.0",
3737
"zendframework/zend-stdlib": "^2.7.7",
3838
"zendframework/zend-uri": "^2.5.1",
3939
"zendframework/zend-validator": "^2.6.0"

0 commit comments

Comments
 (0)