whitespace

Fixes #813

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Include docs and demo in the releases [#799](https://github.com/smarty-php/smarty/issues/799)
+- Using PHP functions as modifiers now triggers a deprecation notice because we will drop support for this in the next major release [#813](https://github.com/smarty-php/smarty/issues/813) 
 
 ### Fixed
 - Output buffer is now cleaned for internal PHP errors as well, not just for Exceptions [#514](https://github.com/smarty-php/smarty/issues/514)
@@ -16,7 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix Variable Usage in Exception message when unable to load subtemplate [#808](https://github.com/smarty-php/smarty/pull/808)
 - Fixed PHP8.1 deprecation notices for strftime [#672](https://github.com/smarty-php/smarty/issues/672)
 - Fixed PHP8.1 deprecation errors passing null to parameter in trim [#807](https://github.com/smarty-php/smarty/pull/807)
-- Adapt Smarty upper/lower functions to be codesafe (e.g. for Turkish locale) [#586](https://github.com/smarty-php/smarty/pull/586)
 
 ## [4.2.1] - 2022-09-14
 

libs/Autoloader.php

@@ -5,11 +5,6 @@
  * @package Smarty
  */
 
-
-if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
-	include dirname(__FILE__) . '/functions.php';
-}
-
 /**
  * Smarty Autoloader
  *
@@ -94,7 +89,7 @@ class Smarty_Autoloader
         if ($class[ 0 ] !== 'S' || strpos($class, 'Smarty') !== 0) {
             return;
         }
-        $_class = smarty_strtolower_ascii($class);
+        $_class = strtolower($class);
         if (isset(self::$rootClasses[ $_class ])) {
             $file = self::$SMARTY_DIR . self::$rootClasses[ $_class ];
             if (is_file($file)) {

libs/Smarty.class.php

@@ -60,21 +60,12 @@ if (!defined('SMARTY_MBSTRING')) {
      */
     define('SMARTY_MBSTRING', function_exists('mb_get_info'));
 }
-
-/**
- * Load helper functions
- */
-if (!defined('SMARTY_HELPER_FUNCTIONS_LOADED')) {
-    include dirname(__FILE__) . '/functions.php';
-}
-
 /**
  * Load Smarty_Autoloader
  */
 if (!class_exists('Smarty_Autoloader')) {
     include dirname(__FILE__) . '/bootstrap.php';
 }
-
 /**
  * Load always needed external class files
  */

libs/functions.php

@@ -1,51 +0,0 @@
-<?php
-/**
- * This file is part of the Smarty package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-/**
- * Registers some helper/polyfill functions.
- */
-
-const SMARTY_HELPER_FUNCTIONS_LOADED = true;
-
-/**
- * Converts the first characters in $string to uppercase (A-Z) if it is an ASCII lowercase character (a-z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_ucfirst_ascii($string): string {
-    return smarty_strtoupper_ascii(substr($string, 0, 1)) . substr($string, 1);
-}
-
-/**
- * Converts all uppercase ASCII characters (A-Z) in $string to lowercase (a-z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_strtolower_ascii($string): string {
-    return strtr($string, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
-}
-
-/**
- * Converts all lowercase ASCII characters (a-z) in $string to uppercase (A-Z).
- *
- * May not be required when running PHP8.2+: https://wiki.php.net/rfc/strtolower-ascii
- *
- * @param $string
- *
- * @return string
- */
-function smarty_strtoupper_ascii($string): string {
-    return strtr($string, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-}

libs/plugins/modifier.count.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifier
+ */
+/**
+ * Smarty count modifier plugin
+ * Type:     modifier
+ * Name:     count
+ * Purpose:  counts all elements in an array or in a Countable object
+ * Input:
+ *          - Countable|array: array or object to count
+ *          - mode: int defaults to 0 for normal count mode, if set to 1 counts recursive
+  *
+ * @param mixed $arrayOrObject  input array/object
+ * @param int $mode       count mode
+ *
+ * @return int
+ */
+function smarty_modifier_count($arrayOrObject, $mode = 0)
+{
+    /*
+     * @see https://www.php.net/count
+     * > Prior to PHP 8.0.0, if the parameter was neither an array nor an object that implements the Countable interface,
+     * > 1 would be returned, unless value was null, in which case 0 would be returned.
+     */
+
+    if ($arrayOrObject instanceof Countable || is_array($arrayOrObject)) {
+        return count($arrayOrObject, (int) $mode);
+    } elseif ($arrayOrObject === null) {
+        return 0;
+    }
+    return 1;
+}

libs/plugins/modifiercompiler.nl2br.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty nl2br modifier plugin
+ * Type:     modifier
+ * Name:     nl2br
+ * Purpose:  insert HTML line breaks before all newlines in a string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.nl2br.tpl nl2br (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_nl2br($params) {
+    return 'nl2br((string) ' . $params[0] . ', (bool) ' . ($params[1] ?? true) . ')';
+}

libs/plugins/modifiercompiler.round.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty round modifier plugin
+ * Type:     modifier
+ * Name:     round
+ * Purpose:  Returns the rounded value of num to specified precision (number of digits after the decimal point)
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.round.tpl round (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_round($params) {
+    return 'round((float) ' . $params[0] . ', (int) ' . ($params[1] ?? 0) . ', (int) ' . ($params[2] ?? PHP_ROUND_HALF_UP) . ')';
+}

libs/plugins/modifiercompiler.str_repeat.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty str_repeat modifier plugin
+ * Type:     modifier
+ * Name:     str_repeat
+ * Purpose:  returns string repeated times times
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.str_repeat.tpl str_repeat (Smarty online manual)
+ *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_str_repeat($params) {
+    return 'str_repeat((string) ' . $params[0] . ', (int) ' . $params[1] . ')';
+}

libs/plugins/modifiercompiler.strlen.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Smarty plugin
+ *
+ * @package    Smarty
+ * @subpackage PluginsModifierCompiler
+ */
+/**
+ * Smarty strlen modifier plugin
+ * Type:     modifier
+ * Name:     strlen
+ * Purpose:  return the length of the given string
+ *
+ * @link   https://www.smarty.net/docs/en/language.modifier.strlen.tpl strlen (Smarty online manual)
+  *
+ * @param array $params parameters
+ *
+ * @return string with compiled code
+ */
+function smarty_modifiercompiler_strlen($params) {
+    return 'strlen((string) ' . $params[0] . ')';
+}

libs/sysplugins/smarty_cacheresource.php

@@ -205,11 +205,11 @@ abstract class Smarty_CacheResource
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $cache_resource_class = 'Smarty_Internal_CacheResource_' . smarty_ucfirst_ascii($type);
+            $cache_resource_class = 'Smarty_Internal_CacheResource_' . ucfirst($type);
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }
         // try plugins dir
-        $cache_resource_class = 'Smarty_CacheResource_' . smarty_ucfirst_ascii($type);
+        $cache_resource_class = 'Smarty_CacheResource_' . ucfirst($type);
         if ($smarty->loadPlugin($cache_resource_class)) {
             return $smarty->_cache[ 'cacheresource_handlers' ][ $type ] = new $cache_resource_class();
         }

libs/sysplugins/smarty_internal_compile_private_foreachsection.php

@@ -143,7 +143,7 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
         foreach ($this->resultOffsets as $key => $offset) {
             foreach ($match[ $offset ] as $m) {
                 if (!empty($m)) {
-                    $this->matchResults[ $key ][ smarty_strtolower_ascii($m) ] = true;
+                    $this->matchResults[ $key ][ strtolower($m) ] = true;
                 }
             }
         }
@@ -213,12 +213,12 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
      */
     public function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
-        $tag = smarty_strtolower_ascii(trim($parameter[ 0 ], '"\''));
+        $tag = strtolower(trim($parameter[ 0 ], '"\''));
         $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
         if (!$name) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
         }
-        $property = isset($parameter[ 2 ]) ? smarty_strtolower_ascii($compiler->getId($parameter[ 2 ])) : false;
+        $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
         if (!$property || !in_array($property, $this->nameProperties)) {
             $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
         }

libs/sysplugins/smarty_internal_compile_private_modifier.php

@@ -109,6 +109,9 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
                             if (!is_object($compiler->smarty->security_policy)
                                 || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
                             ) {
+                                trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' .
+                                    'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
+                                    'a custom modifier.', E_USER_DEPRECATED);
                                 $output = "{$modifier}({$params})";
                             }
                             $compiler->known_modifier_type[ $modifier ] = $type;

libs/sysplugins/smarty_internal_compile_private_special_variable.php

@@ -29,7 +29,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
     public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
     {
         $_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
-        $variable = smarty_strtolower_ascii($compiler->getId($_index[ 0 ]));
+        $variable = strtolower($compiler->getId($_index[ 0 ]));
         if ($variable === false) {
             $compiler->trigger_template_error("special \$Smarty variable name index can not be variable", null, true);
         }
@@ -40,7 +40,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                 case 'foreach':
                 case 'section':
                     if (!isset(Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ])) {
-                        $class = 'Smarty_Internal_Compile_' . smarty_ucfirst_ascii($variable);
+                        $class = 'Smarty_Internal_Compile_' . ucfirst($variable);
                         Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ] = new $class;
                     }
                     return Smarty_Internal_TemplateCompilerBase::$_tag_objects[ $variable ]->compileSpecialVariable(
@@ -76,7 +76,7 @@ class Smarty_Internal_Compile_Private_Special_Variable extends Smarty_Internal_C
                         $compiler->trigger_template_error("(secure mode) super globals not permitted");
                         break;
                     }
-                    $compiled_ref = '$_' . smarty_strtoupper_ascii($variable);
+                    $compiled_ref = '$_' . strtoupper($variable);
                     break;
                 case 'template':
                     return 'basename($_smarty_tpl->source->filepath)';

libs/sysplugins/smarty_internal_extension_handler.php

@@ -88,19 +88,20 @@ class Smarty_Internal_Extension_Handler
                         $objType = $data->_objType;
                         $propertyType = false;
                         if (!isset($this->resolvedProperties[ $match[ 0 ] ][ $objType ])) {
-                            $property = $this->resolvedProperties['property'][$basename] ??
-                                $this->resolvedProperties['property'][$basename] = smarty_strtolower_ascii(
-                                join(
-                                    '_',
-                                    preg_split(
-                                        '/([A-Z][^A-Z]*)/',
-                                        $basename,
-                                        -1,
-                                        PREG_SPLIT_NO_EMPTY |
-                                        PREG_SPLIT_DELIM_CAPTURE
+                            $property = isset($this->resolvedProperties[ 'property' ][ $basename ]) ?
+                                $this->resolvedProperties[ 'property' ][ $basename ] :
+                                $property = $this->resolvedProperties[ 'property' ][ $basename ] = strtolower(
+                                    join(
+                                        '_',
+                                        preg_split(
+                                            '/([A-Z][^A-Z]*)/',
+                                            $basename,
+                                            -1,
+                                            PREG_SPLIT_NO_EMPTY |
+                                            PREG_SPLIT_DELIM_CAPTURE
+                                        )
                                     )
-                                )
-                            );
+                                );
                             if ($property !== false) {
                                 if (property_exists($data, $property)) {
                                     $propertyType = $this->resolvedProperties[ $match[ 0 ] ][ $objType ] = 1;
@@ -144,7 +145,7 @@ class Smarty_Internal_Extension_Handler
     public function upperCase($name)
     {
         $_name = explode('_', $name);
-        $_name = array_map('smarty_ucfirst_ascii', $_name);
+        $_name = array_map('ucfirst', $_name);
         return implode('_', $_name);
     }
 

libs/sysplugins/smarty_internal_method_loadplugin.php

@@ -40,7 +40,7 @@ class Smarty_Internal_Method_LoadPlugin
             throw new SmartyException("plugin {$plugin_name} is not a valid name format");
         }
         if (!empty($match[ 2 ])) {
-            $file = SMARTY_SYSPLUGINS_DIR . smarty_strtolower_ascii($plugin_name) . '.php';
+            $file = SMARTY_SYSPLUGINS_DIR . strtolower($plugin_name) . '.php';
             if (isset($this->plugin_files[ $file ])) {
                 if ($this->plugin_files[ $file ] !== false) {
                     return $this->plugin_files[ $file ];
@@ -60,7 +60,7 @@ class Smarty_Internal_Method_LoadPlugin
         }
         // plugin filename is expected to be: [type].[name].php
         $_plugin_filename = "{$match[1]}.{$match[4]}.php";
-        $_lower_filename = smarty_strtolower_ascii($_plugin_filename);
+        $_lower_filename = strtolower($_plugin_filename);
         if (isset($this->plugin_files)) {
             if (isset($this->plugin_files[ 'plugins_dir' ][ $_lower_filename ])) {
                 if (!$smarty->use_include_path || $this->plugin_files[ 'plugins_dir' ][ $_lower_filename ] !== false) {

libs/sysplugins/smarty_internal_templatecompilerbase.php

@@ -605,7 +605,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
             if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
                 || strcasecmp($name, 'array') === 0 || is_callable($name)
             ) {
-                $func_name = smarty_strtolower_ascii($name);
+                $func_name = strtolower($name);
 
                 if ($func_name === 'isset') {
                     if (count($parameter) === 0) {
@@ -765,7 +765,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
         if (!isset(self::$_tag_objects[ $tag ])) {
             // lazy load internal compiler plugin
             $_tag = explode('_', $tag);
-            $_tag = array_map('smarty_ucfirst_ascii', $_tag);
+            $_tag = array_map('ucfirst', $_tag);
             $class_name = 'Smarty_Internal_Compile_' . implode('_', $_tag);
             if (class_exists($class_name)
                 && (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this))

libs/sysplugins/smarty_resource.php

@@ -76,11 +76,11 @@ abstract class Smarty_Resource
         }
         // try sysplugins dir
         if (isset(self::$sysplugins[ $type ])) {
-            $_resource_class = 'Smarty_Internal_Resource_' . smarty_ucfirst_ascii($type);
+            $_resource_class = 'Smarty_Internal_Resource_' . ucfirst($type);
             return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();
         }
         // try plugins dir
-        $_resource_class = 'Smarty_Resource_' . smarty_ucfirst_ascii($type);
+        $_resource_class = 'Smarty_Resource_' . ucfirst($type);
         if ($smarty->loadPlugin($_resource_class)) {
             if (class_exists($_resource_class, false)) {
                 return $smarty->_cache[ 'resource_handlers' ][ $type ] = new $_resource_class();

libs/sysplugins/smarty_security.php

@@ -105,7 +105,7 @@ class Smarty_Security
      *
      * @var array
      */
-    public $php_modifiers = array('escape', 'count', 'nl2br',);
+    public $php_modifiers = array('escape', 'count', 'sizeof', 'nl2br',);
 
     /**
      * This is an array of allowed tags.
@@ -328,7 +328,7 @@ class Smarty_Security
      *
      * @param string $modifier_name
      * @param object $compiler compiler object
-     *
+     * @deprecated
      * @return boolean                 true if modifier is trusted
      */
     public function isTrustedPhpModifier($modifier_name, $compiler)

tests/UnitTests/SecurityTests/SecurityTest.php

@@ -52,7 +52,7 @@ class SecurityTest extends PHPUnit_Smarty
  */
     public function testTrustedPHPFunction()
     {
-        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{count($foo)}'));
+        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{sizeof($foo)}'));
     }
 
 /**
@@ -63,9 +63,9 @@ class SecurityTest extends PHPUnit_Smarty
     public function testNotTrustedPHPFunction()
     {
         $this->expectException('SmartyException');
-        $this->expectExceptionMessage('PHP function \'count\' not allowed by security setting');
+        $this->expectExceptionMessage('PHP function \'sizeof\' not allowed by security setting');
         $this->smarty->security_policy->php_functions = array('null');
-        $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{count($foo)}');
+        $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{sizeof($foo)}');
     }
 
 /**
@@ -75,38 +75,41 @@ class SecurityTest extends PHPUnit_Smarty
     {
         $this->smarty->security_policy->php_functions = array('null');
         $this->smarty->disableSecurity();
-        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{count($foo)}'));
+        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{sizeof($foo)}'));
     }
 
 /**
  * test trusted modifier
+ * @deprecated
  */
     public function testTrustedModifier()
     {
-        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@count}'));
+        $this->assertEquals("5", @$this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@sizeof}'));
     }
 
 /**
  * test not trusted modifier
   * @runInSeparateProcess
   * @preserveGlobalState disabled
+ *  @deprecated
  */
     public function testNotTrustedModifier()
     {
         $this->expectException('SmartyException');
-        $this->expectExceptionMessage('modifier \'count\' not allowed by security setting');
+        $this->expectExceptionMessage('modifier \'sizeof\' not allowed by security setting');
         $this->smarty->security_policy->php_modifiers = array('null');
-        $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@count}');
+        @$this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@sizeof}');
     }
 
 /**
  * test not trusted modifier at disabled security
+ * @deprecated
  */
     public function testDisabledTrustedModifier()
     {
         $this->smarty->security_policy->php_modifiers = array('null');
         $this->smarty->disableSecurity();
-        $this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@count}'));
+        @$this->assertEquals("5", $this->smarty->fetch('string:{assign var=foo value=[1,2,3,4,5]}{$foo|@sizeof}'));
     }
 
 /**

tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php

@@ -40,14 +40,14 @@ class RegisterBlockTest extends PHPUnit_Smarty
     {
         $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'testblock', 'myblock');
         $this->smarty->assign('value', 1);
-        $this->assertEquals(strtoupper('function hello world 1 1 function hello world 1 2 function hello world 1 3 '), $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock|strtoupper}'));
+        $this->assertEquals(strtoupper('function hello world 1 1 function hello world 1 2 function hello world 1 3 '), $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock|upper}'));
     }
 
     public function testRegisterBlockFunctionModifier2()
     {
         $this->smarty->registerPlugin(Smarty::PLUGIN_BLOCK, 'testblock', 'myblock');
         $this->smarty->assign('value', 1);
-        $this->assertEquals(strtoupper('function hello world 1 1 function hello world 1 2 function hello world 1 3 '), $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock|default:""|strtoupper}'));
+        $this->assertEquals(strtoupper('function hello world 1 1 function hello world 1 2 function hello world 1 3 '), $this->smarty->fetch('eval:{testblock}hello world {$value}{/testblock|default:""|upper}'));
     }
 
     public function testRegisterBlockFunctionWrapper()

tests/UnitTests/SmartyMethodsTests/RegisterObject/CompileRegisteredObjectFunctionTest.php

@@ -60,13 +60,13 @@ class CompileRegisteredObjectFunctionTest extends PHPUnit_Smarty
 
     public function testRegisteredObjectBlockFunctionModifier1()
     {
-        $tpl = $this->smarty->createTemplate('eval:{objecttest->myblock}hello world{/objecttest->myblock|strtoupper}');
+        $tpl = $this->smarty->createTemplate('eval:{objecttest->myblock}hello world{/objecttest->myblock|upper}');
         $this->assertEquals(strtoupper('block test'), $this->smarty->fetch($tpl));
     }
 
     public function testRegisteredObjectBlockFunctionModifier2()
     {
-        $tpl = $this->smarty->createTemplate('eval:{objecttest->myblock}hello world{/objecttest->myblock|default:""|strtoupper}');
+        $tpl = $this->smarty->createTemplate('eval:{objecttest->myblock}hello world{/objecttest->myblock|default:""|upper}');
         $this->assertEquals(strtoupper('block test'), $this->smarty->fetch($tpl));
     }
     // TODO

tests/UnitTests/TemplateSource/TagTests/Append/CompileAppendTest.php

@@ -21,6 +21,7 @@ class CompileAppendTest extends PHPUnit_Smarty
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
         $this->smarty->addTemplateDir("../../../__shared/templates/");
         $this->smarty->addTemplateDir("./templates_tmp");
+        $this->smarty->registerPlugin('modifier', 'var_export', 'var_export');
     }
 
     public function testInit()

tests/UnitTests/TemplateSource/TagTests/Assign/CompileAssignTest.php

@@ -21,6 +21,7 @@ class CompileAssignTest extends PHPUnit_Smarty
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
         $this->smarty->addTemplateDir("../../../__shared/templates/");
         $this->smarty->addTemplateDir("./templates_tmp");
+        $this->smarty->registerPlugin('modifier', 'var_export', 'var_export');
     }
 
     public function testInit()

tests/UnitTests/TemplateSource/TagTests/If/CompileIfTest.php

@@ -21,6 +21,7 @@ class CompileIfTest extends PHPUnit_Smarty
         $this->smarty->addPluginsDir("../../../__shared/PHPunitplugins/");
         $this->smarty->addTemplateDir("../../../__shared/templates/");
         $this->smarty->addTemplateDir("./templates_tmp");
+        $this->smarty->registerPlugin('modifier', 'var_export', 'var_export');
     }
 
     public function testInit()

tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierCountTest.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierCountTest extends PHPUnit_Smarty
+{
+    public function setUp(): void
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testArray()
+    {
+        $tpl = $this->smarty->createTemplate('string:count:{$v|count}');
+        $tpl->assign("v", array(1, 2, 3));
+        $this->assertEquals("count:3", $this->smarty->fetch($tpl));
+    }
+
+    public function testEmptyArray()
+    {
+        $tpl = $this->smarty->createTemplate('string:count:{$v|count}');
+        $tpl->assign("v", array());
+        $this->assertEquals("count:0", $this->smarty->fetch($tpl));
+    }
+
+    public function testNull()
+    {
+        $tpl = $this->smarty->createTemplate('string:count:{$v|count}');
+        $tpl->assign("v", null);
+        $this->assertEquals("count:0", $this->smarty->fetch($tpl));
+    }
+
+    public function testString()
+    {
+        $tpl = $this->smarty->createTemplate('string:count:{$v|count}');
+        $tpl->assign("v", "string");
+        $this->assertEquals("count:1", $this->smarty->fetch($tpl));
+    }
+
+}

tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierExplodeTest.php

@@ -14,6 +14,7 @@ class PluginModifierExplodeTest extends \PHPUnit_Smarty
     public function setUp(): void
     {
         $this->setUpSmarty(__DIR__);
+        $this->smarty->registerPlugin('modifier', 'json_encode', 'json_encode');
     }
 
     /**

tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierNl2brTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierNl2brTest extends PHPUnit_Smarty
+{
+    public function setUp(): void
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testDefault()
+    {
+        $tpl = $this->smarty->createTemplate('string:{$v|nl2br}');
+        $tpl->assign("v", "Line1\nLine2");
+        $this->assertEquals("Line1<br />\nLine2", $this->smarty->fetch($tpl));
+    }
+
+    public function testNoXHTML()
+    {
+        $tpl = $this->smarty->createTemplate('string:{$v|nl2br:false}');
+        $tpl->assign("v", "Line1\nLine2");
+        $this->assertEquals("Line1<br>\nLine2", $this->smarty->fetch($tpl));
+    }
+}

tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierStrRepeatTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Smarty PHPunit tests of modifier
+ */
+
+/**
+ * class for modifier tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState    disabled
+ * @backupStaticAttributes enabled
+ */
+class PluginModifierStrRepeatTest extends PHPUnit_Smarty
+{
+    public function setUp(): void
+    {
+        $this->setUpSmarty(dirname(__FILE__));
+    }
+
+    public function testDefault()
+    {
+        $tpl = $this->smarty->createTemplate('string:{$v|str_repeat:2}');
+        $tpl->assign("v", "foo");
+        $this->assertEquals("foofoo", $this->smarty->fetch($tpl));
+    }
+
+    public function testZeroTimes()
+    {
+        $tpl = $this->smarty->createTemplate('string:{$v|str_repeat:0}');
+        $tpl->assign("v", "foo");
+        $this->assertEquals("", $this->smarty->fetch($tpl));
+    }
+}

tests/UnitTests/TemplateSource/ValueTests/Math/MathTest.php

@@ -18,6 +18,7 @@ class MathTest extends PHPUnit_Smarty
     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->registerPlugin('modifier', 'sin', 'sin');
     }
 
     public function testInit()
@@ -104,7 +105,7 @@ class MathTest extends PHPUnit_Smarty
     {
         $this->smarty->disableSecurity();
         $expected = "22.00 -- 4.10";
-        $tpl = $this->smarty->createTemplate('eval:{$x = 4}{$y = 5.5}{$z = $x * $y}{"%0.2f"|sprintf:$z} -- {$x = 20.5}{$y = 5}{$z = $x / $y}{"%0.2f"|sprintf:$z}');
+        $tpl = $this->smarty->createTemplate('eval:{$x = 4}{$y = 5.5}{$z = $x * $y}{$z|string_format:"%0.2f"} -- {$x = 20.5}{$y = 5}{$z = $x / $y}{$z|string_format:"%0.2f"}');
         $this->assertEquals($expected, $this->smarty->fetch($tpl));
     }
 
@@ -120,7 +121,7 @@ class MathTest extends PHPUnit_Smarty
     {
         $this->smarty->disableSecurity();
         $expected = "22.00 -- 4.10";
-        $tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{$z = $x * $y}{"%0.2f"|sprintf:$z} -- {$x = "20.5"}{$y = "5"}{$z = $x / $y}{"%0.2f"|sprintf:$z}');
+        $tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{$z = $x * $y}{$z|string_format:"%0.2f"} -- {$x = "20.5"}{$y = "5"}{$z = $x / $y}{$z|string_format:"%0.2f"}');
         $this->assertEquals($expected, $this->smarty->fetch($tpl));
     }
 
@@ -132,36 +133,36 @@ class MathTest extends PHPUnit_Smarty
         $this->assertEquals($expected, $this->smarty->fetch($tpl));
     }
 
-	public function testBackticksIllegal()
-	{
-		$this->expectException(PHPUnit\Framework\Error\Warning::class);
-		$expected = "22.00";
-		$tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="`ls` x * y" x=$x y=$y}');
-		$this->assertEquals($expected, $this->smarty->fetch($tpl));
-	}
+    public function testBackticksIllegal()
+    {
+        $this->expectException(PHPUnit\Framework\Error\Warning::class);
+        $expected = "22.00";
+        $tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="`ls` x * y" x=$x y=$y}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
 
-	public function testDollarSignsIllegal()
-	{
-		$this->expectException(PHPUnit\Framework\Error\Warning::class);
-		$expected = "22.00";
-		$tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="$" x=$x y=$y}');
-		$this->assertEquals($expected, $this->smarty->fetch($tpl));
-	}
+    public function testDollarSignsIllegal()
+    {
+        $this->expectException(PHPUnit\Framework\Error\Warning::class);
+        $expected = "22.00";
+        $tpl = $this->smarty->createTemplate('eval:{$x = "4"}{$y = "5.5"}{math equation="$" x=$x y=$y}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
 
-	public function testBracketsIllegal()
-	{
-		$this->expectException(PHPUnit\Framework\Error\Warning::class);
-		$expected = "I";
-		$tpl = $this->smarty->createTemplate('eval:{$x = "0"}{$y = "1"}{math equation="((y/x).(x))[x]" x=$x y=$y}');
-		$this->assertEquals($expected, $this->smarty->fetch($tpl));
-	}
+    public function testBracketsIllegal()
+    {
+        $this->expectException(PHPUnit\Framework\Error\Warning::class);
+        $expected = "I";
+        $tpl = $this->smarty->createTemplate('eval:{$x = "0"}{$y = "1"}{math equation="((y/x).(x))[x]" x=$x y=$y}');
+        $this->assertEquals($expected, $this->smarty->fetch($tpl));
+    }
 
-	public function testRand()
-	{
-		$tpl = $this->smarty->createTemplate('eval:{$x = "0"}{math equation="x * rand()" x=$x}');
-		// this assertion may seem silly, but it serves to prove that using rand() without a parameter
-		// will not trigger a security error (see https://github.com/smarty-php/smarty/issues/794)
-		$this->assertEquals("0", $this->smarty->fetch($tpl));
-	}
+    public function testRand()
+    {
+        $tpl = $this->smarty->createTemplate('eval:{$x = "0"}{math equation="x * rand()" x=$x}');
+        // this assertion may seem silly, but it serves to prove that using rand() without a parameter
+        // will not trigger a security error (see https://github.com/smarty-php/smarty/issues/794)
+        $this->assertEquals("0", $this->smarty->fetch($tpl));
+    }
 
 }

tests/UnitTests/TemplateSource/_Issues/327/ModifierIssue327Test.php

@@ -18,6 +18,7 @@ class ModifierIssue327Test extends PHPUnit_Smarty
     public function setUp(): void
     {
         $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->registerPlugin('modifier', 'substr', 'substr');
     }
 
     public function testInit()