Documented all available modifiers

Fixes #939

CHANGELOG.md

@@ -6,31 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [5.0.0] - 2024-03-25
-- Fixed that scoped variables would overwrite parent scope [#952](https://github.com/smarty-php/smarty/issues/952)
-- Removed publicly accessible `$tpl->_var_stack` variable
-
-
-### Fixed
-- Too many shorthand attributes error when using a modifier as a function with more than 3 parameters in an expression [#949](https://github.com/smarty-php/smarty/issues/949)
-
-### Removed
-- Dropped support for undocumented `{time()}` added in v5.0.0 since we already have the documented `{$smarty.now}`
-
-## [5.0.0-rc3] - 2024-02-26
-
 ### Added
 - PHP8.3 support [#925](https://github.com/smarty-php/smarty/issues/925)
 - Backlink to GitHub in docs
 - Explain how to do escaping and set-up auto-escaping in docs [#865](https://github.com/smarty-php/smarty/issues/865)
 - Link to variable scope page in the documentation for the assign tag [#878](https://github.com/smarty-php/smarty/issues/878)
-- Add support for implode, substr and json_encode as modifiers/functions in templates [#939](https://github.com/smarty-php/smarty/issues/939)
-- Add template path to CompilerException to enable rich debug features [#935](https://github.com/smarty-php/smarty/issues/935)
 
 ### Fixed
 - The {debug} tag was broken in v5 [#922](https://github.com/smarty-php/smarty/issues/922)
 - Documentation on `{if $x is even by $y}` syntax
-- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)
 
 ## [5.0.0-rc2] - 2023-11-11
 

TODO.txt

@@ -29,4 +29,5 @@
 
 ## Unrelated / other
 - review (and avoid) use of 'clone' keyword
+- compiler->has_code seems silly. Why not have proper return values?
 - what is 'user literal support', why are unit tests skipped?

changelog/918.md

@@ -1 +0,0 @@
-- Internal compiler classes always return a string (the internal has_code flag has been removed for simplicity) [#918](https://github.com/smarty-php/smarty/pull/918)

changelog/930.md

@@ -0,0 +1 @@
+- Fix incorrect compilation of expressions when escape_html=true [#930](https://github.com/smarty-php/smarty/pull/930)

changelog/933.md

@@ -1 +0,0 @@
-- Using stream variables in templates now throws a deprecation notice [#933](https://github.com/smarty-php/smarty/pull/933)

changelog/937.md

@@ -1,2 +0,0 @@
-- Documented support for `{if $element is in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)
-- Added support for `{if $element is not in $array}` syntax [#937](https://github.com/smarty-php/smarty/issues/937)

changelog/939.md

@@ -0,0 +1 @@
+- Add support for implode, substr and json_encode as modifiers/functions in templates [#939](https://github.com/smarty-php/smarty/issues/939)

docs/api/variables/streams.md

@@ -10,7 +10,4 @@ template.
 {$foo:bar}
 ```
 
-NB. Support for using streams to call variables is deprecated since Smarty v5.1 and will be removed
-in a future version. 
-
 See also [`Template Resources`](../resources.md)

docs/designers/language-basic-syntax/language-syntax-operators.md

@@ -27,30 +27,6 @@ Various basic operators can be applied directly to variable values.
 > complex, it may be a good idea to move the bits that do not deal
 > explicitly with presentation to PHP by way of plugins or modifiers.
 
-## List
-The following is a list of recognized operators, which must be
-separated from surrounding elements by spaces. Note that items listed in
-\[brackets\] are optional. PHP equivalents are shown where applicable.
-
-| Operator           | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
-|--------------------|------------|----------------------|--------------------------------|--------------------|
-| ==                 | eq         | $a eq $b             | equals                         | ==                 |
-| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
-| >                  | gt         | $a gt $b             | greater than                   | >                  |
-| <                  | lt         | $a lt $b             | less than                      | <                  |
-| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
-| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
-| ===                |            | $a === 0             | check for identity             | ===                |
-| !                  | not        | not $a               | negation (unary)               | !                  |
-| %                  | mod        | $a mod $b            | modulo                         | %                  |
-| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
-| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
-| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
-| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
-| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
-| is in              |            | $a is in $b          | exists in array                | in_array($a, $b)   |
-| is \[not\] in      |            | $a is not in $b      | does not exist in array        | !in_array($a, $b)  |
-
 ## Ternary
 You can use the `?:` (or ternary) operator to test one expression and present the value
 of the second or third expression, based on the result of the test.

docs/designers/language-basic-syntax/language-syntax-variables.md

@@ -88,6 +88,9 @@ Object chaining:
 
 {$object->method1($x)->method2($y)}
 
+Direct PHP function access:
+
+{time()}
 ```
 
 > **Note**

docs/designers/language-builtin-functions/language-function-if.md

@@ -3,8 +3,32 @@
 `{if}` statements in Smarty have much the same flexibility as PHP
 [if](https://www.php.net/if) statements, with a few added features for the
 template engine. Every `{if}` must be paired with a matching `{/if}`.
-`{else}` and `{elseif}` are also permitted. All [operators](../language-basic-syntax/language-syntax-operators.md) are recognized, such as *==*,
-*\|\|*, *or*, *&&*, *and*, etc and you can use modifiers as functions, such as *is_array()*.
+`{else}` and `{elseif}` are also permitted. All PHP conditionals and
+functions are recognized, such as *\|\|*, *or*, *&&*, *and*,
+*is_array()*, etc.
+
+The following is a list of recognized qualifiers, which must be
+separated from surrounding elements by spaces. Note that items listed in
+\[brackets\] are optional. PHP equivalents are shown where applicable.
+
+## Qualifiers
+
+| Qualifier          | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
+|--------------------|------------|----------------------|--------------------------------|--------------------|
+| ==                 | eq         | $a eq $b             | equals                         | ==                 |
+| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
+| >                  | gt         | $a gt $b             | greater than                   | >                  |
+| <                  | lt         | $a lt $b             | less than                      | <                  |
+| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
+| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
+| ===                |            | $a === 0             | check for identity             | ===                |
+| !                  | not        | not $a               | negation (unary)               | !                  |
+| %                  | mod        | $a mod $b            | modulo                         | %                  |
+| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
+| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
+| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
+| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
+| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
 
 ## Examples
 ```smarty

docs/designers/language-builtin-functions/language-function-while.md

@@ -3,8 +3,31 @@
 `{while}` loops in Smarty have much the same flexibility as PHP
 [while](https://www.php.net/while) statements, with a few added features for
 the template engine. Every `{while}` must be paired with a matching
-`{/while}`. All [operators](../language-basic-syntax/language-syntax-operators.md) are recognized, such as *==*,
-*\|\|*, *or*, *&&*, *and*, etc and you can use modifiers as functions, such as *is_array()*.
+`{/while}`. All PHP conditionals and functions are recognized, such as
+*\|\|*, *or*, *&&*, *and*, *is_array()*, etc.
+
+The following is a list of recognized qualifiers, which must be
+separated from surrounding elements by spaces. Note that items listed in
+\[brackets\] are optional. PHP equivalents are shown where applicable.
+
+## Qualifiers
+
+| Qualifier          | Alternates | Syntax Example       | Meaning                        | PHP Equivalent     |
+|--------------------|------------|----------------------|--------------------------------|--------------------|
+| ==                 | eq         | $a eq $b             | equals                         | ==                 |
+| !=                 | ne, neq    | $a neq $b            | not equals                     | !=                 |
+| >                  | gt         | $a gt $b             | greater than                   | >                  |
+| <                  | lt         | $a lt $b             | less than                      | <                  |
+| >=                 | gte, ge    | $a ge $b             | greater than or equal          | >=                 |
+| <=                 | lte, le    | $a le $b             | less than or equal             | <=                 |
+| ===                |            | $a === 0             | check for identity             | ===                |
+| !                  | not        | not $a               | negation (unary)               | !                  |
+| %                  | mod        | $a mod $b            | modulo                         | %                  |
+| is \[not\] div by  |            | $a is not div by 4   | divisible by                   | $a % $b == 0       |
+| is \[not\] even    |            | $a is not even       | \[not\] an even number (unary) | $a % 2 == 0        |
+| is \[not\] even by |            | $a is not even by $b | grouping level \[not\] even    | ($a / $b) % 2 == 0 |
+| is \[not\] odd     |            | $a is not odd        | \[not\] an odd number (unary)  | $a % 2 != 0        |
+| is \[not\] odd by  |            | $a is not odd by $b  | \[not\] an odd grouping        | ($a / $b) % 2 != 0 |
 
 ## Examples
 ```smarty

docs/upgrading.md

@@ -117,7 +117,6 @@ The following constants have been removed to prevent global side effects.
 - Smarty now always runs in multibyte mode. Make sure you use the [PHP multibyte extension](https://www.php.net/manual/en/book.mbstring.php) in production for optimal performance.
 - Generated `<script>` tags lo longer have deprecated `type="text/javascript"` or `language="Javascript"` attributes
 - Smarty will throw a compiler exception instead of silently ignoring a modifier on a function call, like this: `{include|dot:"x-template-id" file="included.dot.tpl"}`
-- The ::getFile() method of a CompilerException will now return the full path of the template being compiled, if possible. This used to be 'file:relative_dir/filename.tpl'.
 
 ## Upgrading from v3 to v4
 

make-release.sh

@@ -12,7 +12,7 @@ git checkout -b "release/$1"
 php utilities/update-changelog.php $1
 php utilities/update-smarty-version-number.php $1
 
-git add changelog CHANGELOG.md src/Smarty.php
+git add CHANGELOG.md src/Smarty.php
 git commit -m "version bump"
 
 git checkout master

src/Compile/Base.php

@@ -226,8 +226,8 @@ abstract class Base implements CompilerInterface {
 	 * @param Template $compiler  compiler object
 	 * @param array                                 $parameter array with compilation parameter
 	 *
-	 * @return string compiled code as a string
+	 * @return bool|string compiled code or true if no code has been compiled
 	 * @throws \Smarty\CompilerException
 	 */
-	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null): string;
+	abstract public function compile($args, Template $compiler, $parameter = array(), $tag = null, $function = null);
 }

src/Compile/BlockCompiler.php

@@ -50,8 +50,7 @@ class BlockCompiler extends Base {
 	 * @throws CompilerException
 	 * @throws Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		if (!isset($tag[5]) || substr($tag, -5) !== 'close') {
 			$output = $this->compileOpeningTag($compiler, $args, $tag, $function);
@@ -78,6 +77,7 @@ class BlockCompiler extends Base {
 			);
 		}
 		$compiler->_cache['blockParams'][$compiler->_cache['blockNesting']]['callsChild'] = true;
+		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 
 		$output = "<?php \n";
@@ -102,6 +102,7 @@ class BlockCompiler extends Base {
 				$compiler->getParser()->lex->taglineno
 			);
 		}
+		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 
 		$output = "<?php \n";

src/Compile/CompilerInterface.php

@@ -17,10 +17,10 @@ interface CompilerInterface {
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 * @param array $parameter array with compilation parameter
 	 *
-	 * @return string compiled code as a string
+	 * @return bool|string compiled code or true if no code has been compiled
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string;
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null);
 
 	public function isCacheable(): bool;
 }

src/Compile/DefaultHandlerFunctionCallCompiler.php

@@ -27,8 +27,7 @@ class DefaultHandlerFunctionCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		unset($_attr['nocache']);

src/Compile/FunctionCallCompiler.php

@@ -34,7 +34,7 @@ class FunctionCallCompiler extends Base {
 	 *
 	 * @var array
 	 */
-	protected $shorttag_order = [];
+	protected $shorttag_order = ['var1', 'var2', 'var3'];
 
 	/**
 	 * Compiles code for the execution of a registered function
@@ -49,8 +49,7 @@ class FunctionCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
@@ -59,15 +58,19 @@ class FunctionCallCompiler extends Base {
 		$_paramsArray = $this->formatParamsArray($_attr);
 		$_params = 'array(' . implode(',', $_paramsArray) . ')';
 
+		try {
+			$value = array_shift($_attr);
+			$output = $compiler->compileModifier([array_merge([$function], $_attr)], $value);
+		} catch (\Smarty\CompilerException $e) {
+			if ($functionHandler = $compiler->getSmarty()->getFunctionHandler($function)) {
 
-		if ($functionHandler = $compiler->getSmarty()->getFunctionHandler($function)) {
-
-			// not cacheable?
-			$compiler->tag_nocache = $compiler->tag_nocache || !$functionHandler->isCacheable();
-			$output = "\$_smarty_tpl->getSmarty()->getFunctionHandler(" . var_export($function, true) . ")";
-			$output .= "->handle($_params, \$_smarty_tpl)";
-		} else {
-			$compiler->trigger_template_error("unknown function '{$function}'", null, true);
+				// not cacheable?
+				$compiler->tag_nocache = $compiler->tag_nocache || !$functionHandler->isCacheable();
+				$output = "\$_smarty_tpl->getSmarty()->getFunctionHandler(" . var_export($function, true) . ")";
+				$output .= "->handle($_params, \$_smarty_tpl)";
+			} else {
+				throw $e;
+			}
 		}
 
 		if (!empty($parameter['modifierlist'])) {

src/Compile/Modifier/IsArrayModifierCompiler.php

@@ -1,19 +0,0 @@
-<?php
-namespace Smarty\Compile\Modifier;
-use Smarty\CompilerException;
-
-/**
- * Smarty is_array modifier plugin
- */
-class IsArrayModifierCompiler extends Base {
-
-	public function compile($params, \Smarty\Compiler\Template $compiler) {
-
-		if (count($params) !== 1) {
-			throw new CompilerException("Invalid number of arguments for is_array. is_array expects exactly 1 parameter.");
-		}
-
-		return 'is_array(' . $params[0] . ')';
-	}
-
-}

src/Compile/ModifierCompiler.php

@@ -33,8 +33,9 @@ class ModifierCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+
+		$compiler->has_code = true;
 
 		$output = $parameter['value'];
 

src/Compile/ObjectMethodCallCompiler.php

@@ -39,8 +39,7 @@ class ObjectMethodCallCompiler extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		unset($_attr['nocache']);

src/Compile/PrintExpressionCompiler.php

@@ -47,8 +47,9 @@ class PrintExpressionCompiler extends Base {
 	 * @return string
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+
+		$compiler->has_code = true;
 
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);

src/Compile/SpecialVariableCompiler.php

@@ -37,8 +37,9 @@ class SpecialVariableCompiler extends Base {
 	 * @return string compiled code
 	 * @throws CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
+
+		$compiler->has_code = true;
 
 		$_index = preg_split("/\]\[/", substr($parameter, 1, strlen($parameter) - 2));
 		$variable = smarty_strtolower_ascii($compiler->getId($_index[0]));
@@ -128,7 +129,5 @@ class SpecialVariableCompiler extends Base {
 			}
 			return $compiled_ref;
 		}
-
-		return '';
 	}
 }

src/Compile/Tag/Append.php

@@ -35,8 +35,8 @@ class Append extends Assign
      * @return string compiled code
      * @throws \Smarty\CompilerException
      */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
+    {
 
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);

src/Compile/Tag/Assign.php

@@ -55,8 +55,8 @@ class Assign extends Base
      * @return string compiled code
      * @throws \Smarty\CompilerException
      */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
+    {
 
         $_nocache = false;
         // check and get attributes

src/Compile/Tag/BCPluginWrapper.php

@@ -24,8 +24,7 @@ class BCPluginWrapper extends Base {
 	/**
 	 * @inheritDoc
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		return call_user_func($this->callback, $this->getAttributes($compiler, $args), $compiler->getSmarty());
 	}
 }

src/Compile/Tag/Block.php

@@ -58,7 +58,7 @@ class Block extends Inheritance {
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 * @param array $parameter array with compilation parameter
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
 	{
 		if (!isset($compiler->_cache['blockNesting'])) {
 			$compiler->_cache['blockNesting'] = 0;
@@ -87,6 +87,5 @@ class Block extends Inheritance {
 		$compiler->getParser()->current_buffer = new Template();
 		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
 		$compiler->suppressNocacheProcessing = true;
-		return '';
 	}
 }

src/Compile/Tag/BlockClose.php

@@ -18,7 +18,7 @@ class BlockClose extends Inheritance {
 	 *
 	 * @return bool true
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
 	{
 		[$_attr, $_nocache, $_buffer, $_has_nocache_code, $_className] = $this->closeTag($compiler, ['block']);
 
@@ -103,6 +103,7 @@ class BlockClose extends Inheritance {
 		if ($compiler->_cache['blockNesting'] === 0) {
 			unset($compiler->_cache['blockNesting']);
 		}
+		$compiler->has_code = true;
 		$compiler->suppressNocacheProcessing = true;
 		return $output;
 	}

src/Compile/Tag/BreakTag.php

@@ -52,7 +52,7 @@ class BreakTag extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null): string
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = array(), $tag = null, $function = null)
 	{
 		[$levels, $foreachLevels] = $this->checkLevels($args, $compiler);
 		$output = "<?php ";

src/Compile/Tag/Call.php

@@ -47,8 +47,7 @@ class Call extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		// save possible attributes

src/Compile/Tag/Capture.php

@@ -53,8 +53,7 @@ class Capture extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		$buffer = $_attr['name'] ?? "'default'";
@@ -67,6 +66,7 @@ class Capture extends Base {
 			$compiler->openTag('nocache');
 		}
 
-		return "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
+		$_output = "<?php \$_smarty_tpl->getSmarty()->getRuntime('Capture')->open(\$_smarty_tpl, $buffer, $assign, $append);?>";
+		return $_output;
 	}
 }

src/Compile/Tag/CaptureClose.php

@@ -29,8 +29,7 @@ class CaptureClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		if (array_pop($compiler->_cache['capture_stack'])) {
 			// pop the virtual {nocache} tag from the stack.

src/Compile/Tag/ConfigLoad.php

@@ -62,8 +62,7 @@ class ConfigLoad extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		if ($_attr['nocache'] === true) {

src/Compile/Tag/Debug.php

@@ -29,8 +29,7 @@ class Debug extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes, may trigger errors
 		$this->getAttributes($compiler, $args);
 

src/Compile/Tag/ElseIfTag.php

@@ -22,8 +22,7 @@ class ElseIfTag extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'elseif']);
 

src/Compile/Tag/ElseTag.php

@@ -20,8 +20,7 @@ class ElseTag extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		[$nesting, $compiler->tag_nocache] = $this->closeTag($compiler, ['if', 'elseif']);
 		$this->openTag($compiler, 'else', [$nesting, $compiler->tag_nocache]);
 		return '<?php } else { ?>';

src/Compile/Tag/EvalTag.php

@@ -52,8 +52,7 @@ class EvalTag extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		if (isset($_attr['assign'])) {

src/Compile/Tag/ExtendsTag.php

@@ -52,8 +52,7 @@ class ExtendsTag extends Inheritance {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		if ($_attr['nocache'] === true) {
@@ -87,6 +86,7 @@ class ExtendsTag extends Inheritance {
 		} else {
 			$this->compileEndChild($compiler, $_attr['file']);
 		}
+		$compiler->has_code = false;
 		return '';
 	}
 

src/Compile/Tag/ForClose.php

@@ -29,8 +29,7 @@ class ForClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting--;
 
 		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['for', 'forelse']);

src/Compile/Tag/ForElse.php

@@ -21,8 +21,7 @@ class ForElse extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		[$tagName, $nocache_pushed] = $this->closeTag($compiler, ['for']);
 		$this->openTag($compiler, 'forelse', ['forelse', $nocache_pushed]);
 		return "<?php }} else { ?>";

src/Compile/Tag/ForTag.php

@@ -28,8 +28,7 @@ class ForTag extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting++;
 		if ($parameter === 0) {
 			$this->required_attributes = ['start', 'to'];

src/Compile/Tag/ForeachClose.php

@@ -29,8 +29,7 @@ class ForeachClose extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting--;
 
 		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach', 'foreachelse']);

src/Compile/Tag/ForeachElse.php

@@ -20,8 +20,7 @@ class ForeachElse extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		[$openTag, $nocache_pushed, $localVariablePrefix, $item, $restore] = $this->closeTag($compiler, ['foreach']);
 		$this->openTag($compiler, 'foreachelse', ['foreachelse', $nocache_pushed, $localVariablePrefix, $item, false]);

src/Compile/Tag/ForeachTag.php

@@ -79,8 +79,7 @@ class ForeachTag extends ForeachSection {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting++;
 		// init
 		$this->isNamed = false;

src/Compile/Tag/FunctionClose.php

@@ -33,10 +33,9 @@ class FunctionClose extends Base {
 	 * @param array $args array with attributes from parser
 	 * @param object|\Smarty\Compiler\Template $compiler compiler object
 	 *
-	 * @return string compiled code
+	 * @return bool true
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$this->compiler = $compiler;
 		$saved_data = $this->closeTag($compiler, ['function']);
 		$_attr = $saved_data[0];
@@ -76,7 +75,7 @@ class FunctionClose extends Base {
 			$output .= "foreach (\$params as \$key => \$value) {\n\$_smarty_tpl->assign(\$key, \$value);\n}\n";
 			$output .= "\$params = var_export(\$params, true);\n";
 			$output .= "echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
-			$output .= "\\\$_smarty_tpl->pushStack();\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->assign(\\\$key, \\\$value);\n}\n?>";
+			$output .= "\\\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->saveTemplateVariables(\\\$_smarty_tpl, '{$_name}');\nforeach (\$params as \\\$key => \\\$value) {\n\\\$_smarty_tpl->assign(\\\$key, \\\$value);\n}\n?>";
 			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";?>";
 			$compiler->getParser()->current_buffer->append_subtree(
 				$compiler->getParser(),
@@ -87,7 +86,7 @@ class FunctionClose extends Base {
 			);
 			$compiler->getParser()->current_buffer->append_subtree($compiler->getParser(), $_functionCode);
 			$output = "<?php echo \"/*%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/<?php ";
-			$output .= "\\\$_smarty_tpl->popStack();?>\n";
+			$output .= "\\\$_smarty_tpl->getSmarty()->getRuntime('TplFunction')->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
 			$output .= "/*/%%SmartyNocache:{$compiler->getTemplate()->getCompiled()->nocache_hash}%%*/\";\n?>";
 			$output .= "<?php echo str_replace('{$compiler->getTemplate()->getCompiled()->nocache_hash}', \$_smarty_tpl->getCompiled()->nocache_hash ?? '', ob_get_clean());\n";
 			$output .= "}\n}\n";
@@ -141,7 +140,7 @@ class FunctionClose extends Base {
 		// restore old status
 		$compiler->getTemplate()->getCompiled()->setNocacheCode($saved_data[2]);
 		$compiler->getTemplate()->caching = $saved_data[3];
-		return '';
+		return true;
 	}
 
 	/**

src/Compile/Tag/FunctionTag.php

@@ -42,11 +42,10 @@ class FunctionTag extends Base {
 	 * @param array $args array with attributes from parser
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 *
-	 * @return string compiled code
+	 * @return bool true
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);
 		if ($_attr['nocache'] === true) {
@@ -68,6 +67,6 @@ class FunctionTag extends Base {
 		// Init temporary context
 		$compiler->getParser()->current_buffer = new \Smarty\ParseTree\Template();
 		$compiler->getTemplate()->getCompiled()->setNocacheCode(false);
-		return '';
+		return true;
 	}
 }

src/Compile/Tag/IfClose.php

@@ -28,8 +28,7 @@ class IfClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		[$nesting, $nocache_pushed] = $this->closeTag($compiler, ['if', 'else', 'elseif']);
 

src/Compile/Tag/IfTag.php

@@ -22,8 +22,7 @@ class IfTag extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		if ($compiler->tag_nocache) {
 			// push a {nocache} tag onto the stack to prevent caching of this block

src/Compile/Tag/IncludeTag.php

@@ -67,8 +67,7 @@ class IncludeTag extends Base {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$uid = $t_hash = null;
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);

src/Compile/Tag/Ldelim.php

@@ -30,8 +30,7 @@ class Ldelim extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$_attr = $this->getAttributes($compiler, $args);
 		if ($_attr['nocache'] === true) {
 			$compiler->trigger_template_error('nocache option not allowed', null, true);

src/Compile/Tag/Nocache.php

@@ -26,11 +26,12 @@ class Nocache extends Base {
 	 * @param array $args array with attributes from parser
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 *
-	 * @return string
+	 * @return bool
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$this->openTag($compiler, 'nocache');
-		return '';
+		// this tag does not return compiled code
+		$compiler->has_code = false;
+		return true;
 	}
 }

src/Compile/Tag/NocacheClose.php

@@ -27,11 +27,12 @@ class NocacheClose extends Base {
 	 * @param array $args array with attributes from parser
 	 * @param \Smarty\Compiler\Template $compiler compiler object
 	 *
-	 * @return string
+	 * @return bool
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$this->closeTag($compiler, ['nocache']);
-		return '';
+		// this tag does not return compiled code
+		$compiler->has_code = false;
+		return true;
 	}
 }

src/Compile/Tag/Rdelim.php

@@ -28,8 +28,7 @@ class Rdelim extends Ldelim {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		parent::compile($args, $compiler);
 		return $compiler->getTemplate()->getRightDelimiter();
 	}

src/Compile/Tag/Section.php

@@ -82,8 +82,7 @@ class Section extends ForeachSection {
 	 * @throws \Smarty\CompilerException
 	 * @throws \Smarty\Exception
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting++;
 		// check and get attributes
 		$_attr = $this->getAttributes($compiler, $args);

src/Compile/Tag/SectionClose.php

@@ -25,8 +25,7 @@ class SectionClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting--;
 
 		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section', 'sectionelse']);

src/Compile/Tag/SectionElse.php

@@ -20,8 +20,7 @@ class SectionElse extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		[$openTag, $nocache_pushed] = $this->closeTag($compiler, ['section']);
 		$this->openTag($compiler, 'sectionelse', ['sectionelse', $nocache_pushed]);
 		return "<?php }} else {\n ?>";

src/Compile/Tag/Setfilter.php

@@ -21,8 +21,7 @@ class Setfilter extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->variable_filter_stack[] = $compiler->getSmarty()->getDefaultModifiers();
 
 		// The modifier_list is passed as an array of array's. The inner arrays have the modifier at index 0,
@@ -35,6 +34,8 @@ class Setfilter extends Base {
 
 		$compiler->getSmarty()->setDefaultModifiers($newList);
 
-		return '';
+		// this tag does not return compiled code
+		$compiler->has_code = false;
+		return true;
 	}
 }

src/Compile/Tag/SetfilterClose.php

@@ -29,8 +29,7 @@ class SetfilterClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$this->getAttributes($compiler, $args);
 
 		// reset variable filter to previous state
@@ -38,6 +37,8 @@ class SetfilterClose extends Base {
 			count($compiler->variable_filter_stack) ? array_pop($compiler->variable_filter_stack) : []
 		);
 
-		return '';
+		// this tag does not return compiled code
+		$compiler->has_code = false;
+		return true;
 	}
 }

src/Compile/Tag/WhileClose.php

@@ -28,8 +28,7 @@ class WhileClose extends Base {
 	 *
 	 * @return string compiled code
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting--;
 
 		$nocache_pushed = $this->closeTag($compiler, ['while']);

src/Compile/Tag/WhileTag.php

@@ -22,8 +22,7 @@ class WhileTag extends Base {
 	 * @return string compiled code
 	 * @throws \Smarty\CompilerException
 	 */
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$compiler->loopNesting++;
 
 		if ($compiler->tag_nocache) {

src/Compiler/CodeFrame.php

@@ -121,6 +121,6 @@ class CodeFrame
 	 * @return string
 	 */
 	public function insertLocalVariables(): string {
-		return '$_smarty_current_dir = ' . var_export(dirname($this->_template->getSource()->getFilepath() ?? '.'), true) . ";\n";
+		return '$_smarty_current_dir = ' . var_export(dirname($this->_template->getSource()->getFilepath()), true) . ";\n";
 	}
 }

src/Compiler/Template.php

@@ -184,6 +184,13 @@ class Template extends BaseCompiler {
 	 */
 	public $prefixCodeStack = [];
 
+	/**
+	 * Tag has compiled code
+	 *
+	 * @var bool
+	 */
+	public $has_code = false;
+
 	/**
 	 * A variable string was compiled
 	 *
@@ -841,7 +848,7 @@ class Template extends BaseCompiler {
 		$e = new CompilerException(
 			$error_text,
 			0,
-			$this->template->getSource()->getFilepath() ?? $this->template->getSource()->getFullResourceName(),
+			$this->template->getSource()->getFullResourceName(),
 			$line
 		);
 		$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[$line - 1]));
@@ -1067,10 +1074,12 @@ class Template extends BaseCompiler {
 	}
 
 	public function compileChildBlock() {
+		$this->has_code = true;
 		return $this->blockCompiler->compileChild($this);
 	}
 
 	public function compileParentBlock() {
+		$this->has_code = true;
 		return $this->blockCompiler->compileParent($this);
 	}
 
@@ -1087,6 +1096,8 @@ class Template extends BaseCompiler {
 	 */
 	private function compileTag2($tag, $args, $parameter) {
 		// $args contains the attributes parsed and compiled by the lexer/parser
+		// assume that tag does compile into code, but creates no HTML output
+		$this->has_code = true;
 
 		$this->handleNocacheFlag($args);
 
@@ -1095,10 +1106,12 @@ class Template extends BaseCompiler {
 			if (!isset($this->smarty->security_policy) || $this->smarty->security_policy->isTrustedTag($tag, $this)) {
 				$this->tag_nocache = $this->tag_nocache | !$tagCompiler->isCacheable();
 				$_output = $tagCompiler->compile($args, $this, $parameter);
-				if (!empty($parameter['modifierlist'])) {
-					throw new CompilerException('No modifiers allowed on ' . $tag);
+				if ($_output !== false) {
+					if (!empty($parameter['modifierlist'])) {
+						throw new CompilerException('No modifiers allowed on ' . $tag);
+					}
+					return $this->has_code && $_output !== true ? $_output : null;
 				}
-				return $_output;
 			}
 		}
 
@@ -1111,7 +1124,8 @@ class Template extends BaseCompiler {
 
 			$args['_attr']['name'] = "'{$tag}'";
 			$tagCompiler = $this->getTagCompiler('call');
-			return $tagCompiler === null ? false : $tagCompiler->compile($args, $this, $parameter);
+			$_output = $tagCompiler === null ? false : $tagCompiler->compile($args, $this, $parameter);
+			return $this->has_code ? $_output : null;
 		}
 
 		// remaining tastes: (object-)function, (object-function-)block, custom-compiler
@@ -1355,11 +1369,6 @@ class Template extends BaseCompiler {
 		return $this->functionCallCompiler->compile($args, $this, $parameter, $base_tag, $base_tag);
 	}
 
-	public function compileModifierInExpression(string $function, array $_attr) {
-		$value = array_shift($_attr);
-		return $this->compileModifier([array_merge([$function], $_attr)], $value);
-	}
-
 	/**
 	 * @return TemplateParser|null
 	 */

src/Data.php

@@ -47,20 +47,6 @@ class Data
      */
     public $config_vars = array();
 
-	/**
-	 * This variable will hold a stack of template variables.
-	 *
-	 * @var null|array
-	 */
-	private $_var_stack = [];
-
-	/**
-	 * This variable will hold a stack of config variables.
-	 *
-	 * @var null|array
-	 */
-	private $_config_stack = [];
-
 	/**
 	 * Default scope for new variables
 	 * @var int
@@ -507,20 +493,4 @@ class Data
 	public function setParent($parent): void {
 		$this->parent = $parent;
 	}
-
-	public function pushStack(): void {
-		$stackList = [];
-		foreach ($this->tpl_vars as $name => $variable) {
-			$stackList[$name] = clone $variable; // variables are stored in Variable objects
-		}
-		$this->_var_stack[] = $this->tpl_vars;
-		$this->tpl_vars = $stackList;
-
-		$this->_config_stack[] = $this->config_vars;
-	}
-
-	public function popStack(): void {
-		$this->tpl_vars = array_pop($this->_var_stack);
-		$this->config_vars = array_pop($this->_config_stack);
-	}
 }

src/Extension/DefaultExtension.php

@@ -2,8 +2,6 @@
 
 namespace Smarty\Extension;
 
-use Smarty\Exception;
-
 class DefaultExtension extends Base {
 
 	private $modifiers = [];
@@ -29,7 +27,6 @@ class DefaultExtension extends Base {
 			case 'escape': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\EscapeModifierCompiler(); break;
 			case 'from_charset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\FromCharsetModifierCompiler(); break;
 			case 'indent': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IndentModifierCompiler(); break;
-			case 'is_array': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IsArrayModifierCompiler(); break;
 			case 'isset': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\IssetModifierCompiler(); break;
 			case 'json_encode': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\JsonEncodeModifierCompiler(); break;
 			case 'lower': $this->modifiers[$modifier] = new \Smarty\Compile\Modifier\LowerModifierCompiler(); break;
@@ -60,7 +57,6 @@ class DefaultExtension extends Base {
 			case 'escape': return [$this, 'smarty_modifier_escape'];
 			case 'explode': return [$this, 'smarty_modifier_explode'];
 			case 'implode': return [$this, 'smarty_modifier_implode'];
-			case 'in_array': return [$this, 'smarty_modifier_in_array'];
 			case 'join': return [$this, 'smarty_modifier_join'];
 			case 'mb_wordwrap': return [$this, 'smarty_modifier_mb_wordwrap'];
 			case 'number_format': return [$this, 'smarty_modifier_number_format'];
@@ -91,8 +87,12 @@ class DefaultExtension extends Base {
 			case 'html_select_date': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectDate(); break;
 			case 'html_select_time': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlSelectTime(); break;
 			case 'html_table': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\HtmlTable(); break;
+			case 'in_array': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\InArray(); break;
+			case 'is_array': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\IsArray(); break;
 			case 'mailto': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Mailto(); break;
 			case 'math': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Math(); break;
+			case 'strlen': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Strlen(); break;
+			case 'time': $this->functionHandlers[$functionName] = new \Smarty\FunctionHandler\Time(); break;
 		}
 
 		return $this->functionHandlers[$functionName] ?? null;
@@ -570,23 +570,6 @@ class DefaultExtension extends Base {
 		return implode((string) ($separator ?? ''), (array) $values);
 	}
 
-	/**
-	 * Smarty in_array modifier plugin
-	 * Type:     modifier
-	 * Name:     in_array
-	 * Purpose:  test if value is contained in an array
-	 *
-	 * @param mixed   $needle
-	 * @param array   $array
-	 * @param bool   $strict
-	 *
-	 * @return bool
-	 */
-	public function smarty_modifier_in_array($needle, $array, $strict = false)
-	{
-		return in_array($needle, (array) $array, (bool) $strict);
-	}
-
 	/**
 	 * Smarty join modifier plugin
 	 * Type:     modifier

src/FunctionHandler/InArray.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ *  in_array(mixed $needle, array $haystack, bool $strict = false): bool
+ *  Returns true if needle is found in the array, false otherwise
+ */
+class InArray extends Base {
+
+	public function handle($params, Template $template) {
+
+		$params = array_values($params ?? []);
+
+		if (count($params) < 2 || count($params) > 3) {
+			throw new Exception("Invalid number of arguments for in_array. in_arrays expects 2 or 3 parameters.");
+		}
+
+		// default to false, true if param 3 is set to true
+		$needle = $params[0];
+		$haystack = (array) $params[1];
+		$strict = count($params) == 3 && $params[2];
+
+		return in_array($needle, $haystack, $strict);
+	}
+
+}

src/FunctionHandler/IsArray.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ *  is_array(mixed $value): bool
+ *  Returns true if value is an array, false otherwise.
+ */
+class IsArray extends Base {
+
+	public function handle($params, Template $template) {
+		if (count($params) !== 1) {
+			throw new Exception("Invalid number of arguments for is_array. is_array expects exactly 1 parameter.");
+		}
+		return is_array(reset($params));
+	}
+
+}

src/FunctionHandler/Strlen.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ * Get string length
+ *
+ *  strlen(string $string): int
+ *
+ * Returns length of the string on success, and 0 if the string is empty.
+ */
+class Strlen extends Base {
+
+	public function handle($params, Template $template) {
+
+		$params = array_values($params ?? []);
+
+		if (count($params) !== 1) {
+			throw new Exception("Invalid number of arguments for strlen. strlen expects exactly 1 parameter.");
+		}
+
+		return strlen((string) $params[0]);
+	}
+
+}

src/FunctionHandler/Time.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Smarty\FunctionHandler;
+
+use Smarty\Exception;
+use Smarty\Template;
+
+/**
+ *  is_array(mixed $value): bool
+ *  Returns true if value is an array, false otherwise.
+ */
+class Time extends Base {
+
+	public function handle($params, Template $template) {
+		if (count($params) > 0) {
+			throw new Exception("Invalid number of arguments for time. time expects no parameters.");
+		}
+		return time();
+	}
+
+}

src/Lexer/TemplateLexer.php

@@ -567,7 +567,7 @@ class TemplateLexer
     public function yylex3()
     {
         if (!isset($this->yy_global_pattern3)) {
-            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+(not\\s+)?in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
+            $this->yy_global_pattern3 = $this->replace("/\G(\\s*SMARTYrdel)|\G((SMARTYldel)SMARTYal)|\G([\"])|\G('[^'\\\\]*(?:\\\\.[^'\\\\]*)*')|\G([$][0-9]*[a-zA-Z_]\\w*)|\G([$])|\G(\\s+is\\s+in\\s+)|\G(\\s+as\\s+)|\G(\\s+to\\s+)|\G(\\s+step\\s+)|\G(\\s+instanceof\\s+)|\G(\\s*([!=][=]{1,2}|[<][=>]?|[>][=]?|[&|]{2})\\s*)|\G(\\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even|div)\\s+by\\s+)|\G(\\s+is\\s+(not\\s+)?(odd|even))|\G([!]\\s*|not\\s+)|\G([(](int(eger)?|bool(ean)?|float|double|real|string|binary|array|object)[)]\\s*)|\G(\\s*[(]\\s*)|\G(\\s*[)])|\G(\\[\\s*)|\G(\\s*\\])|\G(\\s*[-][>]\\s*)|\G(\\s*[=][>]\\s*)|\G(\\s*[=]\\s*)|\G(([+]|[-]){2})|\G(\\s*([+]|[-])\\s*)|\G(\\s*([*]{1,2}|[%\/^&]|[<>]{2})\\s*)|\G([@])|\G(array\\s*[(]\\s*)|\G([#])|\G(\\s+[0-9]*[a-zA-Z_][a-zA-Z0-9_\-:]*\\s*[=]\\s*)|\G(([0-9]*[a-zA-Z_]\\w*)?(\\\\[0-9]*[a-zA-Z_]\\w*)+)|\G([0-9]*[a-zA-Z_]\\w*)|\G(\\d+)|\G([`])|\G([|][@]?)|\G([.])|\G(\\s*[,]\\s*)|\G(\\s*[;]\\s*)|\G([:]{2})|\G(\\s*[:]\\s*)|\G(\\s*[?]\\s*)|\G(0[xX][0-9a-fA-F]+)|\G(\\s+)|\G([\S\s])/isS");
         }
         if (!isset($this->dataLength)) {
             $this->dataLength = strlen($this->data);
@@ -659,122 +659,122 @@ class TemplateLexer
 
         $this->token = \Smarty\Parser\TemplateParser::TP_ISIN;
          }
-    public function yy_r3_10()
+    public function yy_r3_9()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_AS;
          }
-    public function yy_r3_11()
+    public function yy_r3_10()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_TO;
          }
-    public function yy_r3_12()
+    public function yy_r3_11()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_STEP;
          }
-    public function yy_r3_13()
+    public function yy_r3_12()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_INSTANCEOF;
          }
-    public function yy_r3_14()
+    public function yy_r3_13()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_LOGOP;
          }
-    public function yy_r3_16()
+    public function yy_r3_15()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_SLOGOP;
          }
-    public function yy_r3_18()
+    public function yy_r3_17()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_TLOGOP;
          }
-    public function yy_r3_21()
+    public function yy_r3_20()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_SINGLECOND;
          }
