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

Merge branch 'hotfix/2.5.1'

Browse Source
This commit is contained in:
Justin Hileman
2014-01-08 16:36:09 -08:00
parent dd528e765a 39dc20e691
commit 996c944fa2
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mustache/Engine.php
+1 -1
View File
@@ -23,7 +23,7 @@
*/
class Mustache_Engine
{
const VERSION = '2.5.0';
const VERSION = '2.5.1';
const SPEC_VERSION = '1.1.2';
const PRAGMA_FILTERS = 'FILTERS';
src/Mustache/Tokenizer.php
+1 -1
View File
@@ -200,7 +200,7 @@ class Mustache_Tokenizer
*/
private function flushBuffer()
{
if (!empty($this->buffer)) {
if (strlen($this->buffer) > 0) {
$this->tokens[] = array(
self::TYPE => self::T_TEXT,
self::LINE => $this->line,
test/Mustache/Test/TokenizerTest.php
+29
View File
@@ -159,6 +159,35 @@ class Mustache_Test_TokenizerTest extends PHPUnit_Framework_TestCase
)
),
// See https://github.com/bobthecow/mustache.php/issues/183
array(
"{{# a }}0{{/ a }}",
null,
array(
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_SECTION,
Mustache_Tokenizer::NAME => 'a',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 8,
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_TEXT,
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::VALUE => "0",
),
array(
Mustache_Tokenizer::TYPE => Mustache_Tokenizer::T_END_SECTION,
Mustache_Tokenizer::NAME => 'a',
Mustache_Tokenizer::OTAG => '{{',
Mustache_Tokenizer::CTAG => '}}',
Mustache_Tokenizer::LINE => 0,
Mustache_Tokenizer::INDEX => 9,
),
)
),
);
}
}