Cleanups: isResult() more used, readability improved (#5608)

[friendica.git] / src / Core / Cache / RedisCacheDriver.php

diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
index 223c2b8a943493b146ef2983af7bace20dd0dbcf..fff079e7823115724713dc2e4c98f12916aee8e5 100644 (file)
--- a/src/Core/Cache/RedisCacheDriver.php
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -4,6 +4,9 @@ namespace Friendica\Core\Cache;
 
 use Friendica\Core\Cache;
 
+use Exception;
+use Redis;
+
 /**
  * Redis Cache Driver. This driver is based on Memcache driver
  *
@@ -13,20 +16,20 @@ use Friendica\Core\Cache;
 class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
        /**
-        * @var \Redis
+        * @var Redis
         */
        private $redis;
 
        public function __construct($redis_host, $redis_port)
        {
                if (!class_exists('Redis', false)) {
-                       throw new \Exception('Redis class isn\'t available');
+                       throw new Exception('Redis class isn\'t available');
                }
 
-               $this->redis = new \Redis();
+               $this->redis = new Redis();
 
                if (!$this->redis->connect($redis_host, $redis_port)) {
-                       throw new \Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
+                       throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
                }
        }
 
@@ -40,7 +43,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
                        return null;
                }
 
-               $value = json_decode($cached);
+               $value = unserialize($cached);
 
                // Only return a value if the serialized value is valid.
                // We also check if the db entry is a serialized
@@ -56,7 +59,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
        {
                $cachekey = $this->getCacheKey($key);
 
-               $cached = json_encode($value);
+               $cached = serialize($value);
 
                if ($ttl > 0) {
                        return $this->redis->setex(
@@ -93,7 +96,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
        public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
        {
                $cachekey = $this->getCacheKey($key);
-               $cached = json_encode($value);
+               $cached = serialize($value);
 
                return $this->redis->setnx($cachekey, $cached);
        }
@@ -105,7 +108,7 @@ class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
        {
                $cachekey = $this->getCacheKey($key);
 
-               $newCached = json_encode($newValue);
+               $newCached = serialize($newValue);
 
                $this->redis->watch($cachekey);
                // If the old value isn't what we expected, somebody else changed the key meanwhile