-    public function yy_r3_24()
+    public function yy_r3_23()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_NOT;
          }
-    public function yy_r3_25()
+    public function yy_r3_24()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_TYPECAST;
          }
-    public function yy_r3_29()
+    public function yy_r3_28()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_OPENP;
          }
-    public function yy_r3_30()
+    public function yy_r3_29()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEP;
          }
-    public function yy_r3_31()
+    public function yy_r3_30()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_OPENB;
          }
-    public function yy_r3_32()
+    public function yy_r3_31()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_CLOSEB;
          }
-    public function yy_r3_33()
+    public function yy_r3_32()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_PTR;
          }
-    public function yy_r3_34()
+    public function yy_r3_33()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_APTR;
          }
-    public function yy_r3_35()
+    public function yy_r3_34()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_EQUAL;
          }
-    public function yy_r3_36()
+    public function yy_r3_35()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_INCDEC;
          }
-    public function yy_r3_38()
+    public function yy_r3_37()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_UNIMATH;
          }
-    public function yy_r3_40()
+    public function yy_r3_39()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_MATH;
          }
-    public function yy_r3_42()
+    public function yy_r3_41()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_AT;
          }
-    public function yy_r3_43()
+    public function yy_r3_42()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_ARRAYOPEN;
          }
-    public function yy_r3_44()
+    public function yy_r3_43()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_HATCH;
          }
