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

Merge branch 'Ennexa-master' into dev

Browse Source
This commit is contained in:
Justin Hileman
2019-11-23 10:52:12 -08:00
parent 778906301c a04f70e8b5
commit 397a47ec4e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1
View File
@@ -22,6 +22,7 @@ matrix:
dist: trusty dist: trusty
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- php: 7.4snapshot
script: script:
- '[[ "$TRAVIS_PHP_VERSION" = 5.2* ]] && phpunit || vendor/bin/phpunit --verbose' - '[[ "$TRAVIS_PHP_VERSION" = 5.2* ]] && phpunit || vendor/bin/phpunit --verbose'
src/Mustache/Parser.php
+2 -2
View File
@@ -149,7 +149,7 @@ class Mustache_Parser
case Mustache_Tokenizer::T_BLOCK_VAR: case Mustache_Tokenizer::T_BLOCK_VAR:
if ($this->pragmaBlocks) { if ($this->pragmaBlocks) {
// BLOCKS pragma is enabled, let's do this! // BLOCKS pragma is enabled, let's do this!
if ($parent[Mustache_Tokenizer::TYPE] === Mustache_Tokenizer::T_PARENT) { if (isset($parent) && $parent[Mustache_Tokenizer::TYPE] === Mustache_Tokenizer::T_PARENT) {
$token[Mustache_Tokenizer::TYPE] = Mustache_Tokenizer::T_BLOCK_ARG; $token[Mustache_Tokenizer::TYPE] = Mustache_Tokenizer::T_BLOCK_ARG;
} }
$this->clearStandaloneLines($nodes, $tokens); $this->clearStandaloneLines($nodes, $tokens);
@@ -275,7 +275,7 @@ class Mustache_Parser
*/ */
private function checkIfTokenIsAllowedInParent($parent, array $token) private function checkIfTokenIsAllowedInParent($parent, array $token)
{ {
if ($parent[Mustache_Tokenizer::TYPE] === Mustache_Tokenizer::T_PARENT) { if (isset($parent) && $parent[Mustache_Tokenizer::TYPE] === Mustache_Tokenizer::T_PARENT) {
throw new Mustache_Exception_SyntaxException('Illegal content in < parent tag', $token); throw new Mustache_Exception_SyntaxException('Illegal content in < parent tag', $token);
} }
} }