Mibew/handlebars.php
1
0
Fork 0
mirror of https://github.com/Mibew/handlebars.php.git synced 2025-05-03 02:26:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #123 from Zemistr/master

Browse Source 
Added support for class with __toString method as a context variable.
This commit is contained in:
fzerorubigd 2015-06-08 09:26:41 +04:30
commit 959834be09
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handlebars/Template.php
View File

@ -591,14 +591,14 @@ class Template
} }
if ($escaped) { if ($escaped) {
$args = $this->handlebars->getEscapeArgs(); $args = $this->handlebars->getEscapeArgs();
array_unshift($args, $value); array_unshift($args, (string)$value);
$value = call_user_func_array( $value = call_user_func_array(
$this->handlebars->getEscape(), $this->handlebars->getEscape(),
array_values($args) array_values($args)
); );
} }
return $value; return (string)$value;
} }
/** /**

11
tests/Xamin/HandlebarsTest.php
View File

@ -757,6 +757,9 @@ EOM;
// Reference array as string // Reference array as string
$this->assertEquals('Array', $engine->render('{{var}}', array('var' => array('test')))); $this->assertEquals('Array', $engine->render('{{var}}', array('var' => array('test'))));
// Test class with __toString method
$this->assertEquals('test', $engine->render('{{var}}', array('var' => new TestClassWithToStringMethod())));
$obj = new DateTime(); $obj = new DateTime();
$time = $obj->getTimestamp(); $time = $obj->getTimestamp();
$this->assertEquals($time, $engine->render('{{time.getTimestamp}}', array('time' => $obj))); $this->assertEquals($time, $engine->render('{{time.getTimestamp}}', array('time' => $obj)));
@ -1270,6 +1273,12 @@ EOM;
} }
class TestClassWithToStringMethod {
public function __toString() {
return 'test';
}
}
/** /**
* Testcase for testInlineLoader * Testcase for testInlineLoader
* *
@ -1282,4 +1291,4 @@ This is a inline template.
a a
b b
c c
d d