[Cache] Move adapter implementations to traits

Author: nicolas-grekas

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -13,31 +13,24 @@
 
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Traits\AbstractTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
 {
-    use LoggerAwareTrait;
+    use AbstractTrait;
 
     private static $apcuSupported;
     private static $phpFilesSupported;
 
-    private $namespace;
-    private $deferred = array();
     private $createCacheItem;
     private $mergeByLifetime;
 
-    /**
-     * @var int|null The maximum length to enforce for identifiers or null when no limit applies
-     */
-    protected $maxIdLength;
-
     protected function __construct($namespace = '', $defaultLifetime = 0)
     {
         $this->namespace = '' === $namespace ? '' : $this->getId($namespace).':';
@@ -130,52 +123,6 @@ public static function createConnection($dsn, array $options = array())
         throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn));
     }
 
-    /**
-     * Fetches several cache items.
-     *
-     * @param array $ids The cache identifiers to fetch
-     *
-     * @return array|\Traversable The corresponding values found in the cache
-     */
-    abstract protected function doFetch(array $ids);
-
-    /**
-     * Confirms if the cache contains specified cache item.
-     *
-     * @param string $id The identifier for which to check existence
-     *
-     * @return bool True if item exists in the cache, false otherwise
-     */
-    abstract protected function doHave($id);
-
-    /**
-     * Deletes all items in the pool.
-     *
-     * @param string The prefix used for all identifiers managed by this pool
-     *
-     * @return bool True if the pool was successfully cleared, false otherwise
-     */
-    abstract protected function doClear($namespace);
-
-    /**
-     * Removes multiple items from the pool.
-     *
-     * @param array $ids An array of identifiers that should be removed from the pool
-     *
-     * @return bool True if the items were successfully removed, false otherwise
-     */
-    abstract protected function doDelete(array $ids);
-
-    /**
-     * Persists several cache items immediately.
-     *
-     * @param array $values   The values to cache, indexed by their cache identifier
-     * @param int   $lifetime The lifetime of the cached values, 0 for persisting until manual cleaning
-     *
-     * @return array|bool The identifiers that failed to be cached or a boolean stating if caching succeeded or not
-     */
-    abstract protected function doSave(array $values, $lifetime);
-
     /**
      * {@inheritdoc}
      */
@@ -225,87 +172,6 @@ public function getItems(array $keys = array())
         return $this->generateItems($items, $ids);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function hasItem($key)
-    {
-        $id = $this->getId($key);
-
-        if (isset($this->deferred[$key])) {
-            $this->commit();
-        }
-
-        try {
-            return $this->doHave($id);
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', array('key' => $key, 'exception' => $e));
-
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $this->deferred = array();
-
-        try {
-            return $this->doClear($this->namespace);
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to clear the cache', array('exception' => $e));
-
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItem($key)
-    {
-        return $this->deleteItems(array($key));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItems(array $keys)
-    {
-        $ids = array();
-
-        foreach ($keys as $key) {
-            $ids[$key] = $this->getId($key);
-            unset($this->deferred[$key]);
-        }
-
-        try {
-            if ($this->doDelete($ids)) {
-                return true;
-            }
-        } catch (\Exception $e) {
-        }
-
-        $ok = true;
-
-        // When bulk-delete failed, retry each item individually
-        foreach ($ids as $key => $id) {
-            try {
-                $e = null;
-                if ($this->doDelete(array($id))) {
-                    continue;
-                }
-            } catch (\Exception $e) {
-            }
-            CacheItem::log($this->logger, 'Failed to delete key "{key}"', array('key' => $key, 'exception' => $e));
-            $ok = false;
-        }
-
-        return $ok;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -394,47 +260,6 @@ public function __destruct()
         }
     }
 
-    /**
-     * Like the native unserialize() function but throws an exception if anything goes wrong.
-     *
-     * @param string $value
-     *
-     * @return mixed
-     *
-     * @throws \Exception
-     */
-    protected static function unserialize($value)
-    {
-        if ('b:0;' === $value) {
-            return false;
-        }
-        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
-        try {
-            if (false !== $value = unserialize($value)) {
-                return $value;
-            }
-            throw new \DomainException('Failed to unserialize cached value');
-        } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
-        } finally {
-            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
-        }
-    }
-
-    private function getId($key)
-    {
-        CacheItem::validateKey($key);
-
-        if (null === $this->maxIdLength) {
-            return $this->namespace.$key;
-        }
-        if (strlen($id = $this->namespace.$key) > $this->maxIdLength) {
-            $id = $this->namespace.substr_replace(base64_encode(hash('sha256', $key, true)), ':', -22);
-        }
-
-        return $id;
-    }
-
     private function generateItems($items, &$keys)
     {
         $f = $this->createCacheItem;
@@ -453,12 +278,4 @@ private function generateItems($items, &$keys)
             yield $key => $f($key, null, false);
         }
     }
-
-    /**
-     * @internal
-     */
-    public static function handleUnserializeCallback($class)
-    {
-        throw new \DomainException('Class not found: '.$class);
-    }
 }

src/Symfony/Component/Cache/Adapter/ArrayAdapter.php

@@ -13,19 +13,16 @@
 
 use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Traits\ArrayTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
 class ArrayAdapter implements AdapterInterface, LoggerAwareInterface
 {
-    use LoggerAwareTrait;
+    use ArrayTrait;
 
-    private $storeSerialized;
-    private $values = array();
-    private $expiries = array();
     private $createCacheItem;
 
     /**
@@ -86,49 +83,7 @@ public function getItems(array $keys = array())
             CacheItem::validateKey($key);
         }
 
-        return $this->generateItems($keys, time());
-    }
-
-    /**
-     * Returns all cached values, with cache miss as null.
-     *
-     * @return array
-     */
-    public function getValues()
-    {
-        return $this->values;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasItem($key)
-    {
-        CacheItem::validateKey($key);
-
-        return isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function clear()
-    {
-        $this->values = $this->expiries = array();
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItem($key)
-    {
-        CacheItem::validateKey($key);
-
-        unset($this->values[$key], $this->expiries[$key]);
-
-        return true;
+        return $this->generateItems($keys, time(), $this->createCacheItem);
     }
 
     /**
@@ -196,35 +151,4 @@ public function commit()
     {
         return true;
     }
-
-    private function generateItems(array $keys, $now)
-    {
-        $f = $this->createCacheItem;
-
-        foreach ($keys as $i => $key) {
-            try {
-                if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key))) {
-                    $this->values[$key] = $value = null;
-                } elseif (!$this->storeSerialized) {
-                    $value = $this->values[$key];
-                } elseif ('b:0;' === $value = $this->values[$key]) {
-                    $value = false;
-                } elseif (false === $value = unserialize($value)) {
-                    $this->values[$key] = $value = null;
-                    $isHit = false;
-                }
-            } catch (\Exception $e) {
-                CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', array('key' => $key, 'exception' => $e));
-                $this->values[$key] = $value = null;
-                $isHit = false;
-            }
-            unset($keys[$i]);
-
-            yield $key => $f($key, $value, $isHit);
-        }
-
-        foreach ($keys as $key) {
-            yield $key => $f($key, null, false);
-        }
-    }
 }