Merge branch 'release/4.5.4' into support/4

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.5.4] - 2024-08-14
+- Fixed that using `count()` would trigger a deprecation notice. [#813](https://github.com/smarty-php/smarty/issues/813)
+
+
 ## [4.5.3] - 2024-05-28
 - Fixed a code injection vulnerability in extends-tag. This addresses CVE-2024-35226.
 

libs/Smarty.class.php

@@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '4.5.3';
+    const SMARTY_VERSION = '4.5.4';
     /**
      * define variable scopes
      */

libs/sysplugins/smarty_internal_templatecompilerbase.php

@@ -658,7 +658,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
 					if (
 						!$this->smarty->loadPlugin('smarty_modifiercompiler_' . $name)
 						&& !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])
-						&& !in_array($name, ['time', 'join', 'is_array', 'in_array'])
+						&& !in_array($name, ['time', 'join', 'is_array', 'in_array', 'count'])
 					) {
 						trigger_error('Using unregistered function "' . $name . '" in a template is deprecated and will be ' .
 							'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .

tests/UnitTests/TemplateSource/ValueTests/PHPfunctions/PhpFunctionTest.php

@@ -247,6 +247,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
 		$this->smarty->assign('f', 3.14);
 
 		$errorMessage = '';
+		$output = '';
 
 		try {
 			$output = $this->smarty->fetch('string:' . $strTemplateSource);
@@ -282,6 +283,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
 			['{$a|substr:-1}', 'a', false],
 			['{$f|substr:-1}', '4', false],
 			['{$ar|count}', '2', false],
+			['{count($ar)}', '2', false],
 			['{foreach "."|explode:$f as $n}{$n}{/foreach}', '314', false],
 			['{"-"|implode:$ar}', '1-2', false],
 			['{"-"|join:$ar}', '1-2', false],