Fixed DefaultPluginHandlerTest for function plugins (blocks still break)

src/Compile/Base.php

@@ -3,14 +3,15 @@
  * Smarty Internal Compile Plugin Base
  * @author     Uwe Tews
  */
-namespace Smarty\Compile\Tag;
+namespace Smarty\Compile;
+
 /**
  * This class does extend all internal compile plugins
  *
  * @package    Smarty
  * @subpackage Compiler
  */
-abstract class Base implements TagCompilerInterface {
+abstract class Base implements CompilerInterface {
 
 	/**
 	 * Array of names of required attribute required by tag

src/Compile/BlockCompiler.php

@@ -10,7 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 /**
  * Smarty Internal Plugin Compile Block Plugin Class

src/Compile/CompilerInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Smarty\Compile\Tag;
+namespace Smarty\Compile;
 
 /**
  * This class does extend all internal compile plugins
@@ -8,7 +8,7 @@ namespace Smarty\Compile\Tag;
  * @package    Smarty
  * @subpackage Compiler
  */
-interface TagCompilerInterface {
+interface CompilerInterface {
 
 	/**
 	 * Compiles code for the tag

src/Compile/DefaultHandlerFunctionCallCompiler.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Smarty\Compile;
+
+use Smarty\Compiler\Template;
+
+class DefaultHandlerFunctionCallCompiler extends Base {
+
+	/**
+	 * Attribute definition: Overwrites base class.
+	 *
+	 * @var array
+	 * @see BasePlugin
+	 */
+	public $optional_attributes = ['_any'];
+
+	/**
+	 * Compiles code for the execution of a registered function
+	 *
+	 * @param array $args array with attributes from parser
+	 * @param Template $compiler compiler object
+	 * @param array $parameter array with compilation parameter
+	 * @param string $tag name of tag
+	 * @param string $function name of function
+	 *
+	 * @return string compiled code
+	 * @throws \Smarty\CompilerException
+	 * @throws \Smarty\Exception
+	 */
+	public function compile($args, Template $compiler, $parameter = [], $tag = null, $function = null) {
+		// check and get attributes
+		$_attr = $this->getAttributes($compiler, $args);
+		unset($_attr['nocache']);
+
+		// convert attributes into parameter array string
+
+		$_paramsArray = [];
+		foreach ($_attr as $_key => $_value) {
+			if (is_int($_key)) {
+				$_paramsArray[] = "$_key=>$_value";
+			} else {
+				$_paramsArray[] = "'$_key'=>$_value";
+			}
+		}
+		$_params = 'array(' . implode(',', $_paramsArray) . ')';
+
+		$output = "\$_smarty_tpl->smarty->runPluginFromDefaultHandler(" . var_export($function, true) .
+			",'function',$_params, \$_smarty_tpl)";
+
+		if (!empty($parameter['modifierlist'])) {
+			$output = $compiler->compileModifier($parameter['modifierlist'], $output);
+		}
+		return "<?php echo {$output};?>\n";
+	}
+}

src/Compile/FunctionCallCompiler.php

@@ -10,9 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
 use Smarty\Compiler\Template;
-use Smarty\Smarty;
 
 /**
  * Smarty Internal Plugin Compile Registered Function Class

src/Compile/ModifierCompiler.php

@@ -10,7 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 /**
  * Smarty Internal Plugin Compile Modifier Class

src/Compile/ObjectMethodCallCompiler.php

@@ -10,7 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 /**
  * Smarty Internal Plugin Compile Object Function Class

src/Compile/PrintExpressionCompiler.php

@@ -10,7 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 use Smarty\Compiler\BaseCompiler;
 
 /**

src/Compile/SpecialVariableCompiler.php

@@ -10,7 +10,7 @@
 
 namespace Smarty\Compile;
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 use Smarty\Compile\Tag\Capture;
 use Smarty\Compile\Tag\ForeachTag;
 use Smarty\Compile\Tag\Section;

src/Compile/Tag/Assign.php

@@ -2,6 +2,7 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
 use Smarty\Smarty;
 
 /**

src/Compile/Tag/BCPluginWrapper.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 class BCPluginWrapper extends Base {
 
 	private $callback;

src/Compile/Tag/BreakTag.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Break Class
  *

src/Compile/Tag/Call.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Function_Call Class
  *

src/Compile/Tag/Capture.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Capture Class
  *

src/Compile/Tag/CaptureClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Captureclose Class
  *

src/Compile/Tag/Child.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Child Class
  *

src/Compile/Tag/ConfigLoad.php

@@ -10,6 +10,7 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
 use Smarty\Smarty;
 
 /**

src/Compile/Tag/Debug.php

@@ -11,6 +11,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Debug Class
  *

src/Compile/Tag/ElseIfTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile ElseIf Class
  *

src/Compile/Tag/ElseTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Else Class
  *

src/Compile/Tag/EvalTag.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Eval Class
  *

src/Compile/Tag/ForClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Forclose Class
  *

src/Compile/Tag/ForElse.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Forelse Class
  *

src/Compile/Tag/ForTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile For Class
  *

src/Compile/Tag/ForeachClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Foreachclose Class
  *

src/Compile/Tag/ForeachElse.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Foreachelse Class
  *

src/Compile/Tag/ForeachSection.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile ForeachSection Class
  *

src/Compile/Tag/FunctionClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Functionclose Class
  *

src/Compile/Tag/FunctionTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Function Class
  *

src/Compile/Tag/IfClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Ifclose Class
  *

src/Compile/Tag/IfTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile If Class
  *

src/Compile/Tag/IncludeTag.php

@@ -10,6 +10,7 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
 use Smarty\Compiler\Template;
 use Smarty\Smarty;
 use Smarty\Template\Compiled;

src/Compile/Tag/Inheritance.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Shared Inheritance
  * Shared methods for {extends} and {block} tags

src/Compile/Tag/Ldelim.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Ldelim Class
  *

src/Compile/Tag/MakeNocache.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Make_Nocache Class
  *

src/Compile/Tag/Nocache.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Nocache Class
  *

src/Compile/Tag/NocacheClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Nocacheclose Class
  *

src/Compile/Tag/SectionClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Sectionclose Class
  *

src/Compile/Tag/SectionElse.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Sectionelse Class
  *

src/Compile/Tag/Setfilter.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Setfilter Class
  *

src/Compile/Tag/SetfilterClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Setfilterclose Class
  *

src/Compile/Tag/WhileClose.php

@@ -10,6 +10,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile Whileclose Class
  *

src/Compile/Tag/WhileTag.php

@@ -2,6 +2,8 @@
 
 namespace Smarty\Compile\Tag;
 
+use Smarty\Compile\Base;
+
 /**
  * Smarty Internal Plugin Compile While Class
  *

src/Compiler/Template.php

@@ -11,6 +11,7 @@
 namespace Smarty\Compiler;
 
 use Smarty\Compile\BlockCompiler;
+use Smarty\Compile\DefaultHandlerFunctionCallCompiler;
 use Smarty\Compile\ModifierCompiler;
 use Smarty\Compile\ObjectMethodBlockCompiler;
 use Smarty\Compile\ObjectMethodCallCompiler;
@@ -634,9 +635,9 @@ class Template extends BaseCompiler {
 	 *
 	 * @param string $tag tag name
 	 *
-	 * @return ?\Smarty\Compile\Tag\TagCompilerInterface tag compiler object or null if not found or untrusted by security policy
+	 * @return ?\Smarty\Compile\CompilerInterface tag compiler object or null if not found or untrusted by security policy
 	 */
-	public function getTagCompiler($tag): ?\Smarty\Compile\Tag\TagCompilerInterface {
+	public function getTagCompiler($tag): ?\Smarty\Compile\CompilerInterface {
 
 		if (isset($this->smarty->security_policy) && !$this->smarty->security_policy->isTrustedTag($tag, $this)) {
 			return null;
@@ -1268,7 +1269,7 @@ class Template extends BaseCompiler {
 		}
 
 		if ($this->getPluginFromDefaultHandler($tag, Smarty::PLUGIN_FUNCTION)) {
-			$compiler = new FunctionCallCompiler();
+			$compiler = new DefaultHandlerFunctionCallCompiler();
 			return $compiler->compile($args, $this, $parameter, $tag, $base_tag);
 		}
 

src/Extension/BCPluginsAdapter.php

@@ -27,7 +27,7 @@ class BCPluginsAdapter extends Base {
 		return null;
 	}
 
-	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\TagCompilerInterface {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
 
 		$plugin = $this->findPlugin(\Smarty\Smarty::PLUGIN_COMPILER, $tag);
 		if ($plugin === null) {

src/Extension/Base.php

@@ -6,7 +6,7 @@ use Smarty\FunctionHandler\FunctionHandlerInterface;
 
 class Base implements ExtensionInterface {
 
-	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\TagCompilerInterface {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
 		return null;
 	}
 

src/Extension/CoreExtension.php

@@ -3,7 +3,7 @@
 namespace Smarty\Extension;
 
 class CoreExtension extends Base {
-	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\TagCompilerInterface {
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface {
 		switch ($tag) {
 			case 'append': return new \Smarty\Compile\Tag\Append();
 			case 'assign': return new \Smarty\Compile\Tag\Assign();

src/Extension/ExtensionInterface.php

@@ -4,7 +4,7 @@ namespace Smarty\Extension;
 
 interface ExtensionInterface {
 
-	public function getTagCompiler(string $tag): ?\Smarty\Compile\Tag\TagCompilerInterface;
+	public function getTagCompiler(string $tag): ?\Smarty\Compile\CompilerInterface;
 
 	public function getModifierCompiler(string $modifier): ?\Smarty\Compile\Modifier\ModifierCompilerInterface;
 

src/Smarty.php

@@ -2103,6 +2103,30 @@ class Smarty extends \Smarty\TemplateBase
 		return $this->default_plugin_handler_func;
 	}
 
+	public function runPluginFromDefaultHandler($tag, $plugin_type, $params, \Smarty\Template $template) {
+		$defaultPluginHandlerFunc = $this->getDefaultPluginHandlerFunc();
+
+		$callback = null;
+
+		// these are not used here
+		$script = null;
+		$cacheable = null;
+
+		if (call_user_func_array(
+			$defaultPluginHandlerFunc,
+			[
+				$tag,
+				$plugin_type,
+				null, // This used to pass $this->template, but this parameter has been removed in 5.0
+				&$callback,
+				&$script,
+				&$cacheable,
+			]
+		) && $callback) {
+			return $callback($params, $template);
+		}
+		throw new Exception("Default plugin handler: Returned callback for '{$tag}' not callable at runtime");
+	}
 
 	/**
 	 * load a filter of specified type and name

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

@@ -1,7 +1,7 @@
 <?php
 
 // compiler.test.php
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 class smarty_compiler_test extends Base
 {

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

@@ -1,7 +1,7 @@
 <?php
 
 // compiler.testclose.php
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 class smarty_compiler_testclose extends Base
 {

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

@@ -6,7 +6,7 @@
  * @subpackage PHPunitPlugin
  */
 
-use Smarty\Compile\Tag\Base;
+use Smarty\Compile\Base;
 
 /**
  * Smarty {getparams}