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

Clean up pragma exception fix, add test coverage.

Browse Source
This commit is contained in:
Justin Hileman
2012-01-15 18:29:57 -08:00
parent 98e37ef4bf
commit 36ac3710f1
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+5 -5
View File
@@ -403,11 +403,12 @@ class Mustache {
$options_string = $matches['options_string']; $options_string = $matches['options_string'];
if (!in_array($pragma_name, $this->_pragmasImplemented)) { if (!in_array($pragma_name, $this->_pragmasImplemented)) {
if($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) if ($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) {
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA); throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
else } else {
return ''; return '';
} }
}
$options = array(); $options = array();
foreach (explode(' ', trim($options_string)) as $o) { foreach (explode(' ', trim($options_string)) as $o) {
@@ -451,10 +452,9 @@ class Mustache {
*/ */
protected function _getPragmaOptions($pragma_name) { protected function _getPragmaOptions($pragma_name) {
if (!$this->_hasPragma($pragma_name)) { if (!$this->_hasPragma($pragma_name)) {
if($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) if ($this->_throwsException(MustacheException::UNKNOWN_PRAGMA)) {
throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA); throw new MustacheException('Unknown pragma: ' . $pragma_name, MustacheException::UNKNOWN_PRAGMA);
else }
return array();
} }
return (is_array($this->_localPragmas[$pragma_name])) ? $this->_localPragmas[$pragma_name] : array(); return (is_array($this->_localPragmas[$pragma_name])) ? $this->_localPragmas[$pragma_name] : array();
test/MustachePragmaTest.php
+24
View File
@@ -20,6 +20,20 @@ class MustachePragmaTest extends PHPUnit_Framework_TestCase {
$this->fail('Mustache should have thrown an unknown pragma exception'); $this->fail('Mustache should have thrown an unknown pragma exception');
} }
public function testSuppressUnknownPragmaException() {
$m = new LessWhinyMustache();
try {
$this->assertEquals('', $m->render('{{%I-HAVE-THE-GREATEST-MUSTACHE}}'));
} catch (MustacheException $e) {
if ($e->getCode() == MustacheException::UNKNOWN_PRAGMA) {
$this->fail('Mustache should have thrown an unknown pragma exception');
} else {
throw $e;
}
}
}
public function testPragmaReplace() { public function testPragmaReplace() {
$m = new Mustache(); $m = new Mustache();
$this->assertEquals('', $m->render('{{%UNESCAPED}}'), 'Pragma tag not removed'); $this->assertEquals('', $m->render('{{%UNESCAPED}}'), 'Pragma tag not removed');
@@ -48,3 +62,13 @@ class MustachePragmaTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('>>>', $m->render('{{{symbol}}}')); $this->assertEquals('>>>', $m->render('{{{symbol}}}'));
} }
} }
class LessWhinyMustache extends Mustache {
protected $_throwsExceptions = array(
MustacheException::UNKNOWN_VARIABLE => false,
MustacheException::UNCLOSED_SECTION => true,
MustacheException::UNEXPECTED_CLOSE_SECTION => true,
MustacheException::UNKNOWN_PARTIAL => false,
MustacheException::UNKNOWN_PRAGMA => false,
);
}