Merge branch 'cache_fixes' of https://github.com/marc-mabe/zf2 into h…

…otfix/cache-options-improvements
zendframework · Feb 9, 2012 · 926e71f · 926e71f
5 parents 1f29b3e + a75171a + 9a8e72f + 814716e + bc4058b
commit 926e71f
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 167 deletions.
diff --git a/src/Pattern/AbstractPattern.php b/src/Pattern/AbstractPattern.php
@@ -48,18 +48,6 @@ abstract class AbstractPattern implements Pattern
      */
     public function setOptions(PatternOptions $options)
     {
-        if (!is_array($options)
-            && !$options instanceof Traversable
-            && !$options instanceof PatternOptions
-        ) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects an array, a Traversable object, or an PatternOptions instance; '
-                    . 'received "%s"',
-                __METHOD__,
-                (is_object($options) ? get_class($options) : gettype($options))
-            ));
-        }
-
         if (!$options instanceof PatternOptions) {
             $options = new PatternOptions($options);
         }
@@ -68,8 +56,6 @@ public function setOptions(PatternOptions $options)
         return $this;
     }
 
-
-
     /**
      * Get all pattern options
      *

diff --git a/src/Pattern/CallbackCache.php b/src/Pattern/CallbackCache.php
@@ -36,14 +36,15 @@ class CallbackCache extends AbstractPattern
 {
     /**
      * Set options
-     * 
-     * @param  PatternOptions $options 
+     *
+     * @param  PatternOptions $options
      * @return CallbackCache
      * @throws Exception\InvalidArgumentException if missing storage option
      */
     public function setOptions(PatternOptions $options)
     {
         parent::setOptions($options);
+
         if (!$options->getStorage()) {
             throw new Exception\InvalidArgumentException("Missing option 'storage'");
         }
@@ -72,7 +73,8 @@ public function call($callback, array $args = array(), array $options = array())
             return $rs[0];
         }
 
-        if ( ($cacheOutput = $classOptions->getCacheOutput()) ) {
+        $cacheOutput = $classOptions->getCacheOutput();
+        if ($cacheOutput) {
             ob_start();
             ob_implicit_flush(false);
         }

diff --git a/src/Pattern/CaptureCache.php b/src/Pattern/CaptureCache.php
@@ -69,7 +69,7 @@ public function start($pageId = null, array $options = array())
         }
 
         ob_start(array($this, 'flush'));
-        ob_implicitflush(false);
+        ob_implicit_flush(false);
         $this->pageId = $pageId;
 
         return false;

diff --git a/src/Pattern/PatternOptions.php b/src/Pattern/PatternOptions.php
@@ -189,7 +189,7 @@ public function setCacheByDefault($cacheByDefault)
         $this->cacheByDefault = $cacheByDefault;
         return $this;
     }
-    
+
     /**
      * Do we cache by default?
      *
@@ -220,7 +220,7 @@ public function setCacheOutput($cacheOutput)
         $this->cacheOutput = (bool) $cacheOutput;
         return $this;
     }
-    
+
     /**
      * Will we cache output?
      *
@@ -253,7 +253,7 @@ public function setClass($class)
         $this->class = $class;
         return $this;
     }
-    
+
     /**
      * Get class name
      *
@@ -281,7 +281,7 @@ public function setClassCacheMethods(array $classCacheMethods)
         $this->classCacheMethods = $this->recursiveStrtolower($classCacheMethods);
         return $this;
     }
-    
+
     /**
      * Get list of methods from which to cache return values
      *
@@ -309,7 +309,7 @@ public function setClassNonCacheMethods(array $classNonCacheMethods)
         $this->classNonCacheMethods = $this->recursiveStrtolower($classNonCacheMethods);
         return $this;
     }
-    
+
     /**
      * Get list of methods from which NOT to cache return values
      *
@@ -327,8 +327,8 @@ public function getClassNonCacheMethods()
      * Set directory permissions
      *
      * Sets {@link $dirUmask} property to inverse of provided value.
-     * 
-     * @param  string $dirPerm 
+     *
+     * @param  string $dirPerm
      * @return PatternOptions
      */
     public function setDirPerm($dirPerm)
