Merge branch 'feature/46' into develop, Close #46, #54

zendframework · Jun 7, 2016 · 92d2cad · 92d2cad
2 parents 1a76834 + cf35782
commit 92d2cad
Show file tree

Hide file tree

Showing 28 changed files with 2,615 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
+- [#46](https://github.com/zendframework/zend-cache/issues/46)
+  Add wrapper for PSR-6
 - [#79](https://github.com/zendframework/zend-cache/issues/79)
   Add capability for the "lock-on-expire" feature (úsed by Zend Data Cache)
 

diff --git a/composer.json b/composer.json
@@ -16,11 +16,13 @@
         "php": "^5.6 || ^7.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0"
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "psr/cache": "^1.0"
     },
     "require-dev": {
         "zendframework/zend-serializer": "^2.6",
         "zendframework/zend-session": "^2.6.2",
+        "cache/integration-tests": "^0.10.0",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/phpunit": "^4.8",
         "phpbench/phpbench": "^0.10.0"