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

Improved php7-style default modifier that does not trigger custom error handlers. Fixes #617

Browse Source
This commit is contained in:
Simon Wisselink
2021-01-08 17:20:56 +01:00
parent c665217ae1
commit 8444ff7d61
3 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ function smarty_modifiercompiler_default($params)
}
array_shift($params);
foreach ($params as $param) {
$output = '(($tmp = @' . $output . ')===null||$tmp===\'\' ? ' . $param . ' : $tmp)';
$output = '(($tmp = ' . $output . ' ?? null)===null||$tmp===\'\' ? ' . $param . ' ?? null : $tmp)';
}
return $output;
}

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

@@ -20,8 +20,13 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
public function setUp(): void
{
$this->setUpSmarty(dirname(__FILE__));
set_error_handler(array($this, 'error_handler'));
}
public function tearDown(): void {
restore_error_handler();
parent::tearDown();
}
public function testInit()
{
@@ -34,7 +39,7 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
public function testMuted()
{
set_error_handler(array($this, 'error_handler'));
Smarty::muteExpectedErrors();
$this->smarty->clearCache('default.tpl');
@@ -48,7 +53,6 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
$this->assertEquals($this->_errors, $error);
Smarty::unmuteExpectedErrors();
restore_error_handler();
}
/**
@@ -58,18 +62,16 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
*/
public function testUnmuted()
{
set_error_handler(array($this, 'error_handler'));
$this->smarty->clearCache('default.tpl');
$this->smarty->clearCompiledTemplate('default.tpl');
$this->smarty->fetch('default.tpl');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
$this->assertEquals($this->_errors, array());
@filemtime('ckxladanwijicajscaslyxck');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 3 : 3, count($this->_errors));
$this->assertEquals(1, count($this->_errors));
restore_error_handler();
}
/**
@@ -80,7 +82,6 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
*/
public function testMutedCaching()
{
set_error_handler(array($this, 'error_handler'));
Smarty::muteExpectedErrors();
$this->smarty->caching = true;
@@ -95,7 +96,6 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
$this->assertEquals($error, $this->_errors);
Smarty::unmuteExpectedErrors();
restore_error_handler();
}
/**
@@ -105,18 +105,16 @@ class MuteExpectedErrorsTest extends PHPUnit_Smarty
*/
public function testUnmutedCaching()
{
set_error_handler(array($this, 'error_handler'));
$this->smarty->caching = true;
$this->smarty->clearCache('default.tpl');
$this->smarty->clearCompiledTemplate('default.tpl');
$this->smarty->fetch('default.tpl');
$this->assertEquals(Smarty::$_IS_WINDOWS ? 2 : 2, count($this->_errors));
$this->assertEquals($this->_errors, array());
@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();
}

30
tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierDefaultTest.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
/**
* Smarty PHPunit tests of modifier
*
* @package PHPunit
* @author Rodney Rehm
*/
/**
* class for modifier tests
*
* @runTestsInSeparateProcess
* @preserveGlobalState disabled
* @backupStaticAttributes enabled
*/
class PluginModifierDefaultTest extends PHPUnit_Smarty
{
public function setUp(): void
{
$this->setUpSmarty(dirname(__FILE__));
}
public function testDefault()
{
$tpl = $this->smarty->createTemplate('string:{$array.a.b|default:$array.c:\'defaultval\'}');
$this->smarty->assign('array', []);
$this->assertEquals('defaultval', $this->smarty->fetch($tpl));
}
}