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

properly pop the context for fn and inverse callbacks

Browse Source 
fixes #160.
This commit is contained in:
behrooz shabani (everplays) 2016-11-16 21:52:19 +01:00
parent 198faa48d6
commit e5c03d3b01
No known key found for this signature in database
GPG Key ID: B0080BC0DE55C5F3
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Handlebars/Handlebars.php
View File

@ -335,7 +335,7 @@ class Handlebars
//I mean in this context (literally) //I mean in this context (literally)
//$template->discard($inContext); //$template->discard($inContext);
if ($defined) { if (!$defined) {
$inContext->pop(); $inContext->pop();
} }
@ -359,7 +359,7 @@ class Handlebars
$template->setStopToken(false); $template->setStopToken(false);
$buffer = $template->render($inContext); $buffer = $template->render($inContext);
if ($defined) { if (!$defined) {
$inContext->pop(); $inContext->pop();
} }

23
tests/Xamin/HandlebarsTest.php
View File

@ -592,9 +592,9 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
$expected1 = 'bonjour, mon nom est Foo! comment sont les enfants de votre 6 et dog?'; $expected1 = 'bonjour, mon nom est Foo! comment sont les enfants de votre 6 et dog?';
//case 2 - when //case 2 - when
$variable2 = array('gender' => 'female'); $variable2 = array('gender' => 'female', 'foo' => 'bar');
$template2 = "Hello {{#when gender '===' 'male'}}sir{{else}}maam{{/when}}"; $template2 = "Hello {{#when gender '===' 'male'}}sir{{else}}maam{{/when}} {{foo}}";
$expected2 = 'Hello maam'; $expected2 = 'Hello maam bar';
//case 3 - when else //case 3 - when else
$variable3 = array('gender' => 'male'); $variable3 = array('gender' => 'male');
@ -621,14 +621,15 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
$variable5 = $variable4; $variable5 = $variable4;
$variable5['me'] = 'Jack Doe'; $variable5['me'] = 'Jack Doe';
$variable5['admins'] = array('Jane Doe', 'John Doe'); $variable5['admins'] = array('Jane Doe', 'John Doe');
$template5 = "{{#in admins me}}<ul>".$template4."</ul>{{else}}No Access{{/in}}"; $template5 = "{{#in admins me}}<ul>".$template4."</ul>{{else}}No Access{{/in}}{{suffix}}";
$expected5 = 'No Access'; $expected5 = 'No Access';
//case 6 - array in else //case 6 - array in else
$variable6 = $variable5; $variable6 = $variable5;
$variable6['me'] = 'Jane Doe'; $variable6['me'] = 'Jane Doe';
$variable6['suffix'] = 'qux';
$template6 = $template5; $template6 = $template5;
$expected6 = '<ul><li>Jane Doe - Apr 04</li><li>John Doe - Jan 21</li></ul>'; $expected6 = '<ul><li>Jane Doe - Apr 04</li><li>John Doe - Jan 21</li></ul>qux';
//case 7 - nested templates and parent-grand variables //case 7 - nested templates and parent-grand variables
$variable7 = array('test' => 'Hello World'); $variable7 = array('test' => 'Hello World');
@ -638,6 +639,16 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
.'In 3: {{test6}} {{../../../test}}{{/nested2}}{{/nested1}}{{/nested1}}'; .'In 3: {{test6}} {{../../../test}}{{/nested2}}{{/nested1}}{{/nested1}}';
$expected7 = ' In 1: Hello World In 2: This is Test 5 In 3: This is Test 6 Hello World'; $expected7 = ' In 1: Hello World In 2: This is Test 5 In 3: This is Test 6 Hello World';
//case 8 - when inside an each
$variable8 = array('data' => array(0, 1, 2, 3),'finish' => 'ok');
$template8 = '{{#each data}}{{#when this ">" "0"}}{{this}}{{/when}}{{/each}} {{finish}}';
$expected8 = '123 ok';
//case 9 - when inside an each
$variable9 = array('data' => array(),'finish' => 'ok');
$template9 = '{{#each data}}{{#when this ">" "0"}}{{this}}{{/when}}{{else}}foo{{/each}} {{finish}}';
$expected9 = 'foo ok';
//LAST UP: the actual testing //LAST UP: the actual testing
$this->assertEquals($expected1, $engine->render($template1, $variable1)); $this->assertEquals($expected1, $engine->render($template1, $variable1));
@ -647,6 +658,8 @@ class HandlebarsTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expected5, $engine->render($template5, $variable5)); $this->assertEquals($expected5, $engine->render($template5, $variable5));
$this->assertEquals($expected6, $engine->render($template6, $variable6)); $this->assertEquals($expected6, $engine->render($template6, $variable6));
$this->assertEquals($expected7, $engine->render($template7, $variable7)); $this->assertEquals($expected7, $engine->render($template7, $variable7));
$this->assertEquals($expected8, $engine->render($template8, $variable8));
$this->assertEquals($expected9, $engine->render($template9, $variable9));
} }
public function testInvalidHelper() public function testInvalidHelper()