[cleanup] Remove deprecated pattern &CRM_Core_Config::singleton()

diff --git a/CRM/Activity/BAO/ICalendar.php b/CRM/Activity/BAO/ICalendar.php
index 4ebc2b0b54bdff0598d3f0243cf7d16061468ef8..cb2cb014eff745ed34526d7214b9f82f2dcf577f 100644 (file)
--- a/CRM/Activity/BAO/ICalendar.php
+++ b/CRM/Activity/BAO/ICalendar.php
@@ -67,8 +67,7 @@ class CRM_Activity_BAO_ICalendar {
   public function addAttachment(&$attachments, $contacts) {
     // Check preferences setting
     if (Civi::settings()->get('activity_assignee_notification_ics')) {
-      $config = &CRM_Core_Config::singleton();
-      $this->icsfile = tempnam($config->customFileUploadDir, 'ics');
+      $this->icsfile = tempnam(CRM_Core_Config::singleton()->customFileUploadDir, 'ics');
       if ($this->icsfile !== FALSE) {
         rename($this->icsfile, $this->icsfile . '.ics');
         $this->icsfile .= '.ics';

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 6733d57f7e2c0b620d593a9ca51af4d69230de10..e7af2239c01d03c5af0b4b09f7fa966d34e68413 100644 (file)
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -215,8 +215,7 @@ class CRM_Utils_System {
     $print = FALSE,
     $maintenance = FALSE
   ) {
-    $config = &CRM_Core_Config::singleton();
-    return $config->userSystem->theme($content, $print, $maintenance);
+    return CRM_Core_Config::singleton()->userSystem->theme($content, $print, $maintenance);
   }
 
   /**
@@ -1613,8 +1612,7 @@ class CRM_Utils_System {
     $addLanguagePart = TRUE,
     $removeLanguagePart = FALSE
   ) {
-    $config = &CRM_Core_Config::singleton();
-    return $config->userSystem->languageNegotiationURL($url, $addLanguagePart, $removeLanguagePart);
+    return CRM_Core_Config::singleton()->userSystem->languageNegotiationURL($url, $addLanguagePart, $removeLanguagePart);
   }
 
   /**

diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index 0ad46528d4162e2e9266eb73ede5072faf36cd9b..a83754f7cf651899b056af88dabdec84f2a8089e 100644 (file)
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -254,10 +254,9 @@ abstract class CRM_Utils_System_Base {
     }
     $out = $content;
 
-    $config = &CRM_Core_Config::singleton();
     if (
       !$print &&
-      $config->userFramework == 'WordPress'
+      CRM_Core_Config::singleton()->userFramework == 'WordPress'
     ) {
       if (!function_exists('is_admin')) {
         throw new \Exception('Function "is_admin()" is missing, even though WordPress is the user framework.');

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 1f49256bb887c08bbec5813a9105500fed453206..3a1dde23b452a0031ff77bcffc7f57dbd340834a 100644 (file)
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -1163,8 +1163,7 @@ $text
   public function testSendSMSWithoutPermission() {
     $dummy = NULL;
     $session = CRM_Core_Session::singleton();
-    $config = &CRM_Core_Config::singleton();
-    $config->userPermissionClass->permissions = array('access CiviCRM');
+    CRM_Core_Config::singleton()->userPermissionClass->permissions = array('access CiviCRM');
 
     CRM_Activity_BAO_Activity::sendSMS(
       $dummy,

diff --git a/tools/bin/scripts/cli.php b/tools/bin/scripts/cli.php
index 29b8704da0954d24240033a194e7567af9c6cef6..9ac2f36482570a80c47a3bb7110174f669f08a6f 100644 (file)
--- a/tools/bin/scripts/cli.php
+++ b/tools/bin/scripts/cli.php
@@ -88,8 +88,8 @@ class civicrm_CLI {
   function authenticate($user, $pass) {
     session_start();
     require_once 'CRM/Core/Config.php';
-
-    $config = &CRM_Core_Config::singleton();
+    // Does calling this do anything here?
+    CRM_Core_Config::singleton();
 
     // this does not return on failure
     // require_once 'CRM/Utils/System.php';

diff --git a/tools/bin/scripts/memcache.php b/tools/bin/scripts/memcache.php
index c341602256666a4e033c91fc674a29457784118a..918dc7a486f8078679d809730257378349c8cf1d 100644 (file)
--- a/tools/bin/scripts/memcache.php
+++ b/tools/bin/scripts/memcache.php
@@ -5,8 +5,8 @@ require_once 'CRM/Utils/Cache.php';
 
 define('CIVICRM_USE_MEMCACHE', 1);
 
-$config = &CRM_Core_Config::singleton();
-$cache = &CRM_Utils_Cache::singleton();
+$config = CRM_Core_Config::singleton();
+$cache = CRM_Utils_Cache::singleton();
 
 $cache->set('CRM_Core_Config' .CRM_Core_Config::domainID(), $config);
 CRM_Core_Error::debug('get', $cache->get('CRM_Core_Config' . CRM_Core_Config::domainID()));

diff --git a/tools/scripts/civimail-spooler/civimail-spooler.php b/tools/scripts/civimail-spooler/civimail-spooler.php
index 63bb5a83a5e90ff6aaff6c0eb63b3e62964a37ff..85ad8fd3daebfb39c9fee7ba490fed9aeaf288b9 100644 (file)
--- a/tools/scripts/civimail-spooler/civimail-spooler.php
+++ b/tools/scripts/civimail-spooler/civimail-spooler.php
@@ -17,7 +17,7 @@ require_once "$config_file";
 require_once "CRM/Core/Config.php";
 ');
 
-$config = &CRM_Core_Config::singleton();
+$config = CRM_Core_Config::singleton();
 
 /* Temporary permissioning hack for now */
 

diff --git a/tools/scripts/solr/createSolrJSON.php b/tools/scripts/solr/createSolrJSON.php
index bbe6eeae6c10f50448e0090920188501d595cecd..005c6555c7d49ead4caca5a8db51e4a73ec4acdd 100644 (file)
--- a/tools/scripts/solr/createSolrJSON.php
+++ b/tools/scripts/solr/createSolrJSON.php
@@ -373,7 +373,7 @@ function run(&$contactIDs) {
   }
 }
 
-$config = &CRM_Core_Config::singleton();
+$config = CRM_Core_Config::singleton();
 $config->userFramework = 'Soap';
 $config->userFrameworkClass = 'CRM_Utils_System_Soap';
 $config->userHookClass = 'CRM_Utils_Hook_Soap';

diff --git a/tools/scripts/solr/createSolrXML.php b/tools/scripts/solr/createSolrXML.php
index a00b15a4bfa0edd169b819067a45f49734f6287a..f11a20a653646d5933b8da551800283b94f29ca4 100644 (file)
--- a/tools/scripts/solr/createSolrXML.php
+++ b/tools/scripts/solr/createSolrXML.php
@@ -244,7 +244,7 @@ function run(&$contactIDs) {
   }
 }
 
-$config = &CRM_Core_Config::singleton();
+$config = CRM_Core_Config::singleton();
 $config->userFramework = 'Soap';
 $config->userFrameworkClass = 'CRM_Utils_System_Soap';
 $config->userHookClass = 'CRM_Utils_Hook_Soap';

diff --git a/tools/scripts/solr/createSyncJSON.php b/tools/scripts/solr/createSyncJSON.php
index 540978056c07fd635fc5cb4eafa1b67c4f1e317c..f4b3bf62e62e13f41a1e3ad7f67157ab40369c84 100644 (file)
--- a/tools/scripts/solr/createSyncJSON.php
+++ b/tools/scripts/solr/createSyncJSON.php
@@ -526,7 +526,7 @@ function run(&$values, &$contactIDs, &$allContactIDs) {
   }
 }
 
-$config = &CRM_Core_Config::singleton();
+$config = CRM_Core_Config::singleton();
 $config->userFramework = 'Soap';
 $config->userFrameworkClass = 'CRM_Utils_System_Soap';
 $config->userHookClass = 'CRM_Utils_Hook_Soap';