smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-03 01:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

default modifier uses empty instead of @ error suppression modifier when testing a variable

Browse Source 
Fixes #336
This commit is contained in:
Simon Wisselink
2021-03-21 23:39:42 +01:00
parent 4698dd9fb0
commit ae7c263fcb
23 changed files with 80 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -11,3 +11,4 @@ utilies/*.php
phpunit*
vendor/*
composer.lock
/composer.phar

1
CHANGELOG.md
View File

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Changed
- default modifier uses empty instead of @ error suppression modifier when testing a variable https://github.com/smarty-php/smarty/issues/336
- modifier escape now triggers a E_USER_NOTICE when an unsupported escape type is used https://github.com/smarty-php/smarty/pull/649
## [3.1.39] - 2021-02-17

10
libs/plugins/modifiercompiler.default.php
View File

@@ -18,7 +18,7 @@
*
* @return string with compiled code
*/
function smarty_modifiercompiler_default($params)
function smarty_modifiercompiler_default($params, Smarty_Internal_TemplateCompilerBase $compiler)
{
$output = $params[ 0 ];
if (!isset($params[ 1 ])) {
@@ -26,7 +26,13 @@ function smarty_modifiercompiler_default($params)
}
array_shift($params);
foreach ($params as $param) {
$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
if ($compiler->syntaxMatchesVariable($output)) {
$output = '(empty(' . $output . ') ? ' . $param . ' : ' . $output . ')';
} else {
$output = '(($tmp = ' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
}
}
return $output;
}

2
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -674,7 +674,7 @@ abstract class Smarty_Internal_TemplateCompilerBase
* @param $string
* @return bool
*/
private function syntaxMatchesVariable($string) {
public function syntaxMatchesVariable($string) {
static $regex_pattern = '/^\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*((->)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*|\[.*]*\])*$/';
return 1 === preg_match($regex_pattern, trim($string));
}

8
tests/UnitTests/A_Core/MuteExpectedErrors/MuteExpectedErrorsTest.php
View File

@@ -64,10 +64,10 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
$this->smarty->clearCompiledTemplate('default.tpl');
$this->smarty->fetch('default.tpl');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
$this->assertEquals(0, count($this->_errors));
@filemtime('ckxladanwijicajscaslyxck');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 3 : 3, count($this->_errors));
$this->assertEquals(1, count($this->_errors));
restore_error_handler();
}
@@ -112,11 +112,11 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
$this->smarty->clearCompiledTemplate('default.tpl');
$this->smarty->fetch('default.tpl');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
$this->assertEquals(0, count($this->_errors));
@filemtime('ckxladanwijicajscaslyxck');
$error = array(__FILE__ . ' line ' . (__LINE__ - 1));
$this->assertEquals(Smarty::$_IS_WINDOWS ? 3 : 3, count($this->_errors));
$this->assertEquals(1, count($this->_errors));
restore_error_handler();
}

6
tests/UnitTests/ResourceTests/File/FileResourceTest.php
View File

@@ -110,6 +110,9 @@ class FileResourceTest extends PHPUnit_Smarty
);
}
/**
* @doesNotPerformAssertions
*/
public function testGetCompiledTimestampPrepare()
{
$tpl = $this->smarty->createTemplate('helloworld.tpl');
@@ -142,6 +145,9 @@ class FileResourceTest extends PHPUnit_Smarty
$this->assertTrue($tpl->mustCompile());
}
/**
* @doesNotPerformAssertions
*/
public function testMustCompileTouchedSourcePrepare()
{
// touch to prepare next test

3
tests/UnitTests/ResourceTests/Php/PhpResourceTest.php
View File

@@ -161,7 +161,7 @@ class PhpResourceTest extends PHPUnit_Smarty
*
* @runInSeparateProcess
* @preserveGlobalState disabled
*
* @doesNotPerformAssertions
*/
public function testIsCachedTouchedSourcePrepare()
{
@@ -212,6 +212,7 @@ class PhpResourceTest extends PHPUnit_Smarty
/**
* test $smarty->is_cached
* @doesNotPerformAssertions
*/
public function testSmartyIsCachedPrepare()
{

1
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T1.tpl Normal file
View File

@@ -0,0 +1 @@
{* this is a comment *}

7
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T10.tpl Normal file
View File

@@ -0,0 +1,7 @@
=
{* comment *}
{* comment *}
b
{* comment *}
{* comment *}
=

7
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T11.tpl Normal file
View File

@@ -0,0 +1,7 @@
=
a
{* comment 1 *}
{* comment 2 *}
{* comment 3 *}
b
=

7
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T12.tpl Normal file
View File

@@ -0,0 +1,7 @@
=
a
{* comment 1 *}
{* comment 2 *}
{* comment 3 *}
b
=

7
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T13.tpl Normal file
View File

@@ -0,0 +1,7 @@
=
a
{* comment 1 *}
{* comment 2 *}
{* comment 3 *}
b
=

7
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T14.tpl Normal file
View File

@@ -0,0 +1,7 @@
=
a
{* comment 1 *}
{* comment 2 *}
{* comment 3 *}
b
=

1
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T2.tpl Normal file
View File

@@ -0,0 +1 @@
{* another $foo comment *}

1
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T3.tpl Normal file
View File

@@ -0,0 +1 @@
{* another comment *}some in between{* another comment *}

2
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T4.tpl Normal file
View File

@@ -0,0 +1,2 @@
{* multi line
comment *}

1
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T5.tpl Normal file
View File

@@ -0,0 +1 @@
{* /* foo * / *}

2
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T6.tpl Normal file
View File

@@ -0,0 +1,2 @@
A{* comment *}B
C

3
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T7.tpl Normal file
View File

@@ -0,0 +1,3 @@
D{* comment *}
{* comment *}E
F

2
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T8.tpl Normal file
View File

@@ -0,0 +1,2 @@
G{* multi
line *}H

3
tests/UnitTests/TemplateSource/Comments/templates_tmp/testComments_T9.tpl Normal file
View File

@@ -0,0 +1,3 @@
I{* multi
line *}
J

3
tests/UnitTests/TemplateSource/TagTests/PluginFunction/PluginFunctionHtmlImageTest.php
View File

@@ -20,6 +20,9 @@ class PluginFunctionHtmlImageTest extends PHPUnit_Smarty
$this->setUpSmarty(dirname(__FILE__));
}
/**
* @doesNotPerformAssertions
*/
public function testFoo()
{
// TODO: UnitTests for {html_image}

3
tests/UnitTests/TemplateSource/X_Scopes/ScopeTest.php
View File

@@ -291,6 +291,9 @@ class ScopeTest extends PHPUnit_Smarty
'no smarty', $i ++,),);
}
/**
* @doesNotPerformAssertions
*/
public function testFunctionScope()
{
$this->smarty->assign('scope', 'none');