Jelajahi Sumber

Merge branch 'Ennexa-master' into dev

Justin Hileman 6 tahun lalu
induk
melakukan
397a47ec4e
2 mengubah file dengan 3 tambahan dan 2 penghapusan
  1. 1 0
      .travis.yml
  2. 2 2
      src/Mustache/Parser.php

+ 1 - 0
.travis.yml

@@ -22,6 +22,7 @@ matrix:
       dist: trusty
   allow_failures:
     - php: hhvm
+    - php: 7.4snapshot
 
 script:
   - '[[ "$TRAVIS_PHP_VERSION" = 5.2* ]] && phpunit || vendor/bin/phpunit --verbose'

+ 2 - 2
src/Mustache/Parser.php

@@ -149,7 +149,7 @@ class Mustache_Parser
                 case Mustache_Tokenizer::T_BLOCK_VAR:
                     if ($this->pragmaBlocks) {
                         // 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;
                         }
                         $this->clearStandaloneLines($nodes, $tokens);
@@ -275,7 +275,7 @@ class Mustache_Parser
      */
     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);
         }
     }