Merge branch 'feature/23' into develop, Close #23, Close #47

zendframework · Mar 14, 2016 · 2cd809d · 2cd809d
2 parents cd6c66b + e86adfe
commit 2cd809d
Show file tree

Hide file tree

Showing 9 changed files with 1,029 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ services:
 env:
   global:
     - TESTS_ZEND_CACHE_APC_ENABLED: true
+    - TESTS_ZEND_CACHE_APCU_ENABLED=true
     - TESTS_ZEND_CACHE_MEMCACHED_ENABLED: true
     - TESTS_ZEND_CACHE_MEMCACHED_HOST: "127.0.0.1"
     - TESTS_ZEND_CACHE_MEMCACHED_PORT: 11211
@@ -72,6 +73,7 @@ matrix:
         - INSTALL_XCACHE=true
     - php: 7
       env:
+        - EXECUTE_TEST_COVERALLS=true
         - PECL_INSTALL_APCU='apcu'
         - PECL_INSTALL_APCU_BC='apcu_bc-beta'
     - php: 7

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
+- [#23](https://github.com/zendframework/zend-cache/issues/23)
+  [#47](https://github.com/zendframework/zend-cache/issues/47)
+  Added an Apcu storage adapter as future replacement for Apc
 - [#63](https://github.com/zendframework/zend-cache/pull/63)
   Implemented ClearByNamespaceInterface in Stoage\Adapter\Redis
 

diff --git a/composer.json b/composer.json
@@ -27,7 +27,8 @@
     "suggest": {
         "zendframework/zend-serializer": "Zend\\Serializer component",
         "zendframework/zend-session": "Zend\\Session component",
-        "ext-apcu": "APCU, to use the APC storage adapter",
+        "ext-apc": "APC or compatible extension, to use the APC storage adapter",
+        "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter",
         "ext-dba": "DBA, to use the DBA storage adapter",
         "ext-memcache": "Memcache >= 2.0.0 to use the Memcache storage adapter",
         "ext-memcached": "Memcached >= 1.0.0 to use the Memcached storage adapter",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -35,6 +35,7 @@
              constants appropriate to the component you are migrating. -->
 
         <env name="TESTS_ZEND_CACHE_APC_ENABLED" value="false" />
+        <env name="TESTS_ZEND_CACHE_APCU_ENABLED" value="false" />
         <env name="TESTS_ZEND_CACHE_XCACHE_ENABLED" value="false" />
         <env name="TESTS_ZEND_CACHE_XCACHE_ADMIN_AUTH" value="false" />
         <env name="TESTS_ZEND_CACHE_XCACHE_ADMIN_USER" value="" />