Merge branch 'feature/150' into develop

Close #150
zendframework · Apr 18, 2018 · c62cbd9 · c62cbd9
2 parents 4a835d4 + a78984b
commit c62cbd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#150](https://github.com/zendframework/zend-cache/pull/150) fixes an issue with how CAS tokens are handled when using the memcached adapter.
+
 - [#61](https://github.com/zendframework/zend-cache/pull/61)
   Zend Data Cache: minTtl => 1
 

diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
@@ -204,7 +204,13 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         $internalKey = $this->namespacePrefix . $normalizedKey;
 
         if (func_num_args() > 2) {
-            $result = $memc->get($internalKey, null, $casToken);
+            if (defined('Memcached::GET_EXTENDED')) {
+                $output = $memc->get($internalKey, null, \Memcached::GET_EXTENDED);
+                $casToken = $output['cas'];
+                $result = $output['value'];
+            } else {
+                $result = $memc->get($internalKey, null, $casToken);
+            }
         } else {
             $result = $memc->get($internalKey);
         }