Merge branch 'hotfix/123' into develop, Forward port #123

Conflicts: doc/book/storage/adapter.md src/Storage/Adapter/AbstractZendServer.php src/Storage/Capabilities.php test/Storage/Adapter/CommonAdapterTest.php
zendframework · Dec 16, 2016 · 064788a · 064788a
2 parents e4803c0 + d653993
commit 064788a
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Deprecated
 
-- Nothing.
+- [#123](https://github.com/zendframework/zend-cache/pull/123)
+  Deprecate capability "expiredRead".
+  It's basically providing the same information as staticTtl but from a wrong PoV
 
 ### Removed
 

diff --git a/doc/book/storage/adapter.md b/doc/book/storage/adapter.md
@@ -550,7 +550,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | value of `apc.use_request_time` from `php.ini`
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `maxKeyLength` | 5182
 `namespaceIsPrefix` | `true`
@@ -632,7 +631,6 @@ Capability | Value
 `staticTtl` | `false`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `true`
 `lockOnExpire` | 0
 `maxKeyLength` | 251
 `namespaceIsPrefix` | `true`
@@ -678,7 +676,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `maxKeyLength` | 255
 `namespaceIsPrefix` | `true`
@@ -712,7 +709,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `maxKeyLength` | 255
 `namespaceIsPrefix` | `true`
@@ -763,7 +759,6 @@ Capability | Value
 `staticTtl` | `false`
 `ttlPrecision` | 0.05
 `useRequestTime` | `false`
-`expiredRead` | `true`
 `lockOnExpire` | 0
 `maxKeyLength` | 0
 `namespaceIsPrefix` | `false`
@@ -801,15 +796,15 @@ This adapter implements the following interfaces:
 
 ### Capabilities
 
-Capability  Value
-`supportedDatatypes` | `null`, `boolean`, `integer`, `double`, `string`, `array`
+Capability | Value
+---------- | -----
+`supportedDatatypes` | `string`, `null`, `boolean`, `integer`, `double`, `array`
 `supportedMetadata` | _id
 `minTtl` | 0
 `maxTtl` | 0
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `maxKeyLength` | 255
 `namespaceIsPrefix` | `true`
@@ -855,7 +850,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `apc.use_request_time` `php.ini` value.
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `namespaceIsPrefix` | `true`
 `namespaceSeparator` | Option value of `namespace_separator`
@@ -892,7 +886,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `true`
-`expiredRead` | `false`
 `lockOnExpire` | 0
 `maxKeyLength` | 5182
 `namespaceIsPrefix` | `true`
@@ -932,7 +925,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `false`
 `lockOnExpire` | if 'zend_datacache.lock_on_expire' is enabled 120 else 0
 `namespaceIsPrefix` | `true`
 `namespaceSeparator` | `::`
@@ -961,7 +953,6 @@ Capability | Value
 `staticTtl` | `true`
 `ttlPrecision` | 1
 `useRequestTime` | `false`
-`expiredRead` | `false`
 `lockOnExpire` | if 'zend_datacache.lock_on_expire' is enabled 120 else 0
 `namespaceIsPrefix` | `true`
 `namespaceSeparator` | `::`

diff --git a/doc/book/storage/capabilities.md b/doc/book/storage/capabilities.md
@@ -170,6 +170,8 @@ class Capabilities
      * Get if expired items are readable
      *
      * @return bool
+     * @deprecated This capability has been deprecated and will be removed in the future.
+     *             Please use getStaticTtl() instead
      */
     public function getExpiredRead();
 
@@ -179,6 +181,8 @@ class Capabilities
      * @param  stdClass $marker
      * @param  bool $flag
      * @return Capabilities Fluent interface
+     * @deprecated This capability has been deprecated and will be removed in the future.
+     *             Please use setStaticTtl() instead
      */
     public function setExpiredRead(stdClass $marker, $flag);
 

diff --git a/src/Storage/Adapter/AbstractZendServer.php b/src/Storage/Adapter/AbstractZendServer.php
@@ -222,7 +222,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => false,
-                    'expiredRead'        => false,
                     'lockOnExpire'       => ini_get('zend_datacache.lock_on_expire') ? 120 : 0,
                     'maxKeyLength'       => 0,
                     'namespaceIsPrefix'  => true,

diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
@@ -687,7 +687,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => (bool) ini_get('apc.use_request_time'),
-                    'expiredRead'        => false,
                     'maxKeyLength'       => 5182,
                     'namespaceIsPrefix'  => true,
                     'namespaceSeparator' => $this->getOptions()->getNamespaceSeparator(),

diff --git a/src/Storage/Adapter/Apcu.php b/src/Storage/Adapter/Apcu.php
@@ -692,7 +692,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => (bool) ini_get('apc.use_request_time'),
-                    'expiredRead'        => false,
                     'maxKeyLength'       => 5182,
                     'namespaceIsPrefix'  => true,
                     'namespaceSeparator' => $this->getOptions()->getNamespaceSeparator(),

diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
@@ -1233,7 +1233,6 @@ protected function internalGetCapabilities()
                     'maxTtl'             => 0,
                     'staticTtl'          => false,
                     'ttlPrecision'       => 1,
-                    'expiredRead'        => true,
                     'maxKeyLength'       => 251, // 255 - strlen(.dat | .tag)
                     'namespaceIsPrefix'  => true,
                     'namespaceSeparator' => $options->getNamespaceSeparator(),

diff --git a/src/Storage/Adapter/Memcache.php b/src/Storage/Adapter/Memcache.php
@@ -538,7 +538,6 @@ protected function internalGetCapabilities()
                 'staticTtl'          => true,
                 'ttlPrecision'       => 1,
                 'useRequestTime'     => false,
-                'expiredRead'        => false,
                 'maxKeyLength'       => 255,
                 'namespaceIsPrefix'  => true,
             ]

diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
@@ -592,7 +592,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => false,
-                    'expiredRead'        => false,
                     'maxKeyLength'       => 255,
                     'namespaceIsPrefix'  => true,
                 ]

diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
@@ -714,7 +714,6 @@ protected function internalGetCapabilities()
                     'maxTtl'             => PHP_INT_MAX,
                     'staticTtl'          => false,
                     'ttlPrecision'       => 0.05,
-                    'expiredRead'        => true,
                     'maxKeyLength'       => 0,
                     'namespaceIsPrefix'  => false,
                     'namespaceSeparator' => '',

diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
@@ -532,7 +532,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => false,
-                    'expiredRead'        => false,
                     'maxKeyLength'       => 255,
                     'namespaceIsPrefix'  => true,
                 ]

diff --git a/src/Storage/Adapter/WinCache.php b/src/Storage/Adapter/WinCache.php
@@ -486,7 +486,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => false,
-                    'expiredRead'        => false,
                     'namespaceIsPrefix'  => true,
                     'namespaceSeparator' => $this->getOptions()->getNamespaceSeparator(),
                 ]

diff --git a/src/Storage/Adapter/XCache.php b/src/Storage/Adapter/XCache.php
@@ -454,7 +454,6 @@ protected function internalGetCapabilities()
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,
                     'useRequestTime'     => true,
-                    'expiredRead'        => false,
                     'maxKeyLength'       => 5182,
                     'namespaceIsPrefix'  => true,
                     'namespaceSeparator' => $this->getOptions()->getNamespaceSeparator(),

diff --git a/src/Storage/Capabilities.php b/src/Storage/Capabilities.php
@@ -37,16 +37,6 @@ class Capabilities
      */
     protected $baseCapabilities;
 
-    /**
-     * Expire read
-     *
-     * If it's NULL the capability isn't set and the getter
-     * returns the base capability or the default value.
-     *
-     * @var null|bool
-     */
-    protected $expiredRead;
-
     /**
      * "lock-on-expire" support in seconds.
      *
@@ -417,10 +407,16 @@ public function setUseRequestTime(stdClass $marker, $flag)
      * Get if expired items are readable
      *
      * @return bool
+     * @deprecated This capability has been deprecated and will be removed in the future.
+     *             Please use getStaticTtl() instead
      */
     public function getExpiredRead()
     {
-        return $this->getCapability('expiredRead', false);
+        trigger_error(
+            'This capability has been deprecated and will be removed in the future. Please use static_ttl instead',
+            E_USER_DEPRECATED
+        );
+        return ! $this->getCapability('staticTtl', true);
     }
 
     /**
@@ -429,10 +425,16 @@ public function getExpiredRead()
      * @param  stdClass $marker
      * @param  bool $flag
      * @return Capabilities Fluent interface
+     * @deprecated This capability has been deprecated and will be removed in the future.
+     *             Please use setStaticTtl() instead
      */
     public function setExpiredRead(stdClass $marker, $flag)
     {
-        return $this->setCapability($marker, 'expiredRead', (bool) $flag);
+        trigger_error(
+            'This capability has been deprecated and will be removed in the future. Please use static_ttl instead',
+            E_USER_DEPRECATED
+        );
+        return $this->setCapability($marker, 'staticTtl', (bool) $flag);
     }
 
     /**

diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.php
@@ -216,7 +216,6 @@ public function testTtlCapabilities()
         $this->assertInternalType('numeric', $capabilities->getTtlPrecision());
         $this->assertGreaterThan(0, $capabilities->getTtlPrecision());
 
-        $this->assertInternalType('bool', $capabilities->getExpiredRead());
         $this->assertInternalType('int', $capabilities->getLockOnExpire());
     }
 
@@ -647,7 +646,7 @@ public function testSetAndGetExpiredItems()
         $rs = $this->_storage->getItems(array_keys($items));
         ksort($rs); // make comparable
 
-        if ($capabilities->getExpiredRead()) {
+        if (! $capabilities->getStaticTtl()) {
             // if item expiration will be done on read there is no difference
             // between the previos set items in TTL.
             // -> all items will be expired