Merge pull request #5 from sitkoru/cacheops

Cacheops

ActiveQueryCacheHelper.php

@@ -94,7 +94,7 @@ protected static function getModelsToDelete($className, $condition, $params)
             $params
         );
         try {
-            $results = $query->createCommand()->queryAll();
+            $results = $query->createCommand($className::getDb())->queryAll();
         } catch (Exception $ex) {
             $results = [];
         }

CacheActiveQuery.php

@@ -18,6 +18,13 @@ class CacheActiveQuery extends ActiveQuery
     private $dropConditions = [];
     private $disableCache = false;
 
+    private function isCacheEnabled()
+    {
+        if ($this->disableCache || (defined('DISABLE_AR_CACHE') && DISABLE_AR_CACHE)) {
+            return false;
+        }
+        return true;
+    }
 
     /**
      * @inheritdoc
@@ -26,7 +33,7 @@ public function all($db = null)
     {
         ActiveQueryCacheHelper::initialize();
 
-        if (!$this->disableCache) {
+        if ($this->isCacheEnabled()) {
             $command = $this->createCommand($db);
             $key = $this->generateCacheKey($command->rawSql, 'all');
 
@@ -70,7 +77,7 @@ public function all($db = null)
     public function one($db = null)
     {
         ActiveQueryCacheHelper::initialize();
-        if (!$this->disableCache) {
+        if ($this->isCacheEnabled()) {
             $command = $this->createCommand($db);
             $key = $this->generateCacheKey($command->rawSql, 'one');
             /**

CacheHelper.php

@@ -33,13 +33,21 @@ public static function scriptExists($sha)
 
     public static function evalSHA($sha, $args, $numKeys)
     {
-        return static::getRedis()->executeCommand('EVALSHA', [$sha, $args, $numKeys]);
+        return static::getRedis()->evalsha($sha, $numKeys, ...$args);
     }
 
     public static function get($key)
     {
-        $res = static::getRedis()->executeCommand('get', [$key]);
+        $res = static::getRedis()->get($key);
 
-        return $res !== false ? unserialize(zlib_decode($res)) : $res;
+        if ($res !== false) {
+            try {
+                return unserialize(zlib_decode($res));
+            } catch (\Throwable $ex) {
+
+            }
+            return null;
+        }
+        return $res;
     }
-}
+}

composer.json

@@ -26,4 +26,4 @@
       "sitkoru\\cache\\ar\\": ""
     }
   }
-}
+}