-
Notifications
You must be signed in to change notification settings - Fork 717
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prevent deprecation notices for implode, json_encode and substr modif…
…iers * Prevent deprecation notices for implode, json_encode and substr modifiers. * unit tests
- Loading branch information
Showing
7 changed files
with
209 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
<?php | ||
/** | ||
* Smarty plugin | ||
* | ||
* @package Smarty | ||
* @subpackage PluginsModifier | ||
*/ | ||
|
||
function smarty_modifier_implode($values, $separator = '') | ||
{ | ||
if (is_array($separator)) { | ||
return implode((string) ($values ?? ''), (array) $separator); | ||
} | ||
return implode((string) ($separator ?? ''), (array) $values); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<?php | ||
|
||
/** | ||
* Smarty plugin | ||
* | ||
* @package Smarty | ||
* @subpackage PluginsModifierCompiler | ||
*/ | ||
function smarty_modifiercompiler_json_encode($params) { | ||
return 'json_encode(' . $params[0] . (isset($params[1]) ? ', (int) ' . $params[1] : '') . ')'; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<?php | ||
|
||
/** | ||
* Smarty plugin | ||
* | ||
* @package Smarty | ||
* @subpackage PluginsModifierCompiler | ||
*/ | ||
function smarty_modifiercompiler_substr($params) { | ||
return 'substr((string) ' . $params[0] . ', (int) ' . $params[1] . | ||
(isset($params[2]) ? ', (int) ' . $params[2] : '') . ')'; | ||
} |
44 changes: 44 additions & 0 deletions
44
tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierImplodeTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<?php | ||
/** | ||
* Smarty PHPunit tests of modifier | ||
*/ | ||
|
||
/** | ||
* class for modifier tests | ||
* | ||
* @runTestsInSeparateProcess | ||
* @preserveGlobalState disabled | ||
* @backupStaticAttributes enabled | ||
*/ | ||
class PluginModifierImplodeTest extends PHPUnit_Smarty | ||
{ | ||
public function setUp(): void | ||
{ | ||
$this->setUpSmarty(__DIR__); | ||
} | ||
|
||
public function testDefault() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{""|implode:$v}'); | ||
$tpl->assign("v", ["1", "2"]); | ||
$this->assertEquals("12", $this->smarty->fetch($tpl)); | ||
} | ||
public function testWithSeparator() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{","|implode:$v}'); | ||
$tpl->assign("v", ["a", "b"]); | ||
$this->assertEquals("a,b", $this->smarty->fetch($tpl)); | ||
} | ||
public function testInConditional() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{if implode("", $v) == "abc"}good{else}bad{/if}'); | ||
$tpl->assign("v", ['a','b','c']); | ||
$this->assertEquals("good", $this->smarty->fetch($tpl)); | ||
} | ||
public function testInConditionalWithSeparator() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{if implode("-", $v) == "a-b-c"}good{else}bad{/if}'); | ||
$tpl->assign("v", ['a','b','c']); | ||
$this->assertEquals("good", $this->smarty->fetch($tpl)); | ||
} | ||
} |
76 changes: 76 additions & 0 deletions
76
tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierJsonEncodeTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
<?php | ||
/** | ||
* Smarty PHPunit tests of modifier | ||
*/ | ||
|
||
/** | ||
* class for modifier tests | ||
* | ||
* @runTestsInSeparateProcess | ||
* @preserveGlobalState disabled | ||
* @backupStaticAttributes enabled | ||
*/ | ||
class PluginModifierJsonEncodeTest extends PHPUnit_Smarty | ||
{ | ||
public function setUp(): void | ||
{ | ||
$this->setUpSmarty(__DIR__); | ||
} | ||
|
||
/** | ||
* @dataProvider dataForDefault | ||
*/ | ||
public function testDefault($value, $expected) | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{$v|json_encode}'); | ||
$tpl->assign("v", $value); | ||
$this->assertEquals($expected, $this->smarty->fetch($tpl)); | ||
} | ||
|
||
/** | ||
* @dataProvider dataForDefault | ||
*/ | ||
public function testDefaultAsFunction($value, $expected) | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{json_encode($v)}'); | ||
$tpl->assign("v", $value); | ||
$this->assertEquals($expected, $this->smarty->fetch($tpl)); | ||
} | ||
|
||
public function dataForDefault() { | ||
return [ | ||
["abc", '"abc"'], | ||
[["abc"], '["abc"]'], | ||
[["abc",["a"=>2]], '["abc",{"a":2}]'], | ||
]; | ||
} | ||
|
||
/** | ||
* @dataProvider dataForForceObject | ||
*/ | ||
public function testForceObject($value, $expected) | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{$v|json_encode:16}'); | ||
$tpl->assign("v", $value); | ||
$this->assertEquals($expected, $this->smarty->fetch($tpl)); | ||
} | ||
|
||
/** | ||
* @dataProvider dataForForceObject | ||
*/ | ||
public function testForceObjectAsFunction($value, $expected) | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{json_encode($v,16)}'); | ||
$tpl->assign("v", $value); | ||
$this->assertEquals($expected, $this->smarty->fetch($tpl)); | ||
} | ||
|
||
public function dataForForceObject() { | ||
return [ | ||
["abc", '"abc"'], | ||
[["abc"], '{"0":"abc"}'], | ||
[["abc",["a"=>2]], '{"0":"abc","1":{"a":2}}'], | ||
]; | ||
} | ||
|
||
} |
48 changes: 48 additions & 0 deletions
48
tests/UnitTests/TemplateSource/TagTests/PluginModifier/PluginModifierSubstrTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
<?php | ||
/** | ||
* Smarty PHPunit tests of modifier | ||
*/ | ||
|
||
/** | ||
* class for modifier tests | ||
* | ||
* @runTestsInSeparateProcess | ||
* @preserveGlobalState disabled | ||
* @backupStaticAttributes enabled | ||
*/ | ||
class PluginModifierSubstrTest extends PHPUnit_Smarty | ||
{ | ||
public function setUp(): void | ||
{ | ||
$this->setUpSmarty(__DIR__); | ||
} | ||
|
||
public function testDefault() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{$v|substr:1}'); | ||
$tpl->assign("v", "abc"); | ||
$this->assertEquals("bc", $this->smarty->fetch($tpl)); | ||
} | ||
|
||
public function testTwoArguments() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{$v|substr:1:1}'); | ||
$tpl->assign("v", "abc"); | ||
$this->assertEquals("b", $this->smarty->fetch($tpl)); | ||
} | ||
|
||
public function testNegativeOffset() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{$v|substr:-1}'); | ||
$tpl->assign("v", "abc"); | ||
$this->assertEquals("c", $this->smarty->fetch($tpl)); | ||
} | ||
|
||
public function testInConditional() | ||
{ | ||
$tpl = $this->smarty->createTemplate('string:{if substr($v, -1) == "c"}good{else}bad{/if}'); | ||
$tpl->assign("v", "abc"); | ||
$this->assertEquals("good", $this->smarty->fetch($tpl)); | ||
} | ||
|
||
} |