From 6f2b0555fc043f1f0fa553eb624d7fb8c058c0ca Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 26 Jan 2022 18:10:04 +1300
Subject: [PATCH] Remove deprecated language construct

Per https://github.com/totten/civix/pull/235 this language construct
appears to be getting more noisy about being bad....
---
 ext/afform/admin/afform_admin.civix.php                      | 4 ++--
 ext/afform/core/afform.civix.php                             | 4 ++--
 ext/afform/html/afform_html.civix.php                        | 4 ++--
 ext/afform/mock/afform_mock.civix.php                        | 4 ++--
 ext/authx/authx.civix.php                                    | 4 ++--
 ext/civigrant/civigrant.civix.php                            | 4 ++--
 ext/ckeditor4/ckeditor4.civix.php                            | 4 ++--
 .../contributioncancelactions.civix.php                      | 4 ++--
 ext/eventcart/eventcart.civix.php                            | 4 ++--
 ext/ewaysingle/ewaysingle.civix.php                          | 4 ++--
 ext/financialacls/financialacls.civix.php                    | 4 ++--
 ext/flexmailer/flexmailer.civix.php                          | 4 ++--
 ext/greenwich/greenwich.civix.php                            | 4 ++--
 ext/legacycustomsearches/legacycustomsearches.civix.php      | 4 ++--
 ext/message_admin/message_admin.civix.php                    | 4 ++--
 ext/oauth-client/oauth_client.civix.php                      | 4 ++--
 ext/payflowpro/payflowpro.civix.php                          | 5 +++--
 ext/recaptcha/recaptcha.civix.php                            | 4 ++--
 ext/search_kit/search_kit.civix.php                          | 4 ++--
 ext/sequentialcreditnotes/sequentialcreditnotes.civix.php    | 4 ++--
 tests/extensions/shimmy/shimmy.civix.php                     | 4 ++--
 tools/extensions/org.civicrm.angularex/angularex.civix.php   | 4 ++--
 tools/extensions/org.civicrm.demoqueue/demoqueue.civix.php   | 4 ++--
 23 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/ext/afform/admin/afform_admin.civix.php b/ext/afform/admin/afform_admin.civix.php
