smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-09-25 11:50:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another edge case

Browse Source
This commit is contained in:
Simon Wisselink
2025-02-13 23:07:34 +01:00
parent 227859142a
commit a796aeb7b3
3 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -455,28 +455,28 @@ abstract class Smarty_Internal_TemplateCompilerBase
$this->smarty->_current_file = $this->template->source->filepath; $this->smarty->_current_file = $this->template->source->filepath;
// get template source // get template source
if (!empty($this->template->source->components)) { if (!empty($this->template->source->components)) {
$_compiled_code = '<?php $_smarty_tpl->_loadInheritance(); $_smarty_tpl->inheritance->init($_smarty_tpl, true); ?>'; $_compiled_code = '<?php $_smarty_tpl->_loadInheritance(); $_smarty_tpl->inheritance->init($_smarty_tpl, true); ?>';
$i = 0; $i = 0;
$reversed_components = array_reverse($this->template->getSource()->components); $reversed_components = array_reverse($this->template->getSource()->components);
foreach ($reversed_components as $source) { foreach ($reversed_components as $source) {
$i++; $i++;
if ($i === count($reversed_components)) { if ($i === count($reversed_components)) {
$_compiled_code .= '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl); ?>'; $_compiled_code .= '<?php $_smarty_tpl->inheritance->endChild($_smarty_tpl); ?>';
} }
$_compiled_code .= $this->compileTag( $_compiled_code .= $this->compileTag(
'include', 'include',
[ [
var_export($source->resource, true), var_export($source->resource, true),
['scope' => 'parent'], ['scope' => 'parent'],
] ]
); );
} }
$_compiled_code = $this->postFilter($_compiled_code, $this->template); $_compiled_code = $this->postFilter($_compiled_code, $this->template);
} else { } else {
// get template source // get template source
$_content = $this->template->source->getContent(); $_content = $this->template->source->getContent();
$_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true)); $_compiled_code = $this->postFilter($this->doCompile($this->preFilter($_content), true));
} }
if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) { if (!empty($this->required_plugins[ 'compiled' ]) || !empty($this->required_plugins[ 'nocache' ])) {
$_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code; $_compiled_code = '<?php ' . $this->compileRequiredPlugins() . "?>\n" . $_compiled_code;
@@ -618,8 +618,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) { if (!$this->smarty->security_policy || $this->smarty->security_policy->isTrustedPhpFunction($name, $this)) {
if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0 if (strcasecmp($name, 'isset') === 0 || strcasecmp($name, 'empty') === 0
|| strcasecmp($name, 'array') === 0 || strcasecmp($name, 'array') === 0
|| is_callable($name) || (is_callable($name) && !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name]))
|| isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])
) { ) {
$func_name = smarty_strtolower_ascii($name); $func_name = smarty_strtolower_ascii($name);
@@ -651,37 +650,42 @@ abstract class Smarty_Internal_TemplateCompilerBase
} }
if ($func_name === 'empty') { if ($func_name === 'empty') {
return $func_name . '(' . return $func_name . '(' .
str_replace("')->value", "',null,true,false)->value", $parameter[ 0 ]) . ')'; str_replace("')->value", "',null,true,false)->value", $parameter[0]) . ')';
} else { } else {
return $func_name . '(' . $parameter[ 0 ] . ')'; return $func_name . '(' . $parameter[0] . ')';
} }
} else { } else {
if ( if (
!$this->smarty->loadPlugin('smarty_modifiercompiler_' . $name) !$this->smarty->loadPlugin('smarty_modifiercompiler_' . $name)
&& !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name]) && !isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])
&& !in_array($name, ['time', 'join', 'is_array', 'in_array', 'count']) && !in_array($name, ['time', 'join', 'is_array', 'in_array', 'count'])
) { ) {
trigger_error('Using unregistered function "' . $name . '" in a template is deprecated and will be ' . trigger_error('Using unregistered function "' . $name . '" in a template is deprecated and will be ' .
'removed in a future release. Use Smarty::registerPlugin to explicitly register ' . 'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
'a custom modifier.', E_USER_DEPRECATED); 'a custom modifier.', E_USER_DEPRECATED);
} }
if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0]) return $name . '(' . implode(',', $parameter) . ')';
&& !is_string($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0])) {
return sprintf(
'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
Smarty::PLUGIN_MODIFIER,
var_export($name, true),
implode(',', $parameter)
);
}
return $name . '(' . implode(',', $parameter) . ')';
} }
} else {
$this->trigger_template_error("unknown function '{$name}'");
} }
} }
if (isset($this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name])) {
if ($name === $this->smarty->registered_plugins[Smarty::PLUGIN_MODIFIER][$name][0]) {
return $name . '(' . implode(',', $parameter) . ')';
}
return sprintf(
'call_user_func_array($_smarty_tpl->registered_plugins[ \'%s\' ][ %s ][ 0 ], array( %s ))',
Smarty::PLUGIN_MODIFIER,
var_export($name, true),
implode(',', $parameter)
);
}
$this->trigger_template_error("unknown function '{$name}'");
} }
/** /**

2
tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierFirstClassCallablesTest.php
View File

@@ -51,5 +51,5 @@ if (PHP_VERSION_ID >= 80100) {
} }
function mymodifierfcc($a, $b, $c) function mymodifierfcc($a, $b, $c)
{ {
return "$a function $b $c"; return "$a function $b $c";
} }

16
tests/UnitTests/SmartyMethodsTests/RegisterModifier/RegisterModifierTest.php
View File

@@ -88,6 +88,22 @@ class RegisterModifierTest extends PHPUnit_Smarty
$this->smarty->unregisterPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier'); $this->smarty->unregisterPlugin(Smarty::PLUGIN_MODIFIER, 'testmodifier');
$this->assertTrue(isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK]['testmodifier'])); $this->assertTrue(isset($this->smarty->registered_plugins[Smarty::PLUGIN_BLOCK]['testmodifier']));
} }
public function testRegisterNativePhpFuncAsString()
{
$this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'strrev', 'strrev');
$this->smarty->assign('myVar', 'andersom');
$this->assertEquals('mosredna', $this->smarty->fetch('string:{strrev($myVar)}'));
}
public function testRegisterNativePhpFuncUnderDifferentName()
{
$this->smarty->registerPlugin(Smarty::PLUGIN_MODIFIER, 'k_xyz_a', 'strrev');
$this->smarty->assign('myVar', 'andersom');
$this->assertEquals('mosredna', $this->smarty->fetch('string:{k_xyz_a($myVar)}'));
}
} }
function mymodifier($a, $b, $c) function mymodifier($a, $b, $c)