Merge branch 'release/2.6.1'

bobthecow · Jun 20, 2014 · 1430ca8 · 1430ca8
2 parents 43dc945 + b1e0a6d
commit 1430ca8
Show file tree

Hide file tree

Showing 17 changed files with 170 additions and 60 deletions.
diff --git a/bin/build_bootstrap.php b/bin/build_bootstrap.php
@@ -20,13 +20,13 @@
  * containing all Mustache library classes. This file can then be included in
  * your project, rather than requiring the Mustache Autoloader.
  */
-$baseDir = realpath(dirname(__FILE__).'/..');
+$baseDir = realpath(dirname(__FILE__) . '/..');
 
-require $baseDir.'/src/Mustache/Autoloader.php';
+require $baseDir . '/src/Mustache/Autoloader.php';
 Mustache_Autoloader::register();
 
 // delete the old file
-$file = $baseDir.'/mustache.php';
+$file = $baseDir . '/mustache.php';
 if (file_exists($file)) {
     unlink($file);
 }
@@ -77,7 +77,7 @@
  */
 class SymfonyClassCollectionLoader
 {
-    static private $loaded;
+    private static $loaded;
 
     const HEADER = <<<EOS
 <?php
@@ -102,7 +102,7 @@ class SymfonyClassCollectionLoader
      *
      * @throws InvalidArgumentException When class can't be loaded
      */
-    static public function load(array $classes, $cacheDir, $name, $extension = '.php')
+    public static function load(array $classes, $cacheDir, $name, $extension = '.php')
     {
         // each $name can only be loaded once per PHP process
         if (isset(self::$loaded[$name])) {
@@ -121,9 +121,9 @@ static public function load(array $classes, $cacheDir, $name, $extension = '.php
             $content .= preg_replace(array('/^\s*<\?php/', '/\?>\s*$/'), '', file_get_contents($r->getFileName()));
         }
 
-        $cache  = $cacheDir.'/'.$name.$extension;
+        $cache  = $cacheDir . '/' . $name . $extension;
         $header = sprintf(self::HEADER, strftime('%Y'));
-        self::writeCacheFile($cache, $header . substr(self::stripComments('<?php '.$content), 5));
+        self::writeCacheFile($cache, $header . substr(self::stripComments('<?php ' . $content), 5));
     }
 
     /**
@@ -134,7 +134,7 @@ static public function load(array $classes, $cacheDir, $name, $extension = '.php
      *
      * @throws RuntimeException when a cache file cannot be written
      */
-    static private function writeCacheFile($file, $content)
+    private static function writeCacheFile($file, $content)
     {
         $tmpFile = tempnam(dirname($file), basename($file));
         if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $file)) {
@@ -156,7 +156,7 @@ static private function writeCacheFile($file, $content)
      *
      * @return string The PHP string with the comments removed
      */
-    static private function stripComments($source)
+    private static function stripComments($source)
     {
         if (!function_exists('token_get_all')) {
             return $source;

diff --git a/bin/create_example.php b/bin/create_example.php
@@ -24,7 +24,6 @@
 
 define('EXAMPLE_PATH', realpath(dirname(__FILE__) . '/../test/fixtures/examples'));
 
-
 /**
  * transform a string to lowercase using underlines.
  * Examples:
@@ -37,7 +36,8 @@
  * @access public
  * @return string
  */
-function getLowerCaseName($name) {
+function getLowerCaseName($name)
+{
     return preg_replace_callback("/([A-Z])/", create_function (
         '$match',
         'return "_" . strtolower($match[1]);'
@@ -56,23 +56,25 @@ function getLowerCaseName($name) {
  * @access public
  * @return string
  */
-function getUpperCaseName($name) {
+function getUpperCaseName($name)
+{
     return preg_replace_callback("/_([a-z])/", create_function (
         '$match',
         'return strtoupper($match{1});'
     ), ucfirst($name));
 }
 
-
 /**
  * return the given value and echo it out appending "\n"
  *
  * @param mixed $value
  * @access public
  * @return mixed
  */
-function out($value) {
+function out($value)
+{
     echo $value . "\n";
+
     return $value;
 }
 
@@ -88,7 +90,8 @@ function out($value) {
  * @access public
  * @return string
  */
-function buildPath($directory, $filename = null,  $extension = null) {
+function buildPath($directory, $filename = null,  $extension = null)
+{
     return out(EXAMPLE_PATH . '/' . $directory.
                     ($extension !== null && $filename !== null ? '/' . $filename. "." . $extension : ""));
 }
@@ -101,8 +104,9 @@ function buildPath($directory, $filename = null,  $extension = null) {
  * @access public
  * @return void
  */
-function createDirectory($directory) {
-    if(!@mkdir(buildPath($directory))) {
+function createDirectory($directory)
+{
+    if (!@mkdir(buildPath($directory))) {
         die("FAILED to create directory\n");
     }
 }
@@ -118,17 +122,17 @@ function createDirectory($directory) {
  * @access public
  * @return void
  */
-function createFile($directory, $filename, $extension, $content = "") {
+function createFile($directory, $filename, $extension, $content = "")
+{
     $handle = @fopen(buildPath($directory, $filename, $extension), "w");
-    if($handle) {
+    if ($handle) {
         fwrite($handle, $content);
         fclose($handle);
     } else {
         die("FAILED to create file\n");
     }
 }
 
-
 /**
  * routine to create the example directory and 3 files
  *
@@ -142,7 +146,8 @@ function createFile($directory, $filename, $extension, $content = "") {
  * @access public
  * @return void
  */
-function main($example_name) {
+function main($example_name)
+{
     $lowercase = getLowerCaseName($example_name);
     $uppercase = getUpperCaseName($example_name);
     createDirectory($lowercase);
@@ -160,7 +165,7 @@ class {$uppercase} {
 }
 
 // check if enougth arguments are given
-if(count($argv) > 1) {
+if (count($argv) > 1) {
     // get the name of the example
     $example_name = $argv[1];
 

diff --git a/src/Mustache/Autoloader.php b/src/Mustache/Autoloader.php
@@ -14,7 +14,6 @@
  */
 class Mustache_Autoloader
 {
-
     private $baseDir;
 
     /**

diff --git a/src/Mustache/Compiler.php b/src/Mustache/Compiler.php
@@ -16,7 +16,6 @@
  */
 class Mustache_Compiler
 {
-
     private $sections;
     private $source;
     private $indentNextLine;

diff --git a/src/Mustache/Context.php b/src/Mustache/Context.php
@@ -134,6 +134,9 @@ private function findVariableInStack($id, array $stack)
     {
         for ($i = count($stack) - 1; $i >= 0; $i--) {
             if (is_object($stack[$i]) && !($stack[$i] instanceof Closure)) {
+
+                // Note that is_callable() *will not work here*
+                // See https://github.com/bobthecow/mustache.php/wiki/Magic-Methods
                 if (method_exists($stack[$i], $id)) {
                     return $stack[$i]->$id();
                 } elseif (isset($stack[$i]->$id)) {

diff --git a/src/Mustache/Engine.php b/src/Mustache/Engine.php
@@ -23,7 +23,7 @@
  */
 class Mustache_Engine
 {
-    const VERSION        = '2.6.0';
+    const VERSION        = '2.6.1';
     const SPEC_VERSION   = '1.1.2';
 
     const PRAGMA_FILTERS = 'FILTERS';
@@ -213,7 +213,7 @@ public function getEscape()
      */
     public function getEntityFlags()
     {
-      return $this->entityFlags;
+        return $this->entityFlags;
     }
 
     /**

diff --git a/src/Mustache/HelperCollection.php b/src/Mustache/HelperCollection.php
@@ -27,14 +27,16 @@ class Mustache_HelperCollection
      */
     public function __construct($helpers = null)
     {
-        if ($helpers !== null) {
-            if (!is_array($helpers) && !$helpers instanceof Traversable) {
-                throw new Mustache_Exception_InvalidArgumentException('HelperCollection constructor expects an array of helpers');
-            }
-
-            foreach ($helpers as $name => $helper) {
-                $this->add($name, $helper);
-            }
+        if ($helpers === null) {
+            return;
+        }
+
+        if (!is_array($helpers) && !$helpers instanceof Traversable) {
+            throw new Mustache_Exception_InvalidArgumentException('HelperCollection constructor expects an array of helpers');
+        }
+
+        foreach ($helpers as $name => $helper) {
+            $this->add($name, $helper);
         }
     }
 

diff --git a/src/Mustache/Loader.php b/src/Mustache/Loader.php
@@ -14,7 +14,6 @@
  */
 interface Mustache_Loader
 {
-
     /**
      * Load a Template by name.
      *

diff --git a/src/Mustache/Loader/MutableLoader.php b/src/Mustache/Loader/MutableLoader.php
@@ -14,7 +14,6 @@
  */
 interface Mustache_Loader_MutableLoader
 {
-
     /**
      * Set an associative array of Template sources for this loader.
      *

diff --git a/src/Mustache/Loader/StringLoader.php b/src/Mustache/Loader/StringLoader.php
@@ -25,7 +25,6 @@
  */
 class Mustache_Loader_StringLoader implements Mustache_Loader
 {
-
     /**
      * Load a Template by source.
      *

diff --git a/src/Mustache/Template.php b/src/Mustache/Template.php
@@ -16,7 +16,6 @@
  */
 abstract class Mustache_Template
 {
-
     /**
      * @var Mustache_Engine
      */

diff --git a/src/Mustache/Tokenizer.php b/src/Mustache/Tokenizer.php
@@ -16,7 +16,6 @@
  */
 class Mustache_Tokenizer
 {
-
     // Finite state machine states
     const IN_TEXT     = 0;
     const IN_TAG_TYPE = 1;
@@ -85,6 +84,8 @@ class Mustache_Tokenizer
     /**
      * Scan and tokenize template source.
      *
+     * @throws Mustache_Exception_SyntaxException when mismatched section tags are encountered.
+     *
      * @param string $text       Mustache template source to tokenize
      * @param string $delimiters Optionally, pass initial opening and closing delimiters (default: null)
      *
@@ -117,7 +118,7 @@ public function scan($text, $delimiters = null)
                     } else {
                         $char = $text[$i];
                         $this->buffer .= $char;
-                        if ($char == "\n") {
+                        if ($char === "\n") {
                             $this->flushBuffer();
                             $this->line++;
                         }
@@ -152,29 +153,49 @@ public function scan($text, $delimiters = null)
 
                 default:
                     if ($this->tagChange($this->ctag, $this->ctagLen, $text, $i)) {
-                        $this->tokens[] = array(
+                        $token = array(
                             self::TYPE  => $this->tagType,
                             self::NAME  => trim($this->buffer),
                             self::OTAG  => $this->otag,
                             self::CTAG  => $this->ctag,
                             self::LINE  => $this->line,
-                            self::INDEX => ($this->tagType == self::T_END_SECTION) ? $this->seenTag - $this->otagLen : $i + $this->ctagLen
+                            self::INDEX => ($this->tagType === self::T_END_SECTION) ? $this->seenTag - $this->otagLen : $i + $this->ctagLen
                         );
 
-                        $this->buffer = '';
-                        $i += $this->ctagLen - 1;
-                        $this->state = self::IN_TEXT;
-                        if ($this->tagType == self::T_UNESCAPED) {
-                            if ($this->ctag == '}}') {
-                                $i++;
+                        if ($this->tagType === self::T_UNESCAPED) {
+                            // Clean up `{{{ tripleStache }}}` style tokens.
+                            if ($this->ctag === '}}') {
+                                if (($i + 2 < $len) && $text[$i + 2] === '}') {
+                                    $i++;
+                                } else {
+                                    $msg = sprintf(
+                                        'Mismatched tag delimiters: %s on line %d',
+                                        $token[self::NAME],
+                                        $token[self::LINE]
+                                    );
+
+                                    throw new Mustache_Exception_SyntaxException($msg, $token);
+                                }
                             } else {
-                                // Clean up `{{{ tripleStache }}}` style tokens.
-                                $lastName = $this->tokens[count($this->tokens) - 1][self::NAME];
+                                $lastName = $token[self::NAME];
                                 if (substr($lastName, -1) === '}') {
-                                    $this->tokens[count($this->tokens) - 1][self::NAME] = trim(substr($lastName, 0, -1));
+                                    $token[self::NAME] = trim(substr($lastName, 0, -1));
+                                } else {
+                                    $msg = sprintf(
+                                        'Mismatched tag delimiters: %s on line %d',
+                                        $token[self::NAME],
+                                        $token[self::LINE]
+                                    );
+
+                                    throw new Mustache_Exception_SyntaxException($msg, $token);
                                 }
                             }
                         }
+
+                        $this->buffer = '';
+                        $i += $this->ctagLen - 1;
+                        $this->state = self::IN_TEXT;
+                        $this->tokens[] = $token;
                     } else {
                         $this->buffer .= $text[$i];
                     }

diff --git a/test/Mustache/Test/Cache/FilesystemCacheTest.php b/test/Mustache/Test/Cache/FilesystemCacheTest.php
@@ -17,7 +17,7 @@ class Mustache_Test_Cache_FilesystemCacheTest extends Mustache_Test_FunctionalTe
     public function testCacheGetNone()
     {
         $key = 'some key';
-        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);;
+        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);
         $loaded = $cache->load($key);
 
         $this->assertFalse($loaded);
@@ -27,7 +27,7 @@ public function testCachePut()
     {
         $key = 'some key';
         $value = '<?php /* some value */';
-        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);;
+        $cache = new Mustache_Cache_FilesystemCache(self::$tempDir);
         $cache->cache($key, $value);
         $loaded = $cache->load($key);
 

diff --git a/test/Mustache/Test/FiveThree/Functional/FiltersTest.php b/test/Mustache/Test/FiveThree/Functional/FiltersTest.php
@@ -46,7 +46,7 @@ public function singleFilterData()
             array(
                 '{{% FILTERS }}{{ date | longdate }}',
                 $helpers,
-                (object) array('date' => new DateTime('1/1/2000')),
+                (object) array('date' => new DateTime('1/1/2000', new DateTimeZone("UTC"))),
                 '2000-01-01 12:01:00'
             ),
 
@@ -72,7 +72,7 @@ public function testChainedFilters()
         });
 
         $foo = new \StdClass;
-        $foo->date = new DateTime('1/1/2000');
+        $foo->date = new DateTime('1/1/2000', new DateTimeZone("UTC"));
 
         $this->assertEquals('[[2000-01-01 12:01:00]]', $tpl->render($foo));
     }