-    public function yy_r3_45()
+    public function yy_r3_44()
     {
 
         // resolve conflicts with shorttag and right_delimiter starting with '='
@@ -786,73 +786,73 @@ class TemplateLexer
             $this->token = \Smarty\Parser\TemplateParser::TP_ATTR;
         }
          }
-    public function yy_r3_46()
+    public function yy_r3_45()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_NAMESPACE;
          }
-    public function yy_r3_49()
+    public function yy_r3_48()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_ID;
          }
-    public function yy_r3_50()
+    public function yy_r3_49()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_INTEGER;
          }
-    public function yy_r3_51()
+    public function yy_r3_50()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_BACKTICK;
         $this->yypopstate();
          }
-    public function yy_r3_52()
+    public function yy_r3_51()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_VERT;
          }
-    public function yy_r3_53()
+    public function yy_r3_52()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_DOT;
          }
-    public function yy_r3_54()
+    public function yy_r3_53()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_COMMA;
          }
-    public function yy_r3_55()
+    public function yy_r3_54()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_SEMICOLON;
          }
-    public function yy_r3_56()
+    public function yy_r3_55()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_DOUBLECOLON;
          }
-    public function yy_r3_57()
+    public function yy_r3_56()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_COLON;
          }
-    public function yy_r3_58()
+    public function yy_r3_57()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_QMARK;
          }
