Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'KevBurnsJr/fixing_delimiters' into feature/delimiter-cleanup

Browse Source 
Conflicts:
	Mustache.php
	test/MustacheTest.php
This commit is contained in:
Justin Hileman
2011-06-13 04:03:38 -04:00
parent 1abf854af3 527bca37f3
commit 0c467311e8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+7 -1
View File
@@ -219,7 +219,6 @@ class Mustache {
* @return string Rendered Mustache template. * @return string Rendered Mustache template.
*/ */
protected function _renderTemplate($template) { protected function _renderTemplate($template) {
if ($section = $this->_findSection($template)) { if ($section = $this->_findSection($template)) {
list($before, $type, $tag_name, $content, $after) = $section; list($before, $type, $tag_name, $content, $after) = $section;
@@ -309,6 +308,13 @@ class Mustache {
$type = $matches['type'][0]; $type = $matches['type'][0];
$tag_name = trim($matches['tag_name'][0]); $tag_name = trim($matches['tag_name'][0]);
if (isset($matches['delims'][0])) {
list($otag, $ctag) = explode(' ', $matches['delims'][0]);
$regEx = $this->_prepareSectionRegEx($otag, $ctag);
$search_offset = $offset + strlen($match);
continue;
}
$search_offset = $offset + strlen($match); $search_offset = $offset + strlen($match);
switch ($type) { switch ($type) {
test/MustacheTest.php
+1 -1
View File
@@ -408,7 +408,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
public function testStickyDelimiters() { public function testStickyDelimiters() {
$m = new Mustache(null, array('result' => 'FAIL')); $m = new Mustache(null, array('result' => 'FAIL'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}{{ result }}[[={{ }}=]]')); $this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}{{ result }}[[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]]')); $this->assertEquals('{{#result}}{{/result}}', $m->render('{{=[[ ]]=}}{{#result}}{{/result}}[[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]][[={{ }}=]]')); $this->assertEquals('{{ result }}', $m->render('{{=[[ ]]=}}[[#result]]{{ result }}[[/result]][[={{ }}=]]'));
$this->assertEquals('{{ result }}', $m->render('{{#result}}{{=[[ ]]=}}{{ result }}[[/result]][[^result]][[={{ }}=]][[ result ]]{{/result}}')); $this->assertEquals('{{ result }}', $m->render('{{#result}}{{=[[ ]]=}}{{ result }}[[/result]][[^result]][[={{ }}=]][[ result ]]{{/result}}'));
} }