From c33f1df149594153fdbd43454effa850fbad13f7 Mon Sep 17 00:00:00 2001 From: DemeritCowboy Date: Tue, 2 Jul 2019 02:05:45 -0400 Subject: [PATCH] WIP --- CRM/Admin/Page/CKEditorConfig.php | 2 +- CRM/Grant/Page/Tab.php | 2 +- CRM/Logging/Schema.php | 2 +- CRM/Price/BAO/LineItem.php | 2 +- CRM/Utils/Cache.php | 2 +- CRM/Utils/Cache/ArrayCache.php | 6 +++--- CRM/Utils/System.php | 2 +- CRM/Utils/VersionCheck.php | 2 +- Civi/Angular/Manager.php | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CRM/Admin/Page/CKEditorConfig.php b/CRM/Admin/Page/CKEditorConfig.php index 22f6539913..02328983d7 100644 --- a/CRM/Admin/Page/CKEditorConfig.php +++ b/CRM/Admin/Page/CKEditorConfig.php @@ -163,7 +163,7 @@ class CRM_Admin_Page_CKEditorConfig extends CRM_Core_Page { foreach (glob($pluginDir . '/*', GLOB_ONLYDIR) as $dir) { $dir = rtrim(str_replace('\\', '/', $dir), '/'); $name = substr($dir, strrpos($dir, '/') + 1); - $dir = CRM_Utils_file::addTrailingSlash($dir, '/'); + $dir = CRM_Utils_File::addTrailingSlash($dir, '/'); if (is_file($dir . 'plugin.js')) { $plugins[$name] = [ 'id' => $name, diff --git a/CRM/Grant/Page/Tab.php b/CRM/Grant/Page/Tab.php index 914879716c..c2134c06b5 100644 --- a/CRM/Grant/Page/Tab.php +++ b/CRM/Grant/Page/Tab.php @@ -177,7 +177,7 @@ class CRM_Grant_Page_Tab extends CRM_Contact_Page_View { break; case 'edit': - $url = CRM_utils_System::url('civicrm/contact/view/grant', 'reset=1&id=' . $this->_id . '&cid=' . $this->_contactId . '&action=view&context=grant&selectedChild=grant'); + $url = CRM_Utils_System::url('civicrm/contact/view/grant', 'reset=1&id=' . $this->_id . '&cid=' . $this->_contactId . '&action=view&context=grant&selectedChild=grant'); break; case 'grant': diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php index 98bec45c62..0f7f3ac393 100644 --- a/CRM/Logging/Schema.php +++ b/CRM/Logging/Schema.php @@ -603,7 +603,7 @@ AND (TABLE_NAME LIKE 'log_civicrm_%' $nonStandardTableNameString ) } \Civi::$statics[__CLASS__]['columnsOf'][$table] = []; while ($dao->fetch()) { - \Civi::$statics[__CLASS__]['columnsOf'][$table][] = CRM_Utils_type::escape($dao->Field, 'MysqlColumnNameOrAlias'); + \Civi::$statics[__CLASS__]['columnsOf'][$table][] = CRM_Utils_Type::escape($dao->Field, 'MysqlColumnNameOrAlias'); } } return \Civi::$statics[__CLASS__]['columnsOf'][$table]; diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php index 3859a974b8..08d4b2e032 100644 --- a/CRM/Price/BAO/LineItem.php +++ b/CRM/Price/BAO/LineItem.php @@ -427,7 +427,7 @@ WHERE li.contribution_id = %1"; */ public static function processPriceSet($entityId, $lineItem, $contributionDetails = NULL, $entityTable = 'civicrm_contribution', $update = FALSE) { if (!$entityId || !is_array($lineItem) - || CRM_Utils_system::isNull($lineItem) + || CRM_Utils_System::isNull($lineItem) ) { return; } diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php index 23975cae4d..26bdc6c3b7 100644 --- a/CRM/Utils/Cache.php +++ b/CRM/Utils/Cache.php @@ -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. diff --git a/CRM/Utils/Cache/ArrayCache.php b/CRM/Utils/Cache/ArrayCache.php index 92badc0cda..c83f3f1f4e 100644 --- a/CRM/Utils/Cache/ArrayCache.php +++ b/CRM/Utils/Cache/ArrayCache.php @@ -32,9 +32,9 @@ */ /** - * Class CRM_Utils_Cache_Arraycache + * Class CRM_Utils_Cache_ArrayCache */ -class CRM_Utils_Cache_Arraycache implements CRM_Utils_Cache_Interface { +class CRM_Utils_Cache_ArrayCache implements CRM_Utils_Cache_Interface { use CRM_Utils_Cache_NaiveMultipleTrait; // TODO Native implementation @@ -56,7 +56,7 @@ class CRM_Utils_Cache_Arraycache implements CRM_Utils_Cache_Interface { * @param array $config * An array of configuration params. * - * @return \CRM_Utils_Cache_Arraycache + * @return \CRM_Utils_Cache_ArrayCache */ public function __construct($config) { $this->_cache = []; diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php index e14e92dfb6..736219ce83 100644 --- a/CRM/Utils/System.php +++ b/CRM/Utils/System.php @@ -1432,7 +1432,7 @@ class CRM_Utils_System { // zealous about destroying *all* memory-backed caches during a flush(). // These flushes simulate that legacy behavior. However, they should probably // be removed at some point. - $localDrivers = ['CRM_Utils_Cache_Arraycache', 'CRM_Utils_Cache_NoCache']; + $localDrivers = ['CRM_Utils_Cache_ArrayCache', 'CRM_Utils_Cache_NoCache']; if (Civi\Core\Container::isContainerBooted() && !in_array(get_class(CRM_Utils_Cache::singleton()), $localDrivers)) { Civi::cache('long')->flush(); diff --git a/CRM/Utils/VersionCheck.php b/CRM/Utils/VersionCheck.php index eb72bd9451..9d2fe9f6f2 100644 --- a/CRM/Utils/VersionCheck.php +++ b/CRM/Utils/VersionCheck.php @@ -160,7 +160,7 @@ class CRM_Utils_VersionCheck { 'co' => $config->defaultContactCountry, 'ufv' => $config->userSystem->getVersion(), 'PHP' => phpversion(), - 'MySQL' => CRM_CORE_DAO::singleValueQuery('SELECT VERSION()'), + 'MySQL' => CRM_Core_DAO::singleValueQuery('SELECT VERSION()'), 'communityMessagesUrl' => Civi::settings()->get('communityMessagesUrl'), ]; $this->getDomainStats(); diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php index 4b4f1c888f..c44b854aa6 100644 --- a/Civi/Angular/Manager.php +++ b/Civi/Angular/Manager.php @@ -50,7 +50,7 @@ class Manager { */ public function __construct($res, \CRM_Utils_Cache_Interface $cache = NULL) { $this->res = $res; - $this->cache = $cache ? $cache : new \CRM_Utils_Cache_Arraycache([]); + $this->cache = $cache ? $cache : new \CRM_Utils_Cache_ArrayCache([]); } /** -- 2.25.1