-    public function yy_r3_59()
+    public function yy_r3_58()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_HEX;
          }
-    public function yy_r3_60()
+    public function yy_r3_59()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_SPACE;
          }
-    public function yy_r3_61()
+    public function yy_r3_60()
     {
 
         $this->token = \Smarty\Parser\TemplateParser::TP_TEXT;

src/Lexer/TemplateLexer.plex

@@ -324,7 +324,7 @@ class TemplateLexer
      slop = ~\s+(eq|ne|neq|gt|ge|gte|lt|le|lte|mod|and|or|xor)\s+~
      tlop = ~\s+is\s+(not\s+)?(odd|even|div)\s+by\s+~
      scond = ~\s+is\s+(not\s+)?(odd|even)~
-     isin = ~\s+is\s+(not\s+)?in\s+~
+     isin = ~\s+is\s+in\s+~
      as = ~\s+as\s+~
      to = ~\s+to\s+~
      step = ~\s+step\s+~

src/Parser/TemplateParser.y

@@ -290,7 +290,9 @@ literal_e1(A) ::= . {
 }
                       // Smarty tag
 template       ::= template smartytag(B). {
-     $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
+      if ($this->compiler->has_code) {
+          $this->current_buffer->append_subtree($this, $this->mergePrefixCode(B));
+      }
      $this->compiler->has_variable_string = false;
      $this->block_nesting_level = $this->compiler->getTagStackCount();
 }
@@ -663,21 +665,12 @@ expr(res)        ::= expr(e1) scond(c). {
     res = c . e1 . ')';
 }
 
-isin(res)  ::= ISIN(o). {
-    static $isin = [
-        'isin' => 'in_array(',
-        'isnotin' => '!in_array(',
-    ];
-   $op = strtolower(str_replace(' ', '', o));
-   res = $isin[$op];
+expr(res)        ::= expr(e1) ISIN array(a).  {
+    res = 'in_array('.e1.','.a.')';
 }
 
-expr(res)        ::= expr(e1) isin(c) array(a).  {
-    res = c . e1.','.a.')';
-}
-
-expr(res)        ::= expr(e1) isin(c) value(v).  {
-    res = c . e1.',(array)'.v.')';
+expr(res)        ::= expr(e1) ISIN value(v).  {
+    res = 'in_array('.e1.',(array)'.v.')';
 }
 
 // null coalescing
@@ -1068,7 +1061,7 @@ objectelement(res)::= PTR method(f).  {
 // function
 //
 function(res)     ::= ns1(f) OPENP params(p) CLOSEP. {
-    res = $this->compiler->compileModifierInExpression(f, p);
+    res = $this->compiler->compileFunctionCall(f, p);
 }
 
 

src/Runtime/TplFunctionRuntime.php

@@ -26,26 +26,31 @@ class TplFunctionRuntime {
 	 */
 	public function callTemplateFunction(Template $tpl, $name, $params, $nocache) {
 		$funcParam = $tpl->tplFunctions[$name] ?? ($tpl->getSmarty()->tplFunctions[$name] ?? null);
-		if (!isset($funcParam)) {
-			throw new \Smarty\Exception("Unable to find template function '{$name}'");
-		}
-
-		if (!$tpl->caching || ($tpl->caching && $nocache)) {
-			$function = $funcParam['call_name'];
-		} else {
-			if (isset($funcParam['call_name_caching'])) {
-				$function = $funcParam['call_name_caching'];
-			} else {
+		if (isset($funcParam)) {
+			if (!$tpl->caching || ($tpl->caching && $nocache)) {
 				$function = $funcParam['call_name'];
+			} else {
+				if (isset($funcParam['call_name_caching'])) {
+					$function = $funcParam['call_name_caching'];
+				} else {
+					$function = $funcParam['call_name'];
+				}
+			}
+			if (function_exists($function)) {
+				$this->saveTemplateVariables($tpl, $name);
+				$function($tpl, $params);
+				$this->restoreTemplateVariables($tpl, $name);
+				return;
+			}
+			// try to load template function dynamically
+			if ($this->addTplFuncToCache($tpl, $name, $function)) {
+				$this->saveTemplateVariables($tpl, $name);
+				$function($tpl, $params);
+				$this->restoreTemplateVariables($tpl, $name);
+				return;
 			}
 		}
-		if (!function_exists($function) && !$this->addTplFuncToCache($tpl, $name, $function)) {
-			throw new \Smarty\Exception("Unable to find template function '{$name}'");
-		}
-
-		$tpl->pushStack();
-		$function($tpl, $params);
-		$tpl->popStack();
+		throw new \Smarty\Exception("Unable to find template function '{$name}'");
 	}
 
 	/**
@@ -141,4 +146,28 @@ class TplFunctionRuntime {
 		return false;
 	}
 
+	/**
+	 * Save current template variables on stack
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param string $name stack name
+	 */
+	public function saveTemplateVariables(Template $tpl, $name) {
+		$tpl->_var_stack[] =
+			['tpl' => $tpl->tpl_vars, 'config' => $tpl->config_vars, 'name' => "_tplFunction_{$name}"];
+	}
+
+	/**
+	 * Restore saved variables into template objects
+	 *
+	 * @param \Smarty\Template $tpl
+	 * @param string $name stack name
+	 */
+	public function restoreTemplateVariables(Template $tpl, $name) {
+		if (isset($tpl->_var_stack)) {
+			$vars = array_pop($tpl->_var_stack);
+			$tpl->tpl_vars = $vars['tpl'];
+			$tpl->config_vars = $vars['config'];
+		}
+	}
 }

src/Smarty.php

@@ -53,7 +53,7 @@ class Smarty extends \Smarty\TemplateBase {
 	/**
 	 * smarty version
 	 */
-	const SMARTY_VERSION = '5.0.0';
+	const SMARTY_VERSION = '5.0.0-rc2';
 
 	/**
 	 * define caching modes

src/Template.php

@@ -555,9 +555,6 @@ class Template extends TemplateBase {
 	 */
 	public function getStreamVariable($variable)
 	{
-
-		trigger_error("Using stream variables (\`\{\$foo:bar\}\`)is deprecated.", E_USER_DEPRECATED);
-
 		$_result = '';
 		$fp = fopen($variable, 'r+');
 		if ($fp) {
@@ -648,7 +645,8 @@ class Template extends TemplateBase {
 			} else {
 
 				// After rendering a template, the tpl/config variables are reset, so the template can be re-used.
-				$this->pushStack();
+				$savedTplVars = $this->tpl_vars;
+				$savedConfigVars = $this->config_vars;
 
 				// Start output-buffering.
 				ob_start();
@@ -656,7 +654,8 @@ class Template extends TemplateBase {
 				$result = $this->render(false, $function);
 
 				// Restore the template to its previous state
-				$this->popStack();
+				$this->tpl_vars = $savedTplVars;
+				$this->config_vars = $savedConfigVars;
 			}
 
 			if (isset($errorHandler)) {

src/Template/Source.php

@@ -271,11 +271,11 @@ class Source {
 		return $this->type . ':' . $this->name;
 	}
 
-	public function getFilepath(): ?string {
+	public function getFilepath(): string {
 		if ($this->handler instanceof FilePlugin) {
 			return $this->handler->getFilePath($this->name, $this->smarty, $this->isConfig);
 		}
-		return null;
+		return '.';
 	}
 
 	public function isConfig(): bool {

src/TemplateBase.php

@@ -59,6 +59,13 @@ abstract class TemplateBase extends Data {
 	 */
 	public $tplFunctions = [];
 
+	/**
+	 * When initialized to an (empty) array, this variable will hold a stack of template variables.
+	 *
+	 * @var null|array
+	 */
+	public $_var_stack = null;
+
 	/**
 	 * @var Debug
 	 */

tests/UnitTests/SecurityTests/SecurityTest.php

@@ -303,7 +303,7 @@ class SecurityTest extends PHPUnit_Smarty
     }
 /**
  * 
- * @group slow
+ * 
 */
     public function testTrustedUri()
     {

tests/UnitTests/SmartyMethodsTests/RegisterBlock/RegisterBlockTest.php

@@ -304,8 +304,7 @@ class blockparamsCompiler extends \Smarty\Compile\Base {
 	protected $shorttag_order = ["first", "second"];
 	protected $optional_attributes = ["first", "second"];
 
-	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
 		$_attr = $this->getAttributes($compiler, $args);
 
 		$output = '';

tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.test.php

@@ -6,8 +6,7 @@ use Smarty\Compile\Base;
 class smarty_compiler_test extends Base
 {
 
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
         $this->required_attributes = array('data');
 
         $_attr = $this->getAttributes($compiler, $args);

tests/UnitTests/TemplateSource/TagTests/CompilerPlugin/PHPunitplugins/compiler.testclose.php

@@ -6,8 +6,7 @@ use Smarty\Compile\Base;
 class smarty_compiler_testclose extends Base
 {
 
-	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+	public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null) {
 
 		$this->closeTag($compiler, 'test');
 

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

@@ -169,12 +169,6 @@ class CompileIfTest extends PHPUnit_Smarty
                      array('{if {counter start=1} == 1}yes{else}no{/if}', 'yes', 'Tag1', $i ++),
                      array('{if false}false{elseif {counter start=1} == 1}yes{else}no{/if}', 'yes', 'Tag2', $i ++),
                      array('{if {counter start=1} == 0}false{elseif {counter} == 2}yes{else}no{/if}', 'yes', 'Tag3', $i ++),
-
-                     array('{if 2 is in ["foo", 2]}yes{else}no{/if}', 'yes', 'IsIn', $i++),
-                     array('{if 2 is in ["foo", "bar"]}yes{else}no{/if}', 'no', 'IsIn2', $i++),
-                     array('{if 2 is not in ["foo", "bar"]}yes{else}no{/if}', 'yes', 'IsNotIn', $i++),
-                     array('{if 2 is not in ["foo", 2]}yes{else}no{/if}', 'no', 'IsNotIn2', $i++),
-
          );
     }
 

tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionFetchTest.php

@@ -30,7 +30,7 @@ class PluginFunctionFetchTest extends PHPUnit_Smarty
 * test {fetch} from UIR
 *
 * 
-* @group slow
+* 
 */
    public function testFetchUri()
     {

tests/UnitTests/TemplateSource/TagTests/PluginFunction/TimeTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace UnitTests\TemplateSource\TagTests\PluginFunction;
+class TimeTest extends \PHPUnit_Smarty {
+
+	public function setUp(): void {
+		$this->setUpSmarty(__DIR__);
+	}
+
+	public function testBasicSyntax() {
+		$this->assertStringMatchesFormat('%d', $this->smarty->fetch("string:{time()}"));
+	}
+
+	public function testInvalidParameters() {
+		$this->expectException(\Smarty\Exception::class);
+		$this->expectExceptionMessage('Invalid number of arguments');
+		$this->assertEquals("", $this->smarty->fetch("string:{time(3, 'foo')}"));
+	}
+
+}

tests/UnitTests/TemplateSource/TagTests/TemplateFunction/CompileFunctionTest.php

@@ -32,6 +32,7 @@ class CompileFunctionTest extends PHPUnit_Smarty
      * 
      * @dataProvider functionProvider
      * test simple function call tag
+     *
      */
     public function testSimpleFunction_001($text)
     {

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

@@ -79,7 +79,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
     public function testEmpty3()
     {
         $this->smarty->disableSecurity();
-        $this->getSmarty()->registerPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, 'pass', function ($v) { return $v; });
+        $this->getSmarty()->registerPlugin(\Smarty\Smarty::PLUGIN_FUNCTION, 'pass', function ($v) { return $v; });
         $this->smarty->assign('var', array(true,
                                            (int) 1,
                                            (float) 0.1,
@@ -99,7 +99,7 @@ class PhpFunctionTest extends PHPUnit_Smarty
     public function testEmpty4()
     {
         $this->smarty->disableSecurity();
-        $this->getSmarty()->registerPlugin(\Smarty\Smarty::PLUGIN_MODIFIER, 'pass', function ($v) { return $v; });
+        $this->getSmarty()->registerPlugin(\Smarty\Smarty::PLUGIN_FUNCTION, 'pass', function ($v) { return $v; });
         $this->smarty->assign('var', new TestIsset());
         $expected = ' true , false , false , true , true , true , false ';
         $this->assertEquals($expected, $this->smarty->fetch('string:{strip}{if empty($var->isNull)} true {else} false {/IF}

tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php

@@ -325,13 +325,4 @@ class ScopeTest extends PHPUnit_Smarty
         $this->smarty->assign('scope', 'none');
         $r = $this->smarty->fetch('test_function_scope.tpl');
     }
-
-	public function testFunctionScopeIsLocalByDefault()
-	{
-		$this->assertEquals(
-			'a',
-			$this->smarty->fetch('string:{function name=test}{$var="b"}{/function}{$var="a"}{test}{$var}')
-		);
-	}
-
 }

tests/UnitTests/TemplateSource/_Issues/TooManyShorthandAttributes949Test.php

@@ -1,16 +0,0 @@
-<?php
-
-class TooManyShorthandAttributes949Test extends PHPUnit_Smarty
-{
-
-	public function testPregMatchAll() {
-		$smarty = new \Smarty\Smarty();
-		$smarty->registerPlugin('modifier', 'var_dump', 'var_dump');
-		$templateStr = "eval:{\$a = 'blah'}{\$b = array()}{if var_dump('', \$a, \$b, 2)|noprint}blah{else}nah{/if}";
-		$this->assertEquals(
-			'nah',
-			$smarty->fetch($templateStr)
-		);
-	}
-
-}

tests/UnitTests/__shared/PHPunitplugins/compiler.getparamsshort.php

@@ -41,8 +41,8 @@ class smarty_compiler_getparamsshort extends Base
      */
     public $shorttag_order = array('s1', 's2', 's3');
 
-    public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null): string
-	{
+    public function compile($args, \Smarty\Compiler\Template $compiler, $parameter = [], $tag = null, $function = null)
+    {
         $_attr = $this->getAttributes($compiler, $args);
         $output = '<?php echo "array(';
              foreach ($_attr as $key => $value) {

tests/UnitTests/__shared/PHPunitplugins/function.checkvar.php

@@ -29,6 +29,12 @@ function smarty_function_checkvar($params, \Smarty\Template $template)
         if (in_array('template', $types) && $ptr instanceof Template) {
             $output .= "#{$ptr->getSource()->name}:\${$var} =";
             $output .= $ptr->hasVariable($var) ? preg_replace('/\s/', '', var_export($ptr->getValue($var), true)) : '>unassigned<';
+            $i = 0;
+            while (isset($ptr->_var_stack[ $i ])) {
+                $output .= "#{$ptr->_var_stack[ $i ]['name']} = ";
+                $output .= isset($ptr->_var_stack[ $i ][ 'tpl' ][$var]) ? preg_replace('/\s/', '', var_export($ptr->_var_stack[ $i ][ 'tpl' ][$var]->value, true)) : '>unassigned<';
+                $i ++;
+            }
             $ptr = $ptr->parent;
         } elseif (in_array('data', $types) && !($ptr instanceof Template || $ptr instanceof \Smarty\Smarty)) {
             $output .= "#data:\${$var} =";