@@ -347,7 +347,7 @@ public function setDirPerm($dirPerm)
      * Gets directory permissions
      *
      * Proxies to {@link $dirUmask} property, returning its inverse.
-     * 
+     *
      * @return int
      */
     public function getDirPerm()
@@ -377,7 +377,7 @@ public function setDirUmask($dirUmask)
         $this->dirUmask = $dirUmask;
         return $this;
     }
-    
+
     /**
      * Get directory umask
      *
@@ -405,7 +405,7 @@ public function setFileLocking($fileLocking)
         $this->fileLocking = (bool) $fileLocking;
         return $this;
     }
-    
+
     /**
      * Is file locking enabled?
      *
@@ -423,8 +423,8 @@ public function getFileLocking()
      * Set file permissions
      *
      * Sets {@link $fileUmask} property to inverse of provided value.
-     * 
-     * @param  string $filePerm 
+     *
+     * @param  string $filePerm
      * @return PatternOptions
      */
     public function setFilePerm($filePerm)
@@ -443,7 +443,7 @@ public function setFilePerm($filePerm)
      * Gets file permissions
      *
      * Proxies to {@link $fileUmask} property, returning its inverse.
-     * 
+     *
      * @return int
      */
     public function getFilePerm()
@@ -478,7 +478,7 @@ public function setFileUmask($fileUmask)
         $this->fileUmask = $fileUmask;
         return $this;
     }
-    
+
     /**
      * Get file umask
      *
@@ -503,7 +503,7 @@ public function setIndexFilename($indexFilename)
         $this->indexFilename = (string) $indexFilename;
         return $this;
     }
-    
+
     /**
      * Get value for index filename
      *
@@ -530,7 +530,7 @@ public function setObject($object)
         $this->object = $object;
         return $this;
     }
-    
+
     /**
      * Get object to cache
      *
@@ -555,7 +555,7 @@ public function setObjectCacheMagicProperties($objectCacheMagicProperties)
         $this->objectCacheMagicProperties = (bool) $objectCacheMagicProperties;
         return $this;
     }
-    
+
     /**
      * Should we cache magic properties?
      *
@@ -581,7 +581,7 @@ public function setObjectCacheMethods(array $objectCacheMethods)
         $this->objectCacheMethods = $this->normalizeObjectMethods($objectCacheMethods);
         return $this;
     }
-    
+
     /**
      * Get list of object methods for which to cache return values
      *
@@ -612,7 +612,7 @@ public function setObjectKey($objectKey)
         }
         return $this;
     }
-    
+
     /**
      * Get object key
      *
@@ -638,7 +638,7 @@ public function setObjectNonCacheMethods(array $objectNonCacheMethods)
         $this->objectNonCacheMethods = $this->normalizeObjectMethods($objectNonCacheMethods);
         return $this;
     }
-    
+
     /**
      * Get list of object methods for which NOT to cache return values
      *
@@ -663,7 +663,7 @@ public function setPublicDir($publicDir)
         $this->publicDir = (string) $publicDir;
         return $this;
     }
-    
+
     /**
      * Get location of public directory
      *
@@ -695,7 +695,7 @@ public function setStorage($storage)
         $this->storage = $storage;
         return $this;
     }
-    
+
     /**
      * Get storage adapter
      *
@@ -727,7 +727,7 @@ public function setTagKey($tagKey)
         $this->tagKey = $tagKey;
         return $this;
     }
-    
+
     /**
      * Get tag key
      *
@@ -752,7 +752,7 @@ public function setTags(array $tags)
         $this->tags = $tags;
         return $this;
     }
-    
+
     /**
      * Get tags
      *
@@ -781,7 +781,7 @@ public function setTagStorage($tagStorage)
         $this->tagStorage = $tagStorage;
         return $this;
     }
-    
+
     /**
      * Get storage adapter for tags
      *
@@ -798,8 +798,8 @@ public function getTagStorage()
     /**
      * Recursively apply strtolower on all values of an array, and return as a
      * list of unique values
-     * 
-     * @param  array $array 
+     *
+     * @param  array $array
      * @return array
      */
     protected function recursiveStrtolower(array $array)
@@ -811,11 +811,11 @@ protected function recursiveStrtolower(array $array)
 
     /**
      * Normalize object methods
-     * 
-     * Recursively casts values to lowercase, then determines if any are in a 
+     *
+     * Recursively casts values to lowercase, then determines if any are in a
      * list of methods not handled, raising an exception if so.
      *
-     * @param  array $methods 
+     * @param  array $methods
      * @return array
      * @throws Exception\InvalidArgumentException
      */
@@ -836,13 +836,13 @@ protected function normalizeObjectMethods(array $methods)
      *
      * Allows specifying a umask as either an octal or integer. If the umask
      * fails required permissions, raises an exception.
-     * 
-     * @param  int|string $mask 
-     * @param  callable Callback used to verify the umask is acceptable for the given purpose
+     *
+     * @param  int|string $umask
+     * @param  callable   $comparison Callback used to verify the umask is acceptable for the given purpose
      * @return int
      * @throws Exception\InvalidArgumentException
      */
-    protected function normalizeUmask($mask, $comparison)
+    protected function normalizeUmask($umask, $comparison)
     {
         if (is_string($umask)) {
             $umask = octdec($umask);
@@ -857,8 +857,8 @@ protected function normalizeUmask($mask, $comparison)
 
     /**
      * Create a storage object from a given specification
-     * 
-     * @param  array|string|StorageAdapter $storage 
+     *
+     * @param  array|string|StorageAdapter $storage
      * @return StorageAdapter
      */
     protected function storageFactory($storage)

diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -141,18 +141,6 @@ public function __destruct()
      */
     public function setOptions($options)
     {
-        if (!is_array($options)
-            && !$options instanceof Traversable
-            && !$options instanceof AdapterOptions
-        ) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects an array, a Traversable object, or an AdapterOptions instance; '
-                . 'received "%s"',
-                __METHOD__,
-                (is_object($options) ? get_class($options) : gettype($options))
-            ));
-        }
-
         if (!$options instanceof AdapterOptions) {
             $options = new AdapterOptions($options);
         }
@@ -696,7 +684,7 @@ public function incrementItems(array $keyValuePairs, array $options = array())
 
         $ret = true;
         foreach ($keyValuePairs as $key => $value) {
-            $ret = $this->incrementItems($key, $value, $options) && $ret;
+            $ret = $this->incrementItem($key, $value, $options) && $ret;
         }
         return $ret;
     }
@@ -738,7 +726,7 @@ public function decrementItems(array $keyValuePairs, array $options = array())
 
         $ret = true;
         foreach ($keyValuePairs as $key => $value) {
-            $ret = $this->decrementMulti($key, $value, $options) && $ret;
+            $ret = $this->decrementItem($key, $value, $options) && $ret;
         }
         return $ret;
     }

diff --git a/src/Storage/Adapter/AbstractZendServer.php b/src/Storage/Adapter/AbstractZendServer.php
@@ -287,7 +287,14 @@ public function getMetadata($key, array $options = array())
             }
 
             $internalKey = $options['namespace'] . self::NAMESPACE_SEPARATOR . $key;
-            $result      = ($this->zdcFetch($internalKey) !== false) ? array() : false;
+            if ($this->zdcFetch($internalKey) === false) {
+                if (!$options['ignore_missing_items']) {
+                    throw new Exception\ItemNotFoundException("Key '{$internalKey}' not found");
+                }
+                $result = false;
+            } else {
+                $result = array();
+            }
 
             return $this->triggerPost(__FUNCTION__, $args, $result);
         } catch (\Exception $e) {
@@ -427,7 +434,6 @@ public function removeItem($key, array $options = array())
         $this->normalizeOptions($options);
         $args = new ArrayObject(array(
             'key'     => & $key,
-            'value'   => & $value,
             'options' => & $options,
         ));