Merge pull request #27581 from eileenmcnaughton/smarty_small

dev/core##4146 Remove unused variables from custom smarty functions
civicrm · Sep 27, 2023 · 2e93a3a · 2e93a3a
2 parents 5e41bf9 + 490b216
commit 2e93a3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php b/CRM/Core/Smarty/plugins/prefilter.htxtFilter.php
@@ -6,10 +6,9 @@
  * evaluate unassigned variables.
  *
  * @param string $tpl_source
- * @param $smarty
  * @return string
  */
-function smarty_prefilter_htxtFilter($tpl_source, &$smarty) {
+function smarty_prefilter_htxtFilter($tpl_source) {
   if (strpos($tpl_source, '{htxt') === FALSE) {
     return $tpl_source;
   }

diff --git a/CRM/Core/Smarty/plugins/prefilter.resetExtScope.php b/CRM/Core/Smarty/plugins/prefilter.resetExtScope.php
@@ -3,11 +3,11 @@
 /**
  * Wrap every Smarty template in a {crmScope} tag that sets the
  * variable "extensionKey" to blank.
- * @param $tpl_source
- * @param $smarty
+ * @param string $tpl_source
+ *
  * @return string
  */
-function smarty_prefilter_resetExtScope($tpl_source, &$smarty) {
+function smarty_prefilter_resetExtScope($tpl_source) {
   return '{crmScope extensionKey=""}'
     . $tpl_source
     . '{/crmScope}';

diff --git a/CRM/Core/Smarty/resources/String.php b/CRM/Core/Smarty/resources/String.php
@@ -15,42 +15,35 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  * @param $tpl_name
  * @param $tpl_source
- * @param $smarty_obj
  *
  * @return bool
  */
-function civicrm_smarty_resource_string_get_template($tpl_name, &$tpl_source, &$smarty_obj) {
+function civicrm_smarty_resource_string_get_template($tpl_name, &$tpl_source) {
   $tpl_source = $tpl_name;
   return TRUE;
 }
 
 /**
  * @param string $tpl_name
  * @param $tpl_timestamp
- * @param CRM_Core_Smarty $smarty_obj
  *
  * @return bool
  */
-function civicrm_smarty_resource_string_get_timestamp($tpl_name, &$tpl_timestamp, &$smarty_obj) {
+function civicrm_smarty_resource_string_get_timestamp($tpl_name, &$tpl_timestamp) {
   $tpl_timestamp = time();
   return TRUE;
 }
 
 /**
- * @param string $tpl_name
- * @param CRM_Core_Smarty $smarty_obj
- *
  * @return bool
  */
-function civicrm_smarty_resource_string_get_secure($tpl_name, &$smarty_obj) {
+function civicrm_smarty_resource_string_get_secure() {
   return TRUE;
 }
 
 /**
- * @param string $tpl_name
- * @param CRM_Core_Smarty $smarty_obj
  */
-function civicrm_smarty_resource_string_get_trusted($tpl_name, &$smarty_obj) {
+function civicrm_smarty_resource_string_get_trusted() {
 
 }