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

Merge branch 'patch-1' into dev

Browse Source
This commit is contained in:
Justin Hileman
2011-10-14 13:25:24 -07:00
parent a828af2869 30d23077c8
commit 11c3054f04
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+4 -4
View File
@@ -90,9 +90,9 @@ class Mustache {
* // opening and closing delimiters, as an array or a space-separated string * // opening and closing delimiters, as an array or a space-separated string
* 'delimiters' => '<% %>', * 'delimiters' => '<% %>',
* *
* // an array of pragmas to enable * // an array of pragmas to enable/disable
* 'pragmas' => array( * 'pragmas' => array(
* Mustache::PRAGMA_UNESCAPED * Mustache::PRAGMA_UNESCAPED => true
* ), * ),
* ); * );
* *
@@ -132,8 +132,8 @@ class Mustache {
} }
if (isset($options['pragmas'])) { if (isset($options['pragmas'])) {
foreach ($options['pragmas'] as $pragma_name) { foreach ($options['pragmas'] as $pragma_name => $pragma_value) {
if (!in_array($pragma_name, $this->_pragmasImplemented)) { if (!in_array($pragma_name, $this->_pragmasImplemented, true)) {
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA); throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
} }
} }
test/MustacheTest.php
+6 -6
View File
@@ -94,21 +94,21 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
array( array(
'charset' => 'UTF-8', 'charset' => 'UTF-8',
'delimiters' => '<< >>', 'delimiters' => '<< >>',
'pragmas' => array(Mustache::PRAGMA_UNESCAPED) 'pragmas' => array(Mustache::PRAGMA_UNESCAPED => true)
), ),
'UTF-8', 'UTF-8',
array('<<', '>>'), array('<<', '>>'),
array(Mustache::PRAGMA_UNESCAPED), array(Mustache::PRAGMA_UNESCAPED => true),
), ),
array( array(
array( array(
'charset' => 'cp866', 'charset' => 'cp866',
'delimiters' => array('[[[[', ']]]]'), 'delimiters' => array('[[[[', ']]]]'),
'pragmas' => array(Mustache::PRAGMA_UNESCAPED) 'pragmas' => array(Mustache::PRAGMA_UNESCAPED => true)
), ),
'cp866', 'cp866',
array('[[[[', ']]]]'), array('[[[[', ']]]]'),
array(Mustache::PRAGMA_UNESCAPED), array(Mustache::PRAGMA_UNESCAPED => true),
), ),
); );
} }
@@ -117,7 +117,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
* @expectedException MustacheException * @expectedException MustacheException
*/ */
public function testConstructorInvalidPragmaOptionsThrowExceptions() { public function testConstructorInvalidPragmaOptionsThrowExceptions() {
$mustache = new Mustache(null, null, null, array('pragmas' => array('banana phone'))); $mustache = new Mustache(null, null, null, array('pragmas' => array('banana phone' => true)));
} }
/** /**
@@ -195,7 +195,7 @@ class MustacheTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin'))); $this->assertEquals('Charlie Chaplin', $m->render(null, array('first_name' => 'Charlie', 'last_name' => 'Chaplin')));
$this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa'))); $this->assertEquals('Zappa, Frank', $m->render('{{last_name}}, {{first_name}}', array('first_name' => 'Frank', 'last_name' => 'Zappa')));
} }
/** /**
* @group interpolation * @group interpolation
* @dataProvider interpolationData * @dataProvider interpolationData