Merge pull request #114 from magento-engcom/MAGETWO-89235-credis-zend…

…view 3rd party dependency
magento · Apr 4, 2018 · fa92ca4 · fa92ca4
2 parents 4d06c0d + 930d880
commit fa92ca4
Show file tree

Hide file tree

Showing 2 changed files with 160 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "braintree/braintree_php": "3.28.0",
         "colinmollenhour/cache-backend-file": "~1.4.1",
         "colinmollenhour/cache-backend-redis": "1.10.4",
-        "colinmollenhour/credis": "1.8.2",
+        "colinmollenhour/credis": "1.9.1",
         "colinmollenhour/php-redis-session-abstract": "~1.3.8",
         "composer/composer": "^1.6",
         "elasticsearch/elasticsearch": "~2.0|~5.1",
@@ -84,7 +84,7 @@
         "zendframework/zend-text": "^2.6.0",
         "zendframework/zend-uri": "^2.5.1",
         "zendframework/zend-validator": "^2.6.0",
-        "zendframework/zend-view": "^2.8.1"
+        "zendframework/zend-view": "~2.10.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.10.0",
@@ -305,4 +305,4 @@
         }
     },
     "prefer-stable": true
-}
+}
diff --git a/composer.lock b/composer.lock