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

…ture/cache-dba
joncave · Jul 6, 2012 · 58963ff · 58963ff
2 parents 8119ce5 + 087182d
commit 58963ff
Show file tree

Hide file tree

Showing 20 changed files with 1,363 additions and 30 deletions.
diff --git a/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php b/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -105,7 +105,6 @@ public function __construct($options = null)
      * detach all registered plugins to free
      * event handles of event manager
      *
-     *
      * @return void
      */
     public function __destruct()

diff --git a/library/Zend/Cache/Storage/Adapter/Apc.php b/library/Zend/Cache/Storage/Adapter/Apc.php
@@ -41,10 +41,13 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Apc
-    extends AbstractAdapter
-    implements ClearByPrefixInterface, ClearByNamespaceInterface, FlushableInterface, IterableInterface,
-               AvailableSpaceCapableInterface, TotalSpaceCapableInterface
+class Apc extends AbstractAdapter implements
+    ClearByPrefixInterface,
+    ClearByNamespaceInterface,
+    FlushableInterface,
+    IterableInterface,
+    AvailableSpaceCapableInterface,
+    TotalSpaceCapableInterface
 {
     /**
      * Buffered total space in bytes
@@ -102,7 +105,7 @@ public function setOptions($options)
      * Get options.
      *
      * @return ApcOptions
-     * @see setOptions()
+     * @see    setOptions()
      */
     public function getOptions()
     {
@@ -308,10 +311,6 @@ protected function internalHasItems(array & $normalizedKeys)
      * @param  string $normalizedKey
      * @return array|boolean Metadata on success, false on failure
      * @throws Exception\ExceptionInterface
-     *
-     * @triggers getMetadata.pre(PreEvent)
-     * @triggers getMetadata.post(PostEvent)
-     * @triggers getMetadata.exception(ExceptionEvent)
      */
     protected function internalGetMetadata(& $normalizedKey)
     {
@@ -654,6 +653,7 @@ protected function internalGetCapabilities()
                         'atime', 'ctime', 'mtime', 'rtime',
                         'size', 'hits', 'ttl',
                     ),
+                    'minTtl'             => 1,
                     'maxTtl'             => 0,
                     'staticTtl'          => true,
                     'ttlPrecision'       => 1,

diff --git a/library/Zend/Cache/Storage/Adapter/ApcIterator.php b/library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -81,7 +81,7 @@ public function __construct(Apc $storage, BaseApcIterator $baseIterator, $prefix
     /**
      * Get storage instance
      *
-     * @return StorageInterface
+     * @return Apc
      */
     public function getStorage()
     {