Mibew/handlebars.php
1
0
Fork 0
mirror of https://github.com/Mibew/handlebars.php.git synced 2024-11-15 08:44:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes and Tests for #105

Browse Source
This commit is contained in:
Thomas Seven 2015-01-29 01:32:41 +01:00
parent 7b8482fc5f
commit 2b3d450849
3 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Handlebars/Helper/IfHelper.php
View File

@ -52,7 +52,11 @@ class IfHelper implements Helper
{
if (is_numeric($args)) {
$tmp = $args;
} else {
} elseif(preg_match('/^\'.*\'$/', trim($args))) {
$tmp = preg_replace('/^\'(.*)\'$/', '$1', trim($args));
} elseif(preg_match('/^".*"$/', trim($args))) {
$tmp = preg_replace('/^"(.*)"$/', '$1', trim($args));
} else {
$tmp = $context->get($args);
}

10
src/Handlebars/Helper/UnlessHelper.php
View File

@ -50,7 +50,15 @@ class UnlessHelper implements Helper
*/
public function execute(Template $template, Context $context, $args, $source)
{
$tmp = $context->get($args);
if (is_numeric($args)) {
$tmp = $args;
} elseif(preg_match('/^\'.*\'$/', trim($args))) {
$tmp = preg_replace('/^\'(.*)\'$/', '$1', trim($args));
} elseif(preg_match('/^".*"$/', trim($args))) {
$tmp = preg_replace('/^"(.*)"$/', '$1', trim($args));
} else {
$tmp = $context->get($args);
}
$context->push($context->last());

50
tests/Xamin/HandlebarsTest.php
View File

@ -1155,4 +1155,54 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
$args = new \Handlebars\Arguments($argsString);
$this->assertEquals($argsString, (string)$args);
}
public function stringLiteralsInIfAndUnlessHelpersProvider() {
return array(
// IfHelper
array('{{#if "truthyString"}}true{{else}}false{{/if}}', array(), "true"),
array("{{#if 'truthyStringSingleQuotes'}}true{{else}}false{{/if}}", array(), "true"),
array("{{#if ''}}true{{else}}false{{/if}}", array(), "false"),
array("{{#if '0'}}true{{else}}false{{/if}}", array(), "false"),
array("{{#if (add 0 1)}}true{{else}}false{{/if}}", array(), "true"),
array("{{#if (add 1 -1)}}true{{else}}false{{/if}}", array(), "false"),
// UnlessHelper
array('{{#unless "truthyString"}}true{{else}}false{{/unless}}', array(), "false"),
array("{{#unless 'truthyStringSingleQuotes'}}true{{else}}false{{/unless}}", array(), "false"),
array("{{#unless ''}}true{{else}}false{{/unless}}", array(), "true"),
array("{{#unless '0'}}true{{else}}false{{/unless}}", array(), "true"),
array("{{#unless (add 0 1)}}true{{else}}false{{/unless}}", array(), "false"),
array("{{#unless (add 1 -1)}}true{{else}}false{{/unless}}", array(), "true"),
);
}
/**
* Test integer literals in the context of if and unless helpers
*
* @param string $template template text
* @param array $data context data
* @param string $results The Expected Results
*
* @dataProvider stringLiteralsInIfAndUnlessHelpersProvider
*
* @return void
*/
public function testStringLiteralsInIfAndUnlessHelpers($template, $data, $results)
{
$engine = new \Handlebars\Handlebars();
$engine->addHelper('add', function ($template, $context, $args) {
$sum = 0;
foreach ($template->parseArguments($args) as $value) {
$sum += intval($context->get($value));
}
return $sum;
});
$res = $engine->render($template, $data);
$this->assertEquals($res, $results);
}
}