diff --git a/src/Console/Cache.php b/src/Console/Cache.php index a13e003aa..afb549f4d 100644 --- a/src/Console/Cache.php +++ b/src/Console/Cache.php @@ -87,7 +87,7 @@ HELP; } if ($this->getOption('v')) { - $this->out('Cache Driver Name: ' . (string)$this->cache); + $this->out('Cache Driver Name: ' . $this->cache->getName()); $this->out('Cache Driver Class: ' . get_class($this->cache)); } diff --git a/src/Core/Cache/APCuCache.php b/src/Core/Cache/APCuCache.php index 9afbf05c4..48880fe98 100644 --- a/src/Core/Cache/APCuCache.php +++ b/src/Core/Cache/APCuCache.php @@ -153,7 +153,10 @@ class APCuCache extends Cache implements IMemoryCache return true; } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_APCU; } diff --git a/src/Core/Cache/ArrayCache.php b/src/Core/Cache/ArrayCache.php index 17fbe2f40..5add98cc2 100644 --- a/src/Core/Cache/ArrayCache.php +++ b/src/Core/Cache/ArrayCache.php @@ -91,7 +91,10 @@ class ArrayCache extends Cache implements IMemoryCache } } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_ARRAY; } diff --git a/src/Core/Cache/Cache.php b/src/Core/Cache/Cache.php index 4e24246e8..b40c129ae 100644 --- a/src/Core/Cache/Cache.php +++ b/src/Core/Cache/Cache.php @@ -28,13 +28,6 @@ abstract class Cache implements ICache const MINUTE = 60; const INFINITE = 0; - /** - * Force each Cache implementation to define the ToString method - * - * @return string - */ - abstract function __toString(); - /** * @var string The hostname */ diff --git a/src/Core/Cache/DatabaseCache.php b/src/Core/Cache/DatabaseCache.php index e0e371fe5..7fbbdb5e3 100644 --- a/src/Core/Cache/DatabaseCache.php +++ b/src/Core/Cache/DatabaseCache.php @@ -110,7 +110,10 @@ class DatabaseCache extends Cache implements ICache } } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_DATABASE; } diff --git a/src/Core/Cache/ICache.php b/src/Core/Cache/ICache.php index 1ff6a8c52..f8e98c568 100644 --- a/src/Core/Cache/ICache.php +++ b/src/Core/Cache/ICache.php @@ -54,4 +54,11 @@ interface ICache * @return bool */ public function clear($outdated = true); + + /** + * Returns the name of the current cache + * + * @return string + */ + public function getName(); } diff --git a/src/Core/Cache/MemcacheCache.php b/src/Core/Cache/MemcacheCache.php index 002aabdfd..717166952 100644 --- a/src/Core/Cache/MemcacheCache.php +++ b/src/Core/Cache/MemcacheCache.php @@ -148,7 +148,10 @@ class MemcacheCache extends Cache implements IMemoryCache return $this->memcache->add($cachekey, serialize($value), MEMCACHE_COMPRESSED, $ttl); } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_MEMCACHE; } diff --git a/src/Core/Cache/MemcachedCache.php b/src/Core/Cache/MemcachedCache.php index 9b54f05b0..ac0648a6c 100644 --- a/src/Core/Cache/MemcachedCache.php +++ b/src/Core/Cache/MemcachedCache.php @@ -152,7 +152,10 @@ class MemcachedCache extends Cache implements IMemoryCache return $this->memcached->add($cachekey, $value, $ttl); } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_MEMCACHED; } diff --git a/src/Core/Cache/ProfilerCache.php b/src/Core/Cache/ProfilerCache.php index d2b0092a8..d59b88560 100644 --- a/src/Core/Cache/ProfilerCache.php +++ b/src/Core/Cache/ProfilerCache.php @@ -152,8 +152,11 @@ class ProfilerCache implements ICache, IMemoryCache } } - public function __toString() + /** + * {@inheritDoc} + */ + public function GetName() { - return (string)$this->cache . ' (with profiler)'; + return $this->cache->getName() . ' (with profiler)'; } } diff --git a/src/Core/Cache/RedisCache.php b/src/Core/Cache/RedisCache.php index e3884e608..5f8fd7e4c 100644 --- a/src/Core/Cache/RedisCache.php +++ b/src/Core/Cache/RedisCache.php @@ -192,7 +192,10 @@ class RedisCache extends Cache implements IMemoryCache return false; } - public function __toString() + /** + * {@inheritDoc} + */ + public function getName() { return self::TYPE_REDIS; }