index 132b749239..3071d542f3 100644
--- a/ext/afform/admin/afform_admin.civix.php
+++ b/ext/afform/admin/afform_admin.civix.php
@@ -91,9 +91,9 @@ function _afform_admin_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index b33d0cce1b..ae7b0c0fa4 100644
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -91,9 +91,9 @@ function _afform_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
index 8d7ccb5626..80d673e53a 100644
--- a/ext/afform/html/afform_html.civix.php
+++ b/ext/afform/html/afform_html.civix.php
@@ -91,9 +91,9 @@ function _afform_html_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
index 9714aef7d9..b28d263901 100644
--- a/ext/afform/mock/afform_mock.civix.php
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -91,9 +91,9 @@ function _afform_mock_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/authx/authx.civix.php b/ext/authx/authx.civix.php
index 6a25c05c5c..3320d7a451 100644
--- a/ext/authx/authx.civix.php
+++ b/ext/authx/authx.civix.php
@@ -91,9 +91,9 @@ function _authx_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/civigrant/civigrant.civix.php b/ext/civigrant/civigrant.civix.php
index 2d59c9e814..dcf1934b5b 100644
--- a/ext/civigrant/civigrant.civix.php
+++ b/ext/civigrant/civigrant.civix.php
@@ -91,9 +91,9 @@ function _civigrant_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/ckeditor4/ckeditor4.civix.php b/ext/ckeditor4/ckeditor4.civix.php
index bb862286b5..17a0475106 100644
--- a/ext/ckeditor4/ckeditor4.civix.php
+++ b/ext/ckeditor4/ckeditor4.civix.php
@@ -91,9 +91,9 @@ function _ckeditor4_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/contributioncancelactions/contributioncancelactions.civix.php b/ext/contributioncancelactions/contributioncancelactions.civix.php
index 7f1e9712e9..af68033f7b 100644
--- a/ext/contributioncancelactions/contributioncancelactions.civix.php
+++ b/ext/contributioncancelactions/contributioncancelactions.civix.php
@@ -91,9 +91,9 @@ function _contributioncancelactions_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/eventcart/eventcart.civix.php b/ext/eventcart/eventcart.civix.php
index bec41bc7f2..bdce986d6e 100644
--- a/ext/eventcart/eventcart.civix.php
+++ b/ext/eventcart/eventcart.civix.php
@@ -91,9 +91,9 @@ function _eventcart_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/ewaysingle/ewaysingle.civix.php b/ext/ewaysingle/ewaysingle.civix.php
index 474030a1c2..d94d1fa614 100644
--- a/ext/ewaysingle/ewaysingle.civix.php
+++ b/ext/ewaysingle/ewaysingle.civix.php
@@ -91,9 +91,9 @@ function _ewaysingle_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/financialacls/financialacls.civix.php b/ext/financialacls/financialacls.civix.php
index d9ade0d325..6948a1e926 100644
--- a/ext/financialacls/financialacls.civix.php
+++ b/ext/financialacls/financialacls.civix.php
@@ -91,9 +91,9 @@ function _financialacls_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/flexmailer/flexmailer.civix.php b/ext/flexmailer/flexmailer.civix.php
index 0935d49cc3..becfec49fc 100644
--- a/ext/flexmailer/flexmailer.civix.php
+++ b/ext/flexmailer/flexmailer.civix.php
@@ -91,9 +91,9 @@ function _flexmailer_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/greenwich/greenwich.civix.php b/ext/greenwich/greenwich.civix.php
index a1903f1e90..c7649fd1e9 100644
--- a/ext/greenwich/greenwich.civix.php
+++ b/ext/greenwich/greenwich.civix.php
@@ -91,9 +91,9 @@ function _greenwich_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/legacycustomsearches/legacycustomsearches.civix.php b/ext/legacycustomsearches/legacycustomsearches.civix.php
index 25b8eb3f5a..3cb227a420 100644
--- a/ext/legacycustomsearches/legacycustomsearches.civix.php
+++ b/ext/legacycustomsearches/legacycustomsearches.civix.php
@@ -91,9 +91,9 @@ function _legacycustomsearches_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/message_admin/message_admin.civix.php b/ext/message_admin/message_admin.civix.php
index 3de3912c36..483d0b9c07 100644
--- a/ext/message_admin/message_admin.civix.php
+++ b/ext/message_admin/message_admin.civix.php
@@ -91,9 +91,9 @@ function _message_admin_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/oauth-client/oauth_client.civix.php b/ext/oauth-client/oauth_client.civix.php
index f4fc3b0468..3d9ae5d3f5 100644
--- a/ext/oauth-client/oauth_client.civix.php
+++ b/ext/oauth-client/oauth_client.civix.php
@@ -91,9 +91,9 @@ function _oauth_client_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/payflowpro/payflowpro.civix.php b/ext/payflowpro/payflowpro.civix.php
index 981716e9d6..02c9abccac 100644
--- a/ext/payflowpro/payflowpro.civix.php
+++ b/ext/payflowpro/payflowpro.civix.php
@@ -91,9 +91,10 @@ function _payflowpro_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__
+    . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/recaptcha/recaptcha.civix.php b/ext/recaptcha/recaptcha.civix.php
index 3b0feb3880..dc51b7677d 100644
--- a/ext/recaptcha/recaptcha.civix.php
+++ b/ext/recaptcha/recaptcha.civix.php
@@ -91,9 +91,9 @@ function _recaptcha_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/search_kit/search_kit.civix.php b/ext/search_kit/search_kit.civix.php
index dde94ac937..6cac24cef1 100644
--- a/ext/search_kit/search_kit.civix.php
+++ b/ext/search_kit/search_kit.civix.php
@@ -91,9 +91,9 @@ function _search_kit_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php b/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php
index 260b7128fc..098dde7d07 100644
--- a/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php
+++ b/ext/sequentialcreditnotes/sequentialcreditnotes.civix.php
@@ -91,9 +91,9 @@ function _sequentialcreditnotes_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/tests/extensions/shimmy/shimmy.civix.php b/tests/extensions/shimmy/shimmy.civix.php
index 33dce52cbf..8ed705ff74 100644
--- a/tests/extensions/shimmy/shimmy.civix.php
+++ b/tests/extensions/shimmy/shimmy.civix.php
@@ -98,9 +98,9 @@ function _shimmy_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/tools/extensions/org.civicrm.angularex/angularex.civix.php b/tools/extensions/org.civicrm.angularex/angularex.civix.php
index 308a7699e5..3943cced70 100644
--- a/tools/extensions/org.civicrm.angularex/angularex.civix.php
+++ b/tools/extensions/org.civicrm.angularex/angularex.civix.php
@@ -91,9 +91,9 @@ function _angularex_civix_civicrm_config(&$config = NULL) {
   }
   $configured = TRUE;
 
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
diff --git a/tools/extensions/org.civicrm.demoqueue/demoqueue.civix.php b/tools/extensions/org.civicrm.demoqueue/demoqueue.civix.php
index 2f643279de..b722efa38f 100644
--- a/tools/extensions/org.civicrm.demoqueue/demoqueue.civix.php
+++ b/tools/extensions/org.civicrm.demoqueue/demoqueue.civix.php
@@ -7,9 +7,9 @@
  * @param $config
  */
 function _demoqueue_civix_civicrm_config(&$config) {
-  $template =& CRM_Core_Smarty::singleton();
+  $template = CRM_Core_Smarty::singleton();
 
-  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extRoot = __DIR__ . DIRECTORY_SEPARATOR;
   $extDir = $extRoot . 'templates';
 
   if (is_array($template->template_dir)) {
-- 
2.25.1