Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

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

diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index eb58811e2c9d9e5c3ea9896a74290754d3d2c736..05ccdd4feca7e07febc8245ac9ae2296906832d2 100644 (file)
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -9,6 +9,8 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 use dba;
 
+require_once 'include/dba.php';
+
 /**
  * @brief Class for storing data for a short time
  */
@@ -32,7 +34,7 @@ class Cache
                $memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
                $memcache_port = Config::get('system', 'memcache_port', 11211);
 
-               $memcache = new Memcache;
+               $memcache = new \Memcache;
 
                if (!$memcache->connect($memcache_host, $memcache_port)) {
                        return false;
@@ -105,12 +107,12 @@ class Cache
                }
 
                // Frequently clear cache
-               self::clear($duration);
+               self::clear();
 
-               $r = dba::select('cache', array('v'), array('k' => $key), array('limit' => 1));
+               $cache = dba::selectFirst('cache', ['v'], ['k' => $key]);
 
-               if (DBM::is_result($r)) {
-                       $cached = $r['v'];
+               if (DBM::is_result($cache)) {
+                       $cached = $cache['v'];
                        $value = @unserialize($cached);
 
                        // Only return a value if the serialized value is valid.
@@ -144,8 +146,8 @@ class Cache
                        $memcache->set(get_app()->get_hostname().":".$key, serialize($value), MEMCACHE_COMPRESSED, self::duration($duration));
                        return;
                }
-               $fields = array('v' => serialize($value), 'expire_mode' => $duration, 'updated' => datetime_convert());
-               $condition = array('k' => $key);
+               $fields = ['v' => serialize($value), 'expire_mode' => $duration, 'updated' => datetime_convert()];
+               $condition = ['k' => $key];
                dba::update('cache', $fields, $condition, true);
        }
 
@@ -161,68 +163,68 @@ class Cache
                // Clear long lasting cache entries only once a day
                if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
                        if ($max_level == CACHE_MONTH) {
-                               $condition = array("`updated` < ? AND `expire_mode` = ?",
+                               $condition = ["`updated` < ? AND `expire_mode` = ?",
                                                datetime_convert('UTC', 'UTC', "now - 30 days"),
-                                               CACHE_MONTH);
+                                               CACHE_MONTH];
                                dba::delete('cache', $condition);
                        }
 
                        if ($max_level <= CACHE_WEEK) {
-                               $condition = array("`updated` < ? AND `expire_mode` = ?",
+                               $condition = ["`updated` < ? AND `expire_mode` = ?",
                                                datetime_convert('UTC', 'UTC', "now - 7 days"),
-                                               CACHE_WEEK);
+                                               CACHE_WEEK];
                                dba::delete('cache', $condition);
                        }
 
                        if ($max_level <= CACHE_DAY) {
-                               $condition = array("`updated` < ? AND `expire_mode` = ?",
+                               $condition = ["`updated` < ? AND `expire_mode` = ?",
                                                datetime_convert('UTC', 'UTC', "now - 1 days"),
-                                               CACHE_DAY);
+                                               CACHE_DAY];
                                dba::delete('cache', $condition);
                        }
                        Config::set("system", "cache_cleared_day", time());
                }
 
                if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
-                       $condition = array("`updated` < ? AND `expire_mode` = ?",
+                       $condition = ["`updated` < ? AND `expire_mode` = ?",
                                        datetime_convert('UTC', 'UTC', "now - 1 hours"),
-                                       CACHE_HOUR);
+                                       CACHE_HOUR];
                        dba::delete('cache', $condition);
 
                        Config::set("system", "cache_cleared_hour", time());
                }
 
                if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
-                       $condition = array("`updated` < ? AND `expire_mode` = ?",
+                       $condition = ["`updated` < ? AND `expire_mode` = ?",
                                        datetime_convert('UTC', 'UTC', "now - 30 minutes"),
-                                       CACHE_HALF_HOUR);
+                                       CACHE_HALF_HOUR];
                        dba::delete('cache', $condition);
 
                        Config::set("system", "cache_cleared_half_hour", time());
                }
 
                if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
-                       $condition = array("`updated` < ? AND `expire_mode` = ?",
+                       $condition = ["`updated` < ? AND `expire_mode` = ?",
                                        datetime_convert('UTC', 'UTC', "now - 15 minutes"),
-                                       CACHE_QUARTER_HOUR);
+                                       CACHE_QUARTER_HOUR];
                        dba::delete('cache', $condition);
 
                        Config::set("system", "cache_cleared_quarter_hour", time());
                }
 
                if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
-                       $condition = array("`updated` < ? AND `expire_mode` = ?",
+                       $condition = ["`updated` < ? AND `expire_mode` = ?",
                                        datetime_convert('UTC', 'UTC', "now - 5 minutes"),
-                                       CACHE_FIVE_MINUTES);
+                                       CACHE_FIVE_MINUTES];
                        dba::delete('cache', $condition);
 
                        Config::set("system", "cache_cleared_five_minute", time());
                }
 
                if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
-                       $condition = array("`updated` < ? AND `expire_mode` = ?",
+                       $condition = ["`updated` < ? AND `expire_mode` = ?",
                                        datetime_convert('UTC', 'UTC', "now - 1 minutes"),
-                                       CACHE_MINUTE);
+                                       CACHE_MINUTE];
                        dba::delete('cache', $condition);
 
                        Config::set("system", "cache_cleared_minute", time());