smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-06 11:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cherry-picked from da76d927ed

Browse Source 
Co-Authored-By: Thomas BACCELLI <tbaccelli@gmail.com>
This commit is contained in:
Thomas A. Hirsch
2022-01-18 13:57:58 +01:00
parent cdf0f2b164
commit 8d3a7af308
9 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sysplugins/smarty_internal_compile_function.php
View File

@@ -157,7 +157,7 @@ class Smarty_Internal_Compile_Functionclose extends Smarty_Internal_CompileBase
$output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php "; $output = "<?php echo \"/*%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/<?php ";
$output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n"; $output .= "\\\$_smarty_tpl->smarty->ext->_tplFunction->restoreTemplateVariables(\\\$_smarty_tpl, '{$_name}');?>\n";
$output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>"; $output .= "/*/%%SmartyNocache:{$compiler->template->compiled->nocache_hash}%%*/\";\n?>";
$output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash, ob_get_clean());\n"; $output .= "<?php echo str_replace('{$compiler->template->compiled->nocache_hash}', \$_smarty_tpl->compiled->nocache_hash ?? '', ob_get_clean());\n";
$output .= "}\n}\n"; $output .= "}\n}\n";
$output .= "/*/ {$_funcName}_nocache */\n\n"; $output .= "/*/ {$_funcName}_nocache */\n\n";
$output .= "?>\n"; $output .= "?>\n";

2
libs/sysplugins/smarty_internal_config_file_compiler.php
View File

@@ -158,7 +158,7 @@ class Smarty_Internal_Config_File_Compiler
} }
// template header code // template header code
$template_header = $template_header =
"<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . strftime("%Y-%m-%d %H:%M:%S") . "<?php /* Smarty version " . Smarty::SMARTY_VERSION . ", created on " . date("Y-m-d H:i:s") .
"\n"; "\n";
$template_header .= " compiled from '{$this->template->source->filepath}' */ ?>\n"; $template_header .= " compiled from '{$this->template->source->filepath}' */ ?>\n";
$code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' . $code = '<?php $_smarty_tpl->smarty->ext->configLoad->_loadConfigVars($_smarty_tpl, ' .

2
libs/sysplugins/smarty_internal_runtime_codeframe.php
View File

@@ -45,7 +45,7 @@ class Smarty_Internal_Runtime_CodeFrame
$properties[ 'cache_lifetime' ] = $_template->cache_lifetime; $properties[ 'cache_lifetime' ] = $_template->cache_lifetime;
} }
$output = "<?php\n"; $output = "<?php\n";
$output .= "/* Smarty version {$properties[ 'version' ]}, created on " . strftime("%Y-%m-%d %H:%M:%S") . $output .= "/* Smarty version {$properties[ 'version' ]}, created on " . date("Y-m-d H:i:s") .
"\n from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n"; "\n from '" . str_replace('*/', '* /', $_template->source->filepath) . "' */\n\n";
$output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n"; $output .= "/* @var Smarty_Internal_Template \$_smarty_tpl */\n";
$dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' . $dec = "\$_smarty_tpl->_decodeProperties(\$_smarty_tpl, " . var_export($properties, true) . ',' .

2
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -1135,7 +1135,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
flush(); flush();
} }
$e = new SmartyCompilerException($error_text); $e = new SmartyCompilerException($error_text);
$e->line = $line; $e->setLine($line);
$e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ])); $e->source = trim(preg_replace('![\t\r\n]+!', ' ', $match[ $line - 1 ]));
$e->desc = $args; $e->desc = $args;
$e->template = $this->template->source->filepath; $e->template = $this->template->source->filepath;

10
libs/sysplugins/smartycompilerexception.php
View File

@@ -16,12 +16,12 @@ class SmartyCompilerException extends SmartyException
} }
/** /**
* The line number of the template error * @param int $line
*
* @type int|null
*/ */
public $line = null; public function setLine($line)
{
$this->line = $line;
}
/** /**
* The template source snippet relating to the error * The template source snippet relating to the error
* *

3
tests/UnitTests/CacheResourceTests/_shared/CacheResourceTestCommon.php
View File

@@ -30,7 +30,8 @@ class CacheResourceTestCommon extends PHPUnit_Smarty
public function compiledPrefilter($text, Smarty_Internal_Template $tpl) public function compiledPrefilter($text, Smarty_Internal_Template $tpl)
{ {
return str_replace('#', $tpl->getTemplateVars('test'), $text); $replace = $tpl->getTemplateVars('test');
return str_replace('#', $replace ?? '', $text);
} }
/** /**

2
tests/UnitTests/ResourceTests/Stream/StreamResourceTest.php
View File

@@ -234,7 +234,7 @@ class ResourceStream
$v = &$GLOBALS[$this->varname]; $v = &$GLOBALS[$this->varname];
$l = strlen($data); $l = strlen($data);
$p = &$this->position; $p = &$this->position;
$v = substr($v, 0, $p) . $data . substr($v, $p += $l); $v = substr($v ?? '', 0, $p) . $data . substr($v ?? '', $p += $l);
return $l; return $l;
} }

2
tests/UnitTests/SecurityTests/SecurityTest.php
View File

@@ -416,7 +416,7 @@ class ResourceStreamSecurity
$v = &$GLOBALS[$this->varname]; $v = &$GLOBALS[$this->varname];
$l = strlen($data); $l = strlen($data);
$p = &$this->position; $p = &$this->position;
$v = substr($v, 0, $p) . $data . substr($v, $p += $l); $v = substr($v ?? '', 0, $p) . $data . substr($v ?? '', $p += $l);
return $l; return $l;
} }

2
tests/UnitTests/TemplateSource/ValueTests/Variables/Stream/StreamVariableTest.php
View File

@@ -96,7 +96,7 @@ class VariableStream
$v = &$GLOBALS[$this->varname]; $v = &$GLOBALS[$this->varname];
$l = strlen($data); $l = strlen($data);
$p = &$this->position; $p = &$this->position;
$v = substr($v, 0, $p) . $data . substr($v, $p += $l); $v = substr($v ?? '', 0, $p) . $data . substr($v ?? '', $p += $l);
return $l; return $l;
} }