Custom delimiters tweaks.
* Add basic test for custom delimiters * Keep default delims backwards compatible
This commit is contained in:
@@ -54,7 +54,7 @@ class Mustache_Engine
|
|||||||
private $logger;
|
private $logger;
|
||||||
private $strictCallables = false;
|
private $strictCallables = false;
|
||||||
private $pragmas = array();
|
private $pragmas = array();
|
||||||
private $delimiters = '{{ }}';
|
private $delimiters;
|
||||||
|
|
||||||
// Services
|
// Services
|
||||||
private $tokenizer;
|
private $tokenizer;
|
||||||
@@ -621,7 +621,7 @@ class Mustache_Engine
|
|||||||
// Keep this list in alphabetical order :)
|
// Keep this list in alphabetical order :)
|
||||||
$chunks = array(
|
$chunks = array(
|
||||||
'charset' => $this->charset,
|
'charset' => $this->charset,
|
||||||
'delimiters' => $this->delimiters,
|
'delimiters' => $this->delimiters ? $this->delimiters : '{{ }}',
|
||||||
'entityFlags' => $this->entityFlags,
|
'entityFlags' => $this->entityFlags,
|
||||||
'escape' => isset($this->escape) ? 'custom' : 'default',
|
'escape' => isset($this->escape) ? 'custom' : 'default',
|
||||||
'key' => ($source instanceof Mustache_Source) ? $source->getKey() : 'source',
|
'key' => ($source instanceof Mustache_Source) ? $source->getKey() : 'source',
|
||||||
|
|||||||
@@ -349,6 +349,23 @@ class Mustache_Test_EngineTest extends Mustache_Test_FunctionalTestCase
|
|||||||
|
|
||||||
return array($name, $mustache);
|
return array($name, $mustache);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testCustomDelimiters()
|
||||||
|
{
|
||||||
|
$mustache = new Mustache_Engine(array(
|
||||||
|
'delimiters' => '[[ ]]',
|
||||||
|
'partials' => array(
|
||||||
|
'one' => '[[> two ]]',
|
||||||
|
'two' => '[[ a ]]',
|
||||||
|
),
|
||||||
|
));
|
||||||
|
|
||||||
|
$tpl = $mustache->loadTemplate('[[# a ]][[ b ]][[/a ]]');
|
||||||
|
$this->assertEquals('c', $tpl->render(array('a' => true, 'b' => 'c')));
|
||||||
|
|
||||||
|
$tpl = $mustache->loadTemplate('[[> one ]]');
|
||||||
|
$this->assertEquals('b', $tpl->render(array('a' => 'b')));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MustacheStub extends Mustache_Engine
|
class MustacheStub extends Mustache_Engine
|
||||||
|
|||||||
Reference in New Issue
Block a user