X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FCache.php;h=26bdc6c3b7dd76e68fea0cf846868309ea66f36a;hb=81144b6d222c4c7825e9dcc245937d1120d3c32f;hp=a60ccfd84ca8ca376733c58a69c18a75467769ef;hpb=9bda6b7a507b0c43cd1062296c334e7e464cf3ff;p=civicrm-core.git diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php index a60ccfd84c..26bdc6c3b7 100644 --- a/CRM/Utils/Cache.php +++ b/CRM/Utils/Cache.php @@ -89,18 +89,18 @@ class CRM_Utils_Cache { switch ($cachePlugin) { case 'ArrayCache': case 'NoCache': - $defaults = array(); + $defaults = []; break; case 'Redis': case 'Memcache': case 'Memcached': - $defaults = array( + $defaults = [ 'host' => 'localhost', 'port' => 11211, 'timeout' => 3600, 'prefix' => '', - ); + ]; // Use old constants if needed to ensure backward compatibility if (defined('CIVICRM_MEMCACHE_HOST')) { @@ -139,7 +139,7 @@ class CRM_Utils_Cache { break; case 'APCcache': - $defaults = array(); + $defaults = []; if (defined('CIVICRM_DB_CACHE_TIMEOUT')) { $defaults['timeout'] = CIVICRM_DB_CACHE_TIMEOUT; } @@ -171,7 +171,7 @@ class CRM_Utils_Cache { * Support varies by driver: * - For most memory backed caches, this option is meaningful. * - For SqlGroup, this option is ignored. SqlGroup has equivalent behavior built-in. - * - For Arraycache, this option is ignored. It's redundant. + * - For ArrayCache, this option is ignored. It's redundant. * If this is a short-lived process in which TTL's don't matter, you might * use 'fast' mode. It sacrifices some PSR-16 compliance and cache-coherency * protections to improve performance. @@ -179,7 +179,7 @@ class CRM_Utils_Cache { * @throws CRM_Core_Exception * @see Civi::cache() */ - public static function create($params = array()) { + public static function create($params = []) { $types = (array) $params['type']; if (!empty($params['name'])) { @@ -189,7 +189,7 @@ class CRM_Utils_Cache { foreach ($types as $type) { switch ($type) { case '*memory*': - if (defined('CIVICRM_DB_CACHE_CLASS') && in_array(CIVICRM_DB_CACHE_CLASS, array('Memcache', 'Memcached', 'Redis'))) { + if (defined('CIVICRM_DB_CACHE_CLASS') && in_array(CIVICRM_DB_CACHE_CLASS, ['Memcache', 'Memcached', 'Redis'])) { $dbCacheClass = 'CRM_Utils_Cache_' . CIVICRM_DB_CACHE_CLASS; $settings = self::getCacheSettings(CIVICRM_DB_CACHE_CLASS); $settings['prefix'] = CRM_Utils_Array::value('prefix', $settings, '') . self::DELIMITER . $params['name'] . self::DELIMITER; @@ -203,16 +203,16 @@ class CRM_Utils_Cache { case 'SqlGroup': if (defined('CIVICRM_DSN') && CIVICRM_DSN) { - return new CRM_Utils_Cache_SqlGroup(array( + return new CRM_Utils_Cache_SqlGroup([ 'group' => $params['name'], 'prefetch' => CRM_Utils_Array::value('prefetch', $params, FALSE), - )); + ]); } break; case 'Arraycache': case 'ArrayCache': - return new CRM_Utils_Cache_ArrayCache(array()); + return new CRM_Utils_Cache_ArrayCache([]); } } @@ -251,7 +251,8 @@ class CRM_Utils_Cache { * Ex: 'ArrayCache', 'Memcache', 'Redis'. */ public static function getCacheDriver() { - $className = 'ArrayCache'; // default to ArrayCache for now + // default to ArrayCache for now + $className = 'ArrayCache'; // Maintain backward compatibility for now. // Setting CIVICRM_USE_MEMCACHE or CIVICRM_USE_ARRAYCACHE will