XaBerr / JATE

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Compiler/TagVisitor.php

Doc Comments +6 added lines, -5 removed lines

@@ -7,7 +7,8 @@ 
 abstract class TagVisitor extends Visitor
 {
     /**
-     * @param Nodes\Tag $tag
+     * @param Tag $tag
+     * @param boolean $newLinePrettyPrint
      */
     protected function visitTagAttributes(Tag $tag, $newLinePrettyPrint, $close = '>')
     {
@@ -25,7 +26,7 @@ 
     }
 
     /**
-     * @param Nodes\Tag $tag
+     * @param Tag $tag
      */
     protected function initTagName(Tag $tag)
     {
@@ -47,7 +48,7 @@ 
     }
 
     /**
-     * @param Nodes\Tag $tag
+     * @param Tag $tag
      */
     protected function visitTagContents(Tag $tag)
     {
@@ -64,7 +65,7 @@ 
     }
 
     /**
-     * @param Nodes\Tag $tag
+     * @param Tag $tag
      */
     protected function compileTag(Tag $tag)
     {
@@ -78,7 +79,7 @@ 
     }
 
     /**
-     * @param Nodes\Tag $tag
+     * @param Tag $tag
      */
     protected function visitTag(Tag $tag)
     {

Indentation +91 added lines, -91 removed lines

@@ -6,95 +6,95 @@
 
 abstract class TagVisitor extends Visitor
 {
-    /**
-     * @param Nodes\Tag $tag
-     */
-    protected function visitTagAttributes(Tag $tag, $newLinePrettyPrint, $close = '>')
-    {
-        $open = '<' . $tag->name;
-
-        if (count($tag->attributes)) {
-            $this->buffer($this->indent() . $open, false);
-            $this->visitAttributes($tag->attributes);
-            $this->buffer($this->getClassesDisplayCode() . $close . $this->newline(), false);
-
-            return;
-        }
-
-        $this->buffer($open . $close, $newLinePrettyPrint ? null : false);
-    }
-
-    /**
-     * @param Nodes\Tag $tag
-     */
-    protected function initTagName(Tag $tag)
-    {
-        if (isset($tag->buffer)) {
-            if (preg_match('`^[a-z][a-zA-Z0-9]+(?!\()`', $tag->name)) {
-                $tag->name = '$' . $tag->name;
-            }
-            $tag->name = trim($this->createCode('echo ' . $tag->name . ';'));
-        }
-    }
-
-    protected function trimLastLine()
-    {
-        $key = count($this->buffer) - 1;
-        $this->buffer[$key] = substr($this->buffer[$key], 0, -1);
-        if ($this->prettyprint && substr($this->buffer[$key], -1) === ' ') {
-            $this->buffer[$key] = substr($this->buffer[$key], 0, -1);
-        }
-    }
-
-    /**
-     * @param Nodes\Tag $tag
-     */
-    protected function visitTagContents(Tag $tag)
-    {
-        $inc = $tag->keepWhiteSpaces() ? -$this->indents : 1;
-        $this->indents += $inc;
-        if (isset($tag->code)) {
-            $this->visitCode($tag->code);
-        }
-        $this->visit($tag->block);
-        if ($tag->keepWhiteSpaces() && substr(end($this->buffer), -1) === "\n") {
-            $this->trimLastLine();
-        }
-        $this->indents -= $inc;
-    }
-
-    /**
-     * @param Nodes\Tag $tag
-     */
-    protected function compileTag(Tag $tag)
-    {
-        $selfClosing = (in_array(strtolower($tag->name), $this->selfClosing) || $tag->selfClosing) && !$this->xml;
-        $this->visitTagAttributes($tag, !$tag->keepWhiteSpaces() && $this->prettyprint, (!$selfClosing || $this->terse) ? '>' : ' />');
-
-        if (!$selfClosing) {
-            $this->visitTagContents($tag);
-            $this->buffer('</' . $tag->name . '>', $tag->keepWhiteSpaces() ? false : null);
-        }
-    }
-
-    /**
-     * @param Nodes\Tag $tag
-     */
-    protected function visitTag(Tag $tag)
-    {
-        $this->initTagName($tag);
-
-        $insidePrettyprint = !$tag->canInline() && $this->prettyprint && !$tag->isInline();
-        $prettyprint = $tag->keepWhiteSpaces() || $insidePrettyprint;
-
-        if ($this->prettyprint && !$insidePrettyprint) {
-            $this->buffer[] = $this->indent();
-        }
-
-        $this->tempPrettyPrint($prettyprint, 'compileTag', $tag);
-
-        if (!$prettyprint && $this->prettyprint && !$tag->isInline()) {
-            $this->buffer[] = $this->newline();
-        }
-    }
+	/**
+	 * @param Nodes\Tag $tag
+	 */
+	protected function visitTagAttributes(Tag $tag, $newLinePrettyPrint, $close = '>')
+	{
+		$open = '<' . $tag->name;
+
+		if (count($tag->attributes)) {
+			$this->buffer($this->indent() . $open, false);
+			$this->visitAttributes($tag->attributes);
+			$this->buffer($this->getClassesDisplayCode() . $close . $this->newline(), false);
+
+			return;
+		}
+
+		$this->buffer($open . $close, $newLinePrettyPrint ? null : false);
+	}
+
+	/**
+	 * @param Nodes\Tag $tag
+	 */
+	protected function initTagName(Tag $tag)
+	{
+		if (isset($tag->buffer)) {
+			if (preg_match('`^[a-z][a-zA-Z0-9]+(?!\()`', $tag->name)) {
+				$tag->name = '$' . $tag->name;
+			}
+			$tag->name = trim($this->createCode('echo ' . $tag->name . ';'));
+		}
+	}
+
+	protected function trimLastLine()
+	{
+		$key = count($this->buffer) - 1;
+		$this->buffer[$key] = substr($this->buffer[$key], 0, -1);
+		if ($this->prettyprint && substr($this->buffer[$key], -1) === ' ') {
+			$this->buffer[$key] = substr($this->buffer[$key], 0, -1);
+		}
+	}
+
+	/**
+	 * @param Nodes\Tag $tag
+	 */
+	protected function visitTagContents(Tag $tag)
+	{
+		$inc = $tag->keepWhiteSpaces() ? -$this->indents : 1;
+		$this->indents += $inc;
+		if (isset($tag->code)) {
+			$this->visitCode($tag->code);
+		}
+		$this->visit($tag->block);
+		if ($tag->keepWhiteSpaces() && substr(end($this->buffer), -1) === "\n") {
+			$this->trimLastLine();
+		}
+		$this->indents -= $inc;
+	}
+
+	/**
+	 * @param Nodes\Tag $tag
+	 */
+	protected function compileTag(Tag $tag)
+	{
+		$selfClosing = (in_array(strtolower($tag->name), $this->selfClosing) || $tag->selfClosing) && !$this->xml;
+		$this->visitTagAttributes($tag, !$tag->keepWhiteSpaces() && $this->prettyprint, (!$selfClosing || $this->terse) ? '>' : ' />');
+
+		if (!$selfClosing) {
+			$this->visitTagContents($tag);
+			$this->buffer('</' . $tag->name . '>', $tag->keepWhiteSpaces() ? false : null);
+		}
+	}
+
+	/**
+	 * @param Nodes\Tag $tag
+	 */
+	protected function visitTag(Tag $tag)
+	{
+		$this->initTagName($tag);
+
+		$insidePrettyprint = !$tag->canInline() && $this->prettyprint && !$tag->isInline();
+		$prettyprint = $tag->keepWhiteSpaces() || $insidePrettyprint;
+
+		if ($this->prettyprint && !$insidePrettyprint) {
+			$this->buffer[] = $this->indent();
+		}
+
+		$this->tempPrettyPrint($prettyprint, 'compileTag', $tag);
+
+		if (!$prettyprint && $this->prettyprint && !$tag->isInline()) {
+			$this->buffer[] = $this->newline();
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -11,17 +11,17 @@ 
      */
     protected function visitTagAttributes(Tag $tag, $newLinePrettyPrint, $close = '>')
     {
-        $open = '<' . $tag->name;
+        $open = '<'.$tag->name;
 
         if (count($tag->attributes)) {
-            $this->buffer($this->indent() . $open, false);
+            $this->buffer($this->indent().$open, false);
             $this->visitAttributes($tag->attributes);
-            $this->buffer($this->getClassesDisplayCode() . $close . $this->newline(), false);
+            $this->buffer($this->getClassesDisplayCode().$close.$this->newline(), false);
 
             return;
         }
 
-        $this->buffer($open . $close, $newLinePrettyPrint ? null : false);
+        $this->buffer($open.$close, $newLinePrettyPrint ? null : false);
     }
 
     /**
@@ -31,9 +31,9 @@ 
     {
         if (isset($tag->buffer)) {
             if (preg_match('`^[a-z][a-zA-Z0-9]+(?!\()`', $tag->name)) {
-                $tag->name = '$' . $tag->name;
+                $tag->name = '$'.$tag->name;
             }
-            $tag->name = trim($this->createCode('echo ' . $tag->name . ';'));
+            $tag->name = trim($this->createCode('echo '.$tag->name.';'));
         }
     }
 
@@ -73,7 +73,7 @@ 
 
         if (!$selfClosing) {
             $this->visitTagContents($tag);
-            $this->buffer('</' . $tag->name . '>', $tag->keepWhiteSpaces() ? false : null);
+            $this->buffer('</'.$tag->name.'>', $tag->keepWhiteSpaces() ? false : null);
         }
     }
 

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Compiler/Visitor.php

Doc Comments +6 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
 abstract class Visitor extends KeywordsCompiler
 {
     /**
-     * @param Nodes\Node $node
+     * @param Node $node
      *
      * @return array
      */
@@ -23,7 +23,7 @@ 
     }
 
     /**
-     * @param Nodes\Node $node
+     * @param Node $node
      *
      * @return mixed
      */
@@ -56,7 +56,7 @@ 
     }
 
     /**
-     * @param Nodes\Literal $node
+     * @param Literal $node
      */
     protected function visitLiteral(Literal $node)
     {
@@ -65,7 +65,7 @@ 
     }
 
     /**
-     * @param Nodes\Block $block
+     * @param Block $block
      */
     protected function visitBlock(Block $block)
     {
@@ -75,7 +75,7 @@ 
     }
 
     /**
-     * @param Nodes\Doctype $doctype
+     * @param Doctype $doctype
      *
      * @throws \Exception
      */
@@ -97,7 +97,6 @@ 
     }
 
     /**
-     * @param Nodes\Mixin $mixin
      */
     protected function visitMixinBlock()
     {
@@ -119,7 +118,7 @@ 
     }
 
     /**
-     * @param Nodes\Comment $comment
+     * @param Comment $comment
      */
     protected function visitComment(Comment $comment)
     {

Indentation +125 added lines, -125 removed lines

@@ -10,129 +10,129 @@
 
 abstract class Visitor extends KeywordsCompiler
 {
-    /**
-     * @param Nodes\Node $node
-     *
-     * @return array
-     */
-    public function visit(Node $node)
-    {
-        $this->visitNode($node);
-
-        return $this->buffer;
-    }
-
-    /**
-     * @param Nodes\Node $node
-     *
-     * @return mixed
-     */
-    protected function visitNode(Node $node)
-    {
-        $fqn = get_class($node);
-        $parts = explode('\\', $fqn);
-        $name = strtolower(end($parts));
-        $method = 'visit' . ucfirst($name);
-
-        try {
-            return $this->$method($node);
-        } catch (\ErrorException $e) {
-            if (!in_array($e->getCode(), array(8, 33))) {
-                throw $e;
-            }
-
-            throw new \ErrorException(
-                'Error on the ' . $name .
-                (isset($node->name) ? ' "' . $node->name . '"' : '') .
-                ($this->filename ? ' in ' . $this->filename : '') .
-                ' line ' . $node->line . ":\n" . $e->getMessage(),
-                34,
-                1,
-                __FILE__,
-                __LINE__,
-                $e
-            );
-        }
-    }
-
-    /**
-     * @param Nodes\Literal $node
-     */
-    protected function visitLiteral(Literal $node)
-    {
-        $str = preg_replace('/\\n/', '\\\\n', $node->string);
-        $this->buffer($str);
-    }
-
-    /**
-     * @param Nodes\Block $block
-     */
-    protected function visitBlock(Block $block)
-    {
-        foreach ($block->nodes as $n) {
-            $this->visit($n);
-        }
-    }
-
-    /**
-     * @param Nodes\Doctype $doctype
-     *
-     * @throws \Exception
-     */
-    protected function visitDoctype(Doctype $doctype = null)
-    {
-        $doc = (empty($doctype->value) || $doctype === null || !isset($doctype->value))
-            ? 'default'
-            : strtolower($doctype->value);
-
-        $str = isset($this->doctypes[$doc])
-            ? $this->doctypes[$doc]
-            : "<!DOCTYPE {$doc}>";
-
-        $this->buffer($str . $this->newline());
-
-        $this->terse = (strtolower($str) === '<!doctype html>');
-
-        $this->xml = ($doc === 'xml');
-    }
-
-    /**
-     * @param Nodes\Mixin $mixin
-     */
-    protected function visitMixinBlock()
-    {
-        $name = var_export($this->visitedMixin->name, true);
-
-        $code = $this->restrictedScope
-            ? "\\Jade\\Compiler::callMixinBlock($name, \$attributes);"
-            : "\$__varHandler = get_defined_vars(); \\Jade\\Compiler::callMixinBlockWithVars($name, \$__varHandler, \$attributes); extract(array_diff_key(\$__varHandler, array('__varHandler' => 1)));";
-
-        $this->buffer($this->createCode($code));
-    }
-
-    /**
-     * @param Nodes\Text $text
-     */
-    protected function visitText($text)
-    {
-        $this->buffer($this->interpolate($text->value));
-    }
-
-    /**
-     * @param Nodes\Comment $comment
-     */
-    protected function visitComment(Comment $comment)
-    {
-        if ($comment->buffer) {
-            $this->buffer('<!--' . $comment->value . '-->');
-        }
-    }
-
-    /**
-     * @param array $attributes
-     */
-    protected function visitAttributes($attributes)
-    {
-        $this->tempPrettyPrint(false, 'compileAttributes', $attributes);
-    }
+	/**
+	 * @param Nodes\Node $node
+	 *
+	 * @return array
+	 */
+	public function visit(Node $node)
+	{
+		$this->visitNode($node);
+
+		return $this->buffer;
+	}
+
+	/**
+	 * @param Nodes\Node $node
+	 *
+	 * @return mixed
+	 */
+	protected function visitNode(Node $node)
+	{
+		$fqn = get_class($node);
+		$parts = explode('\\', $fqn);
+		$name = strtolower(end($parts));
+		$method = 'visit' . ucfirst($name);
+
+		try {
+			return $this->$method($node);
+		} catch (\ErrorException $e) {
+			if (!in_array($e->getCode(), array(8, 33))) {
+				throw $e;
+			}
+
+			throw new \ErrorException(
+				'Error on the ' . $name .
+				(isset($node->name) ? ' "' . $node->name . '"' : '') .
+				($this->filename ? ' in ' . $this->filename : '') .
+				' line ' . $node->line . ":\n" . $e->getMessage(),
+				34,
+				1,
+				__FILE__,
+				__LINE__,
+				$e
+			);
+		}
+	}
+
+	/**
+	 * @param Nodes\Literal $node
+	 */
+	protected function visitLiteral(Literal $node)
+	{
+		$str = preg_replace('/\\n/', '\\\\n', $node->string);
+		$this->buffer($str);
+	}
+
+	/**
+	 * @param Nodes\Block $block
+	 */
+	protected function visitBlock(Block $block)
+	{
+		foreach ($block->nodes as $n) {
+			$this->visit($n);
+		}
+	}
+
+	/**
+	 * @param Nodes\Doctype $doctype
+	 *
+	 * @throws \Exception
+	 */
+	protected function visitDoctype(Doctype $doctype = null)
+	{
+		$doc = (empty($doctype->value) || $doctype === null || !isset($doctype->value))
+			? 'default'
+			: strtolower($doctype->value);
+
+		$str = isset($this->doctypes[$doc])
+			? $this->doctypes[$doc]
+			: "<!DOCTYPE {$doc}>";
+
+		$this->buffer($str . $this->newline());
+
+		$this->terse = (strtolower($str) === '<!doctype html>');
+
+		$this->xml = ($doc === 'xml');
+	}
+
+	/**
+	 * @param Nodes\Mixin $mixin
+	 */
+	protected function visitMixinBlock()
+	{
+		$name = var_export($this->visitedMixin->name, true);
+
+		$code = $this->restrictedScope
+			? "\\Jade\\Compiler::callMixinBlock($name, \$attributes);"
+			: "\$__varHandler = get_defined_vars(); \\Jade\\Compiler::callMixinBlockWithVars($name, \$__varHandler, \$attributes); extract(array_diff_key(\$__varHandler, array('__varHandler' => 1)));";
+
+		$this->buffer($this->createCode($code));
+	}
+
+	/**
+	 * @param Nodes\Text $text
+	 */
+	protected function visitText($text)
+	{
+		$this->buffer($this->interpolate($text->value));
+	}
+
+	/**
+	 * @param Nodes\Comment $comment
+	 */
+	protected function visitComment(Comment $comment)
+	{
+		if ($comment->buffer) {
+			$this->buffer('<!--' . $comment->value . '-->');
+		}
+	}
+
+	/**
+	 * @param array $attributes
+	 */
+	protected function visitAttributes($attributes)
+	{
+		$this->tempPrettyPrint(false, 'compileAttributes', $attributes);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
         $fqn = get_class($node);
         $parts = explode('\\', $fqn);
         $name = strtolower(end($parts));
-        $method = 'visit' . ucfirst($name);
+        $method = 'visit'.ucfirst($name);
 
         try {
             return $this->$method($node);
@@ -42,10 +42,10 @@ 
             }
 
             throw new \ErrorException(
-                'Error on the ' . $name .
-                (isset($node->name) ? ' "' . $node->name . '"' : '') .
-                ($this->filename ? ' in ' . $this->filename : '') .
-                ' line ' . $node->line . ":\n" . $e->getMessage(),
+                'Error on the '.$name.
+                (isset($node->name) ? ' "'.$node->name.'"' : '').
+                ($this->filename ? ' in '.$this->filename : '').
+                ' line '.$node->line.":\n".$e->getMessage(),
                 34,
                 1,
                 __FILE__,
@@ -89,7 +89,7 @@ 
             ? $this->doctypes[$doc]
             : "<!DOCTYPE {$doc}>";
 
-        $this->buffer($str . $this->newline());
+        $this->buffer($str.$this->newline());
 
         $this->terse = (strtolower($str) === '<!doctype html>');
 
@@ -124,7 +124,7 @@ 
     protected function visitComment(Comment $comment)
     {
         if ($comment->buffer) {
-            $this->buffer('<!--' . $comment->value . '-->');
+            $this->buffer('<!--'.$comment->value.'-->');
         }
     }
 

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Engine/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
      *
      * @param string $directory the directory to search in pug templates
      *
-     * @return array count of cached files and error count
+     * @return integer[] count of cached files and error count
      */
     public function cacheDirectory($directory)
     {

Indentation +28 added lines, -28 removed lines

@@ -9,35 +9,35 @@
  */
 abstract class Cache extends Filters
 {
-    /**
-     * Get cached input/file a matching cache file exists.
-     * Else, render the input, cache it in a file and return it.
-     *
-     * @param string input
-     *
-     * @throws \InvalidArgumentException
-     * @throws \Exception
-     *
-     * @return string
-     */
-    public function cache($input)
-    {
-        $cache = new CacheHelper($this);
+	/**
+	 * Get cached input/file a matching cache file exists.
+	 * Else, render the input, cache it in a file and return it.
+	 *
+	 * @param string input
+	 *
+	 * @throws \InvalidArgumentException
+	 * @throws \Exception
+	 *
+	 * @return string
+	 */
+	public function cache($input)
+	{
+		$cache = new CacheHelper($this);
 
-        return $cache->cache($input);
-    }
+		return $cache->cache($input);
+	}
 
-    /**
-     * Scan a directory recursively, compile them and save them into the cache directory.
-     *
-     * @param string $directory the directory to search in pug templates
-     *
-     * @return array count of cached files and error count
-     */
-    public function cacheDirectory($directory)
-    {
-        $cache = new CacheHelper($this);
+	/**
+	 * Scan a directory recursively, compile them and save them into the cache directory.
+	 *
+	 * @param string $directory the directory to search in pug templates
+	 *
+	 * @return array count of cached files and error count
+	 */
+	public function cacheDirectory($directory)
+	{
+		$cache = new CacheHelper($this);
 
-        return $cache->cacheDirectory($directory);
-    }
+		return $cache->cacheDirectory($directory);
+	}
 }

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Engine/Keywords.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
  */
 abstract class Keywords extends Cache
 {
+    /**
+     * @param string $keyword
+     */
     protected function hasKeyword($keyword)
     {
         return $this->hasValidCustomKeywordsOption() && isset($this->options['customKeywords'][$keyword]);

Indentation +64 added lines, -64 removed lines

@@ -7,77 +7,77 @@
  */
 abstract class Keywords extends Cache
 {
-    protected function hasKeyword($keyword)
-    {
-        return $this->hasValidCustomKeywordsOption() && isset($this->options['customKeywords'][$keyword]);
-    }
+	protected function hasKeyword($keyword)
+	{
+		return $this->hasValidCustomKeywordsOption() && isset($this->options['customKeywords'][$keyword]);
+	}
 
-    protected function hasValidCustomKeywordsOption()
-    {
-        return isset($this->options['customKeywords']) && (
-            is_array($this->options['customKeywords']) ||
-            $this->options['customKeywords'] instanceof \ArrayAccess
-        );
-    }
+	protected function hasValidCustomKeywordsOption()
+	{
+		return isset($this->options['customKeywords']) && (
+			is_array($this->options['customKeywords']) ||
+			$this->options['customKeywords'] instanceof \ArrayAccess
+		);
+	}
 
-    /**
-     * Set custom keyword.
-     *
-     * @param string   $keyword the keyword to be found.
-     * @param callable $action  action to be executed when the keyword is found.
-     */
-    public function setKeyword($keyword, $action)
-    {
-        if (!is_callable($action)) {
-            throw new \InvalidArgumentException("Please add a callable action for your keyword $keyword", 30);
-        }
+	/**
+	 * Set custom keyword.
+	 *
+	 * @param string   $keyword the keyword to be found.
+	 * @param callable $action  action to be executed when the keyword is found.
+	 */
+	public function setKeyword($keyword, $action)
+	{
+		if (!is_callable($action)) {
+			throw new \InvalidArgumentException("Please add a callable action for your keyword $keyword", 30);
+		}
 
-        if (!$this->hasValidCustomKeywordsOption()) {
-            $this->options['customKeywords'] = array();
-        }
+		if (!$this->hasValidCustomKeywordsOption()) {
+			$this->options['customKeywords'] = array();
+		}
 
-        $this->options['customKeywords'][$keyword] = $action;
-    }
+		$this->options['customKeywords'][$keyword] = $action;
+	}
 
-    /**
-     * Add custom keyword.
-     *
-     * @param string   $keyword the keyword to be found.
-     * @param callable $action  action to be executed when the keyword is found.
-     */
-    public function addKeyword($keyword, $action)
-    {
-        if ($this->hasKeyword($keyword)) {
-            throw new \InvalidArgumentException("The keyword $keyword is already set.", 31);
-        }
+	/**
+	 * Add custom keyword.
+	 *
+	 * @param string   $keyword the keyword to be found.
+	 * @param callable $action  action to be executed when the keyword is found.
+	 */
+	public function addKeyword($keyword, $action)
+	{
+		if ($this->hasKeyword($keyword)) {
+			throw new \InvalidArgumentException("The keyword $keyword is already set.", 31);
+		}
 
-        $this->setKeyword($keyword, $action);
-    }
+		$this->setKeyword($keyword, $action);
+	}
 
-    /**
-     * Replace custom keyword.
-     *
-     * @param string   $keyword the keyword to be found.
-     * @param callable $action  action to be executed when the keyword is found.
-     */
-    public function replaceKeyword($keyword, $action)
-    {
-        if (!$this->hasKeyword($keyword)) {
-            throw new \InvalidArgumentException("The keyword $keyword is not set.", 32);
-        }
+	/**
+	 * Replace custom keyword.
+	 *
+	 * @param string   $keyword the keyword to be found.
+	 * @param callable $action  action to be executed when the keyword is found.
+	 */
+	public function replaceKeyword($keyword, $action)
+	{
+		if (!$this->hasKeyword($keyword)) {
+			throw new \InvalidArgumentException("The keyword $keyword is not set.", 32);
+		}
 
-        $this->setKeyword($keyword, $action);
-    }
+		$this->setKeyword($keyword, $action);
+	}
 
-    /**
-     * Remove custom keyword.
-     *
-     * @param string $keyword the keyword to be removed.
-     */
-    public function removeKeyword($keyword)
-    {
-        if ($this->hasKeyword($keyword)) {
-            unset($this->options['customKeywords'][$keyword]);
-        }
-    }
+	/**
+	 * Remove custom keyword.
+	 *
+	 * @param string $keyword the keyword to be removed.
+	 */
+	public function removeKeyword($keyword)
+	{
+		if ($this->hasKeyword($keyword)) {
+			unset($this->options['customKeywords'][$keyword]);
+		}
+	}
 }

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Filter/AbstractFilter.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param Filter   $node
      * @param Compiler $compiler
      *
-     * @return mixed
+     * @return string
      */
     protected function getNodeString(Filter $node, Compiler $compiler = null)
     {

Indentation +37 added lines, -37 removed lines

@@ -10,45 +10,45 @@
  */
 abstract class AbstractFilter implements FilterInterface
 {
-    /**
-     * Returns the node string value, line by line.
-     * If the compiler is present, that means we need
-     * to interpolate line contents.
-     *
-     * @param Filter   $node
-     * @param Compiler $compiler
-     *
-     * @return mixed
-     */
-    protected function getNodeString(Filter $node, Compiler $compiler = null)
-    {
-        return array_reduce($node->block->nodes, function ($result, $line) use ($compiler) {
-            return $result . ($compiler
-                ? $compiler->interpolate($line->value)
-                : $line->value
-            ) . "\n";
-        });
-    }
+	/**
+	 * Returns the node string value, line by line.
+	 * If the compiler is present, that means we need
+	 * to interpolate line contents.
+	 *
+	 * @param Filter   $node
+	 * @param Compiler $compiler
+	 *
+	 * @return mixed
+	 */
+	protected function getNodeString(Filter $node, Compiler $compiler = null)
+	{
+		return array_reduce($node->block->nodes, function ($result, $line) use ($compiler) {
+			return $result . ($compiler
+				? $compiler->interpolate($line->value)
+				: $line->value
+			) . "\n";
+		});
+	}
 
-    public function __invoke(Filter $node, Compiler $compiler)
-    {
-        $nodes = $node->block->nodes;
-        $indent = strlen($nodes[0]->value) - strlen(ltrim($nodes[0]->value));
-        $code = '';
-        foreach ($nodes as $line) {
-            $code .= substr($compiler->interpolate($line->value), $indent) . "\n";
-        }
+	public function __invoke(Filter $node, Compiler $compiler)
+	{
+		$nodes = $node->block->nodes;
+		$indent = strlen($nodes[0]->value) - strlen(ltrim($nodes[0]->value));
+		$code = '';
+		foreach ($nodes as $line) {
+			$code .= substr($compiler->interpolate($line->value), $indent) . "\n";
+		}
 
-        if (method_exists($this, 'parse')) {
-            $code = $this->parse($code);
-        }
+		if (method_exists($this, 'parse')) {
+			$code = $this->parse($code);
+		}
 
-        if (isset($this->tag)) {
-            $code = '<' . $this->tag . (isset($this->textType) ? ' type="text/' . $this->textType . '"' : '') . '>' .
-                $code .
-                '</' . $this->tag . '>';
-        }
+		if (isset($this->tag)) {
+			$code = '<' . $this->tag . (isset($this->textType) ? ' type="text/' . $this->textType . '"' : '') . '>' .
+				$code .
+				'</' . $this->tag . '>';
+		}
 
-        return $code;
-    }
+		return $code;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -22,11 +22,11 @@ 
      */
     protected function getNodeString(Filter $node, Compiler $compiler = null)
     {
-        return array_reduce($node->block->nodes, function ($result, $line) use ($compiler) {
-            return $result . ($compiler
+        return array_reduce($node->block->nodes, function($result, $line) use ($compiler) {
+            return $result.($compiler
                 ? $compiler->interpolate($line->value)
                 : $line->value
-            ) . "\n";
+            )."\n";
         });
     }
 
@@ -36,7 +36,7 @@ 
         $indent = strlen($nodes[0]->value) - strlen(ltrim($nodes[0]->value));
         $code = '';
         foreach ($nodes as $line) {
-            $code .= substr($compiler->interpolate($line->value), $indent) . "\n";
+            $code .= substr($compiler->interpolate($line->value), $indent)."\n";
         }
 
         if (method_exists($this, 'parse')) {
@@ -44,9 +44,9 @@ 
         }
 
         if (isset($this->tag)) {
-            $code = '<' . $this->tag . (isset($this->textType) ? ' type="text/' . $this->textType . '"' : '') . '>' .
-                $code .
-                '</' . $this->tag . '>';
+            $code = '<'.$this->tag.(isset($this->textType) ? ' type="text/'.$this->textType.'"' : '').'>'.
+                $code.
+                '</'.$this->tag.'>';
         }
 
         return $code;

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Jade.php

Doc Comments +4 added lines, -1 removed lines

@@ -75,6 +75,7 @@ 
      * is missing in the executor include whitelist.
      * Returns false in any other case.
      *
+     * @param string $extension
      * @return bool
      */
     protected function whiteListNeeded($extension)
@@ -125,6 +126,7 @@ 
      * Throw a invalid argument exception if the option does not exists.
      *
      * @param string name
+     * @param string $name
      *
      * @throws \InvalidArgumentException
      */
@@ -265,6 +267,7 @@ 
      * the possibility to add $scope variables.
      *
      * @param string input
+     * @param string $input
      *
      * @throws \ErrorException
      *
@@ -287,7 +290,7 @@ 
      * Add a variable or an array of variables to be shared with all templates that will be rendered
      * by the instance of Pug.
      *
-     * @param array|string $variables|$key an associatives array of variable names and values, or a
+     * @param array|string $variables an associatives array of variable names and values, or a
      *                                     variable name if you wish to sahre only one
      * @param mixed        $value          if you pass an array as first argument, the second
      *                                     argument will be ignored, else it will used as the

Indentation +300 added lines, -300 removed lines

@@ -9,304 +9,304 @@
  */
 class Jade extends Keywords
 {
-    /**
-     * @var string
-     */
-    protected $streamName = 'jade';
-
-    /**
-     * @var array
-     */
-    protected $options = array(
-        'allowMixedIndent'   => true,
-        'allowMixinOverride' => true,
-        'cache'              => null,
-        'classAttribute'     => null,
-        'customKeywords'     => array(),
-        'extension'          => array('.pug', '.jade'),
-        'filterAutoLoad'     => true,
-        'indentChar'         => ' ',
-        'indentSize'         => 2,
-        'keepBaseName'       => false,
-        'keepNullAttributes' => false,
-        'phpSingleLine'      => false,
-        'postRender'         => null,
-        'preRender'          => null,
-        'prettyprint'        => false,
-        'restrictedScope'    => false,
-        'singleQuote'        => false,
-        'stream'             => null,
-        'upToDateCheck'      => true,
-    );
-
-    /**
-     * Built-in filters.
-     *
-     * @var array
-     */
-    protected $filters = array(
-        'php'        => 'Jade\Filter\Php',
-        'css'        => 'Jade\Filter\Css',
-        'cdata'      => 'Jade\Filter\Cdata',
-        'escaped'    => 'Jade\Filter\Escaped',
-        'javascript' => 'Jade\Filter\Javascript',
-    );
-
-    /**
-     * @var array
-     */
-    protected $sharedVariables = array();
-
-    /**
-     * Merge local options with constructor $options.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = array())
-    {
-        if (is_null($this->options['stream'])) {
-            $this->options['stream'] = $this->streamName . '.stream';
-        }
-        $this->options = array_merge($this->options, $options);
-    }
-
-    /**
-     * Returns true if suhosin extension is loaded and the stream name
-     * is missing in the executor include whitelist.
-     * Returns false in any other case.
-     *
-     * @return bool
-     */
-    protected function whiteListNeeded($extension)
-    {
-        return extension_loaded($extension) &&
-            false === strpos(
-                ini_get($extension . '.executor.include.whitelist'),
-                $this->options['stream']
-            );
-    }
-
-    /**
-     * Returns list of requirements in an array identified by keys.
-     * For each of them, the value can be true if the requirement is
-     * fullfilled, false else.
-     *
-     * If a requirement name is specified, returns only the matching
-     * boolean value for this requirement.
-     *
-     * @param string name
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return array|bool
-     */
-    public function requirements($name = null)
-    {
-        $requirements = array(
-            'streamWhiteListed' => !$this->whiteListNeeded('suhosin'),
-            'cacheFolderExists' => $this->options['cache'] && is_dir($this->options['cache']),
-            'cacheFolderIsWritable' => $this->options['cache'] && is_writable($this->options['cache']),
-        );
-
-        if ($name) {
-            if (!isset($requirements[$name])) {
-                throw new \InvalidArgumentException($name . ' is not in the requirements list (' . implode(', ', array_keys($requirements)) . ')', 19);
-            }
-
-            return $requirements[$name];
-        }
-
-        return $requirements;
-    }
-
-    /**
-     * Get standard or custom option, return the previously setted value or the default value else.
-     *
-     * Throw a invalid argument exception if the option does not exists.
-     *
-     * @param string name
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function getOption($name)
-    {
-        if (!array_key_exists($name, $this->options)) {
-            throw new \InvalidArgumentException("$name is not a valid option name.", 2);
-        }
-
-        return $this->options[$name];
-    }
-
-    /**
-     * Set one standard option (listed in $this->options).
-     *
-     * @param string name
-     * @param mixed option value
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return $this
-     */
-    public function setOption($name, $value)
-    {
-        if (!array_key_exists($name, $this->options)) {
-            throw new \InvalidArgumentException("$name is not a valid option name.", 3);
-        }
-
-        $this->options[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Set multiple standard options.
-     *
-     * @param array option list
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return $this
-     */
-    public function setOptions($options)
-    {
-        foreach ($options as $name => $value) {
-            $this->setOption($name, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set one custom option.
-     *
-     * @param string name
-     * @param mixed option value
-     *
-     * @return $this
-     */
-    public function setCustomOption($name, $value)
-    {
-        $this->options[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Set multiple custom options.
-     *
-     * @param array options list
-     *
-     * @return $this
-     */
-    public function setCustomOptions(array $options)
-    {
-        $this->options = array_merge($this->options, $options);
-
-        return $this;
-    }
-
-    /**
-     * Compile PHP code from a Pug input or a Pug file.
-     *
-     * @param string input
-     *
-     * @throws \Exception
-     *
-     * @return string
-     */
-    public function compile($input)
-    {
-        $parser = new Parser($input, null, $this->options);
-        $compiler = new Compiler($this->options, $this->filters, $parser->getFilename());
-        $php = $compiler->compile($parser->parse());
-        if (version_compare(PHP_VERSION, '7.0.0') < 0) {
-            $php = preg_replace_callback('/(' . preg_quote('\\Jade\\Compiler::getPropertyFromAnything', '/') . '\\(((?>[^()]+)|(?-2))*\\))[ \t]*(\\(((?>[^()]+)|(?-2))*\\))/', function ($match) {
-                return 'call_user_func(' . $match[1] . ', ' . $match[4] . ')';
-            }, $php);
-        }
-        $postRender = $this->getOption('postRender');
-        if (is_callable($postRender)) {
-            $php = call_user_func($postRender, $php);
-        }
-
-        return $php;
-    }
-
-    /**
-     * Compile HTML code from a Pug input or a Pug file.
-     *
-     * @param sring Pug input or file
-     * @param array vars to pass to the view
-     *
-     * @throws \Exception
-     *
-     * @return string
-     */
-    public function render($input, array $vars = array())
-    {
-        $file = $this->options['cache']
-            ? $this->cache($input)
-            : $this->stream($this->compile($input));
-
-        extract(array_merge($this->sharedVariables, $vars));
-        ob_start();
-        try {
-            include $file;
-        } catch (\Exception $e) {
-            ob_end_clean();
-            throw $e;
-        }
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Create a stream wrapper to allow
-     * the possibility to add $scope variables.
-     *
-     * @param string input
-     *
-     * @throws \ErrorException
-     *
-     * @return string
-     */
-    public function stream($input)
-    {
-        if ($this->whiteListNeeded('suhosin')) {
-            throw new \ErrorException('To run Pug.php on the fly, add "' . $this->options['stream'] . '" to the "suhosin.executor.include.whitelist" settings in your php.ini file.', 4);
-        }
-
-        if (!in_array($this->options['stream'], stream_get_wrappers())) {
-            stream_wrapper_register($this->options['stream'], 'Jade\Stream\Template');
-        }
-
-        return $this->options['stream'] . '://data;' . $input;
-    }
-
-    /**
-     * Add a variable or an array of variables to be shared with all templates that will be rendered
-     * by the instance of Pug.
-     *
-     * @param array|string $variables|$key an associatives array of variable names and values, or a
-     *                                     variable name if you wish to sahre only one
-     * @param mixed        $value          if you pass an array as first argument, the second
-     *                                     argument will be ignored, else it will used as the
-     *                                     variable value for the variable name you passed as first
-     *                                     argument
-     */
-    public function share($variables, $value = null)
-    {
-        if (!is_array($variables)) {
-            $variables = array(strval($variables) => $value);
-        }
-        $this->sharedVariables = array_merge($this->sharedVariables, $variables);
-    }
-
-    /**
-     * Remove all previously set shared variables.
-     */
-    public function resetSharedVariables()
-    {
-        $this->sharedVariables = array();
-    }
+	/**
+	 * @var string
+	 */
+	protected $streamName = 'jade';
+
+	/**
+	 * @var array
+	 */
+	protected $options = array(
+		'allowMixedIndent'   => true,
+		'allowMixinOverride' => true,
+		'cache'              => null,
+		'classAttribute'     => null,
+		'customKeywords'     => array(),
+		'extension'          => array('.pug', '.jade'),
+		'filterAutoLoad'     => true,
+		'indentChar'         => ' ',
+		'indentSize'         => 2,
+		'keepBaseName'       => false,
+		'keepNullAttributes' => false,
+		'phpSingleLine'      => false,
+		'postRender'         => null,
+		'preRender'          => null,
+		'prettyprint'        => false,
+		'restrictedScope'    => false,
+		'singleQuote'        => false,
+		'stream'             => null,
+		'upToDateCheck'      => true,
+	);
+
+	/**
+	 * Built-in filters.
+	 *
+	 * @var array
+	 */
+	protected $filters = array(
+		'php'        => 'Jade\Filter\Php',
+		'css'        => 'Jade\Filter\Css',
+		'cdata'      => 'Jade\Filter\Cdata',
+		'escaped'    => 'Jade\Filter\Escaped',
+		'javascript' => 'Jade\Filter\Javascript',
+	);
+
+	/**
+	 * @var array
+	 */
+	protected $sharedVariables = array();
+
+	/**
+	 * Merge local options with constructor $options.
+	 *
+	 * @param array $options
+	 */
+	public function __construct(array $options = array())
+	{
+		if (is_null($this->options['stream'])) {
+			$this->options['stream'] = $this->streamName . '.stream';
+		}
+		$this->options = array_merge($this->options, $options);
+	}
+
+	/**
+	 * Returns true if suhosin extension is loaded and the stream name
+	 * is missing in the executor include whitelist.
+	 * Returns false in any other case.
+	 *
+	 * @return bool
+	 */
+	protected function whiteListNeeded($extension)
+	{
+		return extension_loaded($extension) &&
+			false === strpos(
+				ini_get($extension . '.executor.include.whitelist'),
+				$this->options['stream']
+			);
+	}
+
+	/**
+	 * Returns list of requirements in an array identified by keys.
+	 * For each of them, the value can be true if the requirement is
+	 * fullfilled, false else.
+	 *
+	 * If a requirement name is specified, returns only the matching
+	 * boolean value for this requirement.
+	 *
+	 * @param string name
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return array|bool
+	 */
+	public function requirements($name = null)
+	{
+		$requirements = array(
+			'streamWhiteListed' => !$this->whiteListNeeded('suhosin'),
+			'cacheFolderExists' => $this->options['cache'] && is_dir($this->options['cache']),
+			'cacheFolderIsWritable' => $this->options['cache'] && is_writable($this->options['cache']),
+		);
+
+		if ($name) {
+			if (!isset($requirements[$name])) {
+				throw new \InvalidArgumentException($name . ' is not in the requirements list (' . implode(', ', array_keys($requirements)) . ')', 19);
+			}
+
+			return $requirements[$name];
+		}
+
+		return $requirements;
+	}
+
+	/**
+	 * Get standard or custom option, return the previously setted value or the default value else.
+	 *
+	 * Throw a invalid argument exception if the option does not exists.
+	 *
+	 * @param string name
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function getOption($name)
+	{
+		if (!array_key_exists($name, $this->options)) {
+			throw new \InvalidArgumentException("$name is not a valid option name.", 2);
+		}
+
+		return $this->options[$name];
+	}
+
+	/**
+	 * Set one standard option (listed in $this->options).
+	 *
+	 * @param string name
+	 * @param mixed option value
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return $this
+	 */
+	public function setOption($name, $value)
+	{
+		if (!array_key_exists($name, $this->options)) {
+			throw new \InvalidArgumentException("$name is not a valid option name.", 3);
+		}
+
+		$this->options[$name] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Set multiple standard options.
+	 *
+	 * @param array option list
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return $this
+	 */
+	public function setOptions($options)
+	{
+		foreach ($options as $name => $value) {
+			$this->setOption($name, $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set one custom option.
+	 *
+	 * @param string name
+	 * @param mixed option value
+	 *
+	 * @return $this
+	 */
+	public function setCustomOption($name, $value)
+	{
+		$this->options[$name] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Set multiple custom options.
+	 *
+	 * @param array options list
+	 *
+	 * @return $this
+	 */
+	public function setCustomOptions(array $options)
+	{
+		$this->options = array_merge($this->options, $options);
+
+		return $this;
+	}
+
+	/**
+	 * Compile PHP code from a Pug input or a Pug file.
+	 *
+	 * @param string input
+	 *
+	 * @throws \Exception
+	 *
+	 * @return string
+	 */
+	public function compile($input)
+	{
+		$parser = new Parser($input, null, $this->options);
+		$compiler = new Compiler($this->options, $this->filters, $parser->getFilename());
+		$php = $compiler->compile($parser->parse());
+		if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+			$php = preg_replace_callback('/(' . preg_quote('\\Jade\\Compiler::getPropertyFromAnything', '/') . '\\(((?>[^()]+)|(?-2))*\\))[ \t]*(\\(((?>[^()]+)|(?-2))*\\))/', function ($match) {
+				return 'call_user_func(' . $match[1] . ', ' . $match[4] . ')';
+			}, $php);
+		}
+		$postRender = $this->getOption('postRender');
+		if (is_callable($postRender)) {
+			$php = call_user_func($postRender, $php);
+		}
+
+		return $php;
+	}
+
+	/**
+	 * Compile HTML code from a Pug input or a Pug file.
+	 *
+	 * @param sring Pug input or file
+	 * @param array vars to pass to the view
+	 *
+	 * @throws \Exception
+	 *
+	 * @return string
+	 */
+	public function render($input, array $vars = array())
+	{
+		$file = $this->options['cache']
+			? $this->cache($input)
+			: $this->stream($this->compile($input));
+
+		extract(array_merge($this->sharedVariables, $vars));
+		ob_start();
+		try {
+			include $file;
+		} catch (\Exception $e) {
+			ob_end_clean();
+			throw $e;
+		}
+
+		return ob_get_clean();
+	}
+
+	/**
+	 * Create a stream wrapper to allow
+	 * the possibility to add $scope variables.
+	 *
+	 * @param string input
+	 *
+	 * @throws \ErrorException
+	 *
+	 * @return string
+	 */
+	public function stream($input)
+	{
+		if ($this->whiteListNeeded('suhosin')) {
+			throw new \ErrorException('To run Pug.php on the fly, add "' . $this->options['stream'] . '" to the "suhosin.executor.include.whitelist" settings in your php.ini file.', 4);
+		}
+
+		if (!in_array($this->options['stream'], stream_get_wrappers())) {
+			stream_wrapper_register($this->options['stream'], 'Jade\Stream\Template');
+		}
+
+		return $this->options['stream'] . '://data;' . $input;
+	}
+
+	/**
+	 * Add a variable or an array of variables to be shared with all templates that will be rendered
+	 * by the instance of Pug.
+	 *
+	 * @param array|string $variables|$key an associatives array of variable names and values, or a
+	 *                                     variable name if you wish to sahre only one
+	 * @param mixed        $value          if you pass an array as first argument, the second
+	 *                                     argument will be ignored, else it will used as the
+	 *                                     variable value for the variable name you passed as first
+	 *                                     argument
+	 */
+	public function share($variables, $value = null)
+	{
+		if (!is_array($variables)) {
+			$variables = array(strval($variables) => $value);
+		}
+		$this->sharedVariables = array_merge($this->sharedVariables, $variables);
+	}
+
+	/**
+	 * Remove all previously set shared variables.
+	 */
+	public function resetSharedVariables()
+	{
+		$this->sharedVariables = array();
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
     public function __construct(array $options = array())
     {
         if (is_null($this->options['stream'])) {
-            $this->options['stream'] = $this->streamName . '.stream';
+            $this->options['stream'] = $this->streamName.'.stream';
         }
         $this->options = array_merge($this->options, $options);
     }
@@ -81,7 +81,7 @@ 
     {
         return extension_loaded($extension) &&
             false === strpos(
-                ini_get($extension . '.executor.include.whitelist'),
+                ini_get($extension.'.executor.include.whitelist'),
                 $this->options['stream']
             );
     }
@@ -110,7 +110,7 @@ 
 
         if ($name) {
             if (!isset($requirements[$name])) {
-                throw new \InvalidArgumentException($name . ' is not in the requirements list (' . implode(', ', array_keys($requirements)) . ')', 19);
+                throw new \InvalidArgumentException($name.' is not in the requirements list ('.implode(', ', array_keys($requirements)).')', 19);
             }
 
             return $requirements[$name];
@@ -220,8 +220,8 @@ 
         $compiler = new Compiler($this->options, $this->filters, $parser->getFilename());
         $php = $compiler->compile($parser->parse());
         if (version_compare(PHP_VERSION, '7.0.0') < 0) {
-            $php = preg_replace_callback('/(' . preg_quote('\\Jade\\Compiler::getPropertyFromAnything', '/') . '\\(((?>[^()]+)|(?-2))*\\))[ \t]*(\\(((?>[^()]+)|(?-2))*\\))/', function ($match) {
-                return 'call_user_func(' . $match[1] . ', ' . $match[4] . ')';
+            $php = preg_replace_callback('/('.preg_quote('\\Jade\\Compiler::getPropertyFromAnything', '/').'\\(((?>[^()]+)|(?-2))*\\))[ \t]*(\\(((?>[^()]+)|(?-2))*\\))/', function($match) {
+                return 'call_user_func('.$match[1].', '.$match[4].')';
             }, $php);
         }
         $postRender = $this->getOption('postRender');
@@ -273,14 +273,14 @@ 
     public function stream($input)
     {
         if ($this->whiteListNeeded('suhosin')) {
-            throw new \ErrorException('To run Pug.php on the fly, add "' . $this->options['stream'] . '" to the "suhosin.executor.include.whitelist" settings in your php.ini file.', 4);
+            throw new \ErrorException('To run Pug.php on the fly, add "'.$this->options['stream'].'" to the "suhosin.executor.include.whitelist" settings in your php.ini file.', 4);
         }
 
         if (!in_array($this->options['stream'], stream_get_wrappers())) {
             stream_wrapper_register($this->options['stream'], 'Jade\Stream\Template');
         }
 
-        return $this->options['stream'] . '://data;' . $input;
+        return $this->options['stream'].'://data;'.$input;
     }
 
     /**

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Lexer/InputHandler.php

Doc Comments +5 added lines, -1 removed lines

@@ -50,7 +50,7 @@ 
     }
 
     /**
-     * @param $code
+     * @param string $code
      *
      * @return string
      */
@@ -112,6 +112,10 @@ 
         return $this->token('newline');
     }
 
+    /**
+     * @param string $firstChar
+     * @param integer $indents
+     */
     protected function getTokenFromIndent($firstChar, $indents)
     {
         if ($this->length() && $firstChar === "\n") {

Indentation +122 added lines, -122 removed lines

@@ -7,126 +7,126 @@
  */
 abstract class InputHandler
 {
-    /**
-     * @var string
-     */
-    public $input;
-
-    /**
-     * @var array
-     */
-    protected $deferred = array();
-
-    /**
-     * @var array
-     */
-    protected $indentStack = array();
-
-    /**
-     * @var array
-     */
-    protected $stash = array();
-
-    /**
-     * Set lexer input.
-     *
-     * @param string $input input string
-     */
-    public function setInput($input)
-    {
-        $this->input = preg_replace("/\r\n|\r/", "\n", $input);
-        $this->lineno = 1;
-        $this->deferred = array();
-        $this->indentStack = array();
-        $this->stash = array();
-    }
-
-    /**
-     * @return int
-     */
-    public function length()
-    {
-        return strlen($this->input);
-    }
-
-    /**
-     * @param $code
-     *
-     * @return string
-     */
-    protected function normalizeCode($code)
-    {
-        return $code = (substr($code, -1) === ':' && substr($code, -2, 1) !== ':')
-            ? substr($code, 0, -1)
-            : $code;
-    }
-
-    protected function testIndent($indent)
-    {
-        if (!preg_match('/^' . $indent . '/', substr($this->input, 1), $matches)) {
-            return;
-        }
-
-        if (!isset($this->identRE)) {
-            $this->identRE = $indent;
-        }
-
-        return array(
-            "\n" . $matches[0],
-            $matches[0],
-        );
-    }
-
-    protected function getNextIndent()
-    {
-        if (substr($this->input, 0, 1) !== "\n") {
-            return;
-        }
-
-        $indents = isset($this->identRE)
-            ? array($this->identRE)
-            : ($this->allowMixedIndent
-                ? array('[\\t ]*')
-                : array('\\t+', ' *')
-            );
-
-        foreach ($indents as $indent) {
-            if ($matches = $this->testIndent($indent)) {
-                return $matches;
-            }
-        }
-    }
-
-    protected function getWhiteSpacesTokens($indents)
-    {
-        if ($indents && count($this->indentStack) && $indents === $this->indentStack[0]) {
-            return $this->token('newline');
-        }
-
-        if ($indents) {
-            array_unshift($this->indentStack, $indents);
-
-            return $this->token('indent', $indents);
-        }
-
-        return $this->token('newline');
-    }
-
-    protected function getTokenFromIndent($firstChar, $indents)
-    {
-        if ($this->length() && $firstChar === "\n") {
-            return $this->token('newline');
-        }
-
-        if (count($this->indentStack) && $indents < $this->indentStack[0]) {
-            while (count($this->indentStack) && $indents < $this->indentStack[0]) {
-                array_push($this->stash, $this->token('outdent'));
-                array_shift($this->indentStack);
-            }
-
-            return array_pop($this->stash);
-        }
-
-        return $this->getWhiteSpacesTokens($indents);
-    }
+	/**
+	 * @var string
+	 */
+	public $input;
+
+	/**
+	 * @var array
+	 */
+	protected $deferred = array();
+
+	/**
+	 * @var array
+	 */
+	protected $indentStack = array();
+
+	/**
+	 * @var array
+	 */
+	protected $stash = array();
+
+	/**
+	 * Set lexer input.
+	 *
+	 * @param string $input input string
+	 */
+	public function setInput($input)
+	{
+		$this->input = preg_replace("/\r\n|\r/", "\n", $input);
+		$this->lineno = 1;
+		$this->deferred = array();
+		$this->indentStack = array();
+		$this->stash = array();
+	}
+
+	/**
+	 * @return int
+	 */
+	public function length()
+	{
+		return strlen($this->input);
+	}
+
+	/**
+	 * @param $code
+	 *
+	 * @return string
+	 */
+	protected function normalizeCode($code)
+	{
+		return $code = (substr($code, -1) === ':' && substr($code, -2, 1) !== ':')
+			? substr($code, 0, -1)
+			: $code;
+	}
+
+	protected function testIndent($indent)
+	{
+		if (!preg_match('/^' . $indent . '/', substr($this->input, 1), $matches)) {
+			return;
+		}
+
+		if (!isset($this->identRE)) {
+			$this->identRE = $indent;
+		}
+
+		return array(
+			"\n" . $matches[0],
+			$matches[0],
+		);
+	}
+
+	protected function getNextIndent()
+	{
+		if (substr($this->input, 0, 1) !== "\n") {
+			return;
+		}
+
+		$indents = isset($this->identRE)
+			? array($this->identRE)
+			: ($this->allowMixedIndent
+				? array('[\\t ]*')
+				: array('\\t+', ' *')
+			);
+
+		foreach ($indents as $indent) {
+			if ($matches = $this->testIndent($indent)) {
+				return $matches;
+			}
+		}
+	}
+
+	protected function getWhiteSpacesTokens($indents)
+	{
+		if ($indents && count($this->indentStack) && $indents === $this->indentStack[0]) {
+			return $this->token('newline');
+		}
+
+		if ($indents) {
+			array_unshift($this->indentStack, $indents);
+
+			return $this->token('indent', $indents);
+		}
+
+		return $this->token('newline');
+	}
+
+	protected function getTokenFromIndent($firstChar, $indents)
+	{
+		if ($this->length() && $firstChar === "\n") {
+			return $this->token('newline');
+		}
+
+		if (count($this->indentStack) && $indents < $this->indentStack[0]) {
+			while (count($this->indentStack) && $indents < $this->indentStack[0]) {
+				array_push($this->stash, $this->token('outdent'));
+				array_shift($this->indentStack);
+			}
+
+			return array_pop($this->stash);
+		}
+
+		return $this->getWhiteSpacesTokens($indents);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 
     protected function testIndent($indent)
     {
-        if (!preg_match('/^' . $indent . '/', substr($this->input, 1), $matches)) {
+        if (!preg_match('/^'.$indent.'/', substr($this->input, 1), $matches)) {
             return;
         }
 
@@ -72,7 +72,7 @@ 
         }
 
         return array(
-            "\n" . $matches[0],
+            "\n".$matches[0],
             $matches[0],
         );
     }

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Lexer/Scanner.php

Doc Comments +2 added lines

@@ -9,6 +9,8 @@
 {
     /**
      *  Helper to create tokens.
+     * @param string $regex
+     * @param string $type
      */
     protected function scan($regex, $type, $captureIndex = 1)
     {

Indentation +275 added lines, -275 removed lines

@@ -7,284 +7,284 @@
  */
 abstract class Scanner extends MixinScanner
 {
-    /**
-     *  Helper to create tokens.
-     */
-    protected function scan($regex, $type, $captureIndex = 1)
-    {
-        if (preg_match($regex, $this->input, $matches)) {
-            $this->consume($matches[0]);
-
-            return $this->token($type, isset($matches[$captureIndex]) && strlen($matches[$captureIndex]) > 0 ? $matches[$captureIndex] : '');
-        }
-    }
-
-    /**
-     * Scan comment from input & return it if found.
-     *
-     * @return object|null
-     */
-    protected function scanComment()
-    {
-        $indent = count($this->indentStack) ? $this->indentStack[0] : 0;
-        if (preg_match('/^ *\/\/(-)?([^\n]*(\n+[ \t]{' . ($indent + 1) . ',}[^\n]*)*)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-            $value = isset($matches[2]) ? $matches[2] : '';
-            if (isset($matches[3])) {
-                $value .= "\n";
-            }
-            $token = $this->token('comment', $value);
-            $token->buffer = '-' !== $matches[1];
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanInterpolation()
-    {
-        return $this->scan('/^#{(.*?)}/', 'interpolation');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanTag()
-    {
-        if (preg_match('/^(\w[-:\w]*)(\/?)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-            $name = $matches[1];
-
-            if (':' === substr($name, -1) && ':' !== substr($name, -2, 1)) {
-                $name = substr($name, 0, -1);
-                $this->defer($this->token(':'));
-
-                while (' ' === substr($this->input, 0, 1)) {
-                    $this->consume(' ');
-                }
-            }
-
-            $token = $this->token('tag', $name);
-            $token->selfClosing = ($matches[2] === '/');
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanFilter()
-    {
-        return $this->scan('/^(?<!:):(?!:)(\w+(?:-\w+)*)/', 'filter');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanDoctype()
-    {
-        return $this->scan('/^(?:!!!|doctype) *([^\n]+)?/', 'doctype');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanId()
-    {
-        return $this->scan('/^#([\w-]+)/', 'id');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanClassName()
-    {
-        // http://www.w3.org/TR/CSS21/grammar.html#scanner
-        //
-        // ident:
-        //      -?{nmstart}{nmchar}*
-        // nmstart:
-        //      [_a-z]|{nonascii}|{escape}
-        // nonascii:
-        //      [\240-\377]
-        // escape:
-        //      {unicode}|\\[^\r\n\f0-9a-f]
-        // unicode:
-        //      \\{h}{1,6}(\r\n|[ \t\r\n\f])?
-        // nmchar:
-        //      [_a-z0-9-]|{nonascii}|{escape}
-        //
-        // /^(-?(?!=[0-9-])(?:[_a-z0-9-]|[\240-\377]|\\{h}{1,6}(?:\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])+)/
-        return $this->scan('/^\.([\w-]+)/', 'class');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanText()
-    {
-        return $this->scan('/^(?:\| ?| ?)?([^\n]+)/', 'text');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanAssignment()
-    {
-        if (preg_match('/^(\$?\w+) += *([^;\n]+|\'[^\']+\'|"[^"]+")( *;? *)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-
-            return $this->token('code', (substr($matches[1], 0, 1) === '$' ? '' : '$') . $matches[1] . '=' . $matches[2]);
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanConditional()
-    {
-        if (preg_match('/^(if|unless|else if|elseif|else|while)\b([^\n]*)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-
-            /*switch ($matches[1]) {
+	/**
+	 *  Helper to create tokens.
+	 */
+	protected function scan($regex, $type, $captureIndex = 1)
+	{
+		if (preg_match($regex, $this->input, $matches)) {
+			$this->consume($matches[0]);
+
+			return $this->token($type, isset($matches[$captureIndex]) && strlen($matches[$captureIndex]) > 0 ? $matches[$captureIndex] : '');
+		}
+	}
+
+	/**
+	 * Scan comment from input & return it if found.
+	 *
+	 * @return object|null
+	 */
+	protected function scanComment()
+	{
+		$indent = count($this->indentStack) ? $this->indentStack[0] : 0;
+		if (preg_match('/^ *\/\/(-)?([^\n]*(\n+[ \t]{' . ($indent + 1) . ',}[^\n]*)*)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+			$value = isset($matches[2]) ? $matches[2] : '';
+			if (isset($matches[3])) {
+				$value .= "\n";
+			}
+			$token = $this->token('comment', $value);
+			$token->buffer = '-' !== $matches[1];
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanInterpolation()
+	{
+		return $this->scan('/^#{(.*?)}/', 'interpolation');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanTag()
+	{
+		if (preg_match('/^(\w[-:\w]*)(\/?)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+			$name = $matches[1];
+
+			if (':' === substr($name, -1) && ':' !== substr($name, -2, 1)) {
+				$name = substr($name, 0, -1);
+				$this->defer($this->token(':'));
+
+				while (' ' === substr($this->input, 0, 1)) {
+					$this->consume(' ');
+				}
+			}
+
+			$token = $this->token('tag', $name);
+			$token->selfClosing = ($matches[2] === '/');
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanFilter()
+	{
+		return $this->scan('/^(?<!:):(?!:)(\w+(?:-\w+)*)/', 'filter');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanDoctype()
+	{
+		return $this->scan('/^(?:!!!|doctype) *([^\n]+)?/', 'doctype');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanId()
+	{
+		return $this->scan('/^#([\w-]+)/', 'id');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanClassName()
+	{
+		// http://www.w3.org/TR/CSS21/grammar.html#scanner
+		//
+		// ident:
+		//      -?{nmstart}{nmchar}*
+		// nmstart:
+		//      [_a-z]|{nonascii}|{escape}
+		// nonascii:
+		//      [\240-\377]
+		// escape:
+		//      {unicode}|\\[^\r\n\f0-9a-f]
+		// unicode:
+		//      \\{h}{1,6}(\r\n|[ \t\r\n\f])?
+		// nmchar:
+		//      [_a-z0-9-]|{nonascii}|{escape}
+		//
+		// /^(-?(?!=[0-9-])(?:[_a-z0-9-]|[\240-\377]|\\{h}{1,6}(?:\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-f])+)/
+		return $this->scan('/^\.([\w-]+)/', 'class');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanText()
+	{
+		return $this->scan('/^(?:\| ?| ?)?([^\n]+)/', 'text');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanAssignment()
+	{
+		if (preg_match('/^(\$?\w+) += *([^;\n]+|\'[^\']+\'|"[^"]+")( *;? *)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+
+			return $this->token('code', (substr($matches[1], 0, 1) === '$' ? '' : '$') . $matches[1] . '=' . $matches[2]);
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanConditional()
+	{
+		if (preg_match('/^(if|unless|else if|elseif|else|while)\b([^\n]*)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+
+			/*switch ($matches[1]) {
                 case 'if': $code = 'if (' . $matches[2] . '):'; break;
                 case 'unless': $code = 'if (!(' . $matches[2] . ')):'; break;
                 case 'else if': $code = 'elseif (' . $matches[2] . '):'; break;
                 case 'else': $code = 'else (' . $matches[2] . '):'; break;
             }*/
-            $code = $this->normalizeCode($matches[0]);
-            $token = $this->token('code', $code);
-            $token->buffer = false;
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanEach()
-    {
-        if (preg_match('/^(?:- *)?(?:each|for) +(\w+)(?: *, *(\w+))? +in *([^\n]+)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-
-            $token = $this->token('each', $matches[1]);
-            $token->key = $matches[2];
-            $token->code = $this->normalizeCode($matches[3]);
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanCustomKeyword()
-    {
-        if (
-            count($this->customKeywords) &&
-            preg_match('/^([\w-]+)([^\n]*)/', $this->input, $matches) &&
-            isset($this->customKeywords[$matches[1]]) &&
-            is_callable($this->customKeywords[$matches[1]])
-        ) {
-            $this->consume($matches[0]);
-
-            $token = $this->token('customKeyword', $matches[1]);
-            $token->args = trim($matches[2]);
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanCode()
-    {
-        if (preg_match('/^(!?=|-)([^\n]+)/', $this->input, $matches)) {
-            $this->consume($matches[0]);
-            $flags = $matches[1];
-            $code = $this->normalizeCode($matches[2]);
-
-            $token = $this->token('code', $code);
-            $token->escape = $flags[0] === '=';
-            $token->buffer = '=' === $flags[0] || (isset($flags[1]) && '=' === $flags[1]);
-
-            return $token;
-        }
-    }
-
-    /**
-     * @throws \ErrorException
-     *
-     * @return object
-     */
-    protected function scanAttributes()
-    {
-        if (substr($this->input, 0, 1) === '(') {
-            // cant use ^ anchor in the regex because the pattern is recursive
-            // but this restriction is asserted by the if above
-            //$this->input = preg_replace('/([a-zA-Z0-9\'"\\]\\}\\)])([\t ]+[a-zA-Z])/', '$1,$2', $this->input);
-            if (!preg_match('/\((?:"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'|[^()\'"]++|(?R))*+\)/', $this->input, $matches)) {
-                throw new \ErrorException('Unable to find attributes closing parenthesis.', 21);
-            }
-            $this->consume($matches[0]);
-
-            //$str = preg_replace('/()([a-zA-Z0-9_\\x7f-\\xff\\)\\]\\}"\'])(\s+[a-zA-Z_])/', '$1,$2', $str);
-
-            $token = $this->token('attributes');
-            $token->attributes = array();
-            $token->escaped = array();
-            $token->selfClosing = false;
-
-            $parser = new Attributes($token);
-            $parser->parseWith(substr($matches[0], 1, strlen($matches[0]) - 2));
-
-            if ($this->length() && '/' === $this->input[0]) {
-                $this->consume(1);
-                $token->selfClosing = true;
-            }
-
-            return $token;
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanPipelessText()
-    {
-        if ($this->pipeless && "\n" !== substr($this->input, 0, 1)) {
-            $pos = strpos($this->input, "\n");
-
-            if ($pos === false) {
-                $pos = $this->length();
-            }
-
-            $str = substr($this->input, 0, $pos); // do not include the \n char
-
-            $this->consume($str);
-
-            return $this->token('text', ltrim($str));
-        }
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanColon()
-    {
-        return $this->scan('/^:(?!:) */', ':');
-    }
-
-    /**
-     * @return object
-     */
-    protected function scanAndAttributes()
-    {
-        return $this->scan('/^&attributes(\(((?>[^()]+|(?1))*)\))/', '&attributes', 2);
-    }
+			$code = $this->normalizeCode($matches[0]);
+			$token = $this->token('code', $code);
+			$token->buffer = false;
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanEach()
+	{
+		if (preg_match('/^(?:- *)?(?:each|for) +(\w+)(?: *, *(\w+))? +in *([^\n]+)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+
+			$token = $this->token('each', $matches[1]);
+			$token->key = $matches[2];
+			$token->code = $this->normalizeCode($matches[3]);
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanCustomKeyword()
+	{
+		if (
+			count($this->customKeywords) &&
+			preg_match('/^([\w-]+)([^\n]*)/', $this->input, $matches) &&
+			isset($this->customKeywords[$matches[1]]) &&
+			is_callable($this->customKeywords[$matches[1]])
+		) {
+			$this->consume($matches[0]);
+
+			$token = $this->token('customKeyword', $matches[1]);
+			$token->args = trim($matches[2]);
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanCode()
+	{
+		if (preg_match('/^(!?=|-)([^\n]+)/', $this->input, $matches)) {
+			$this->consume($matches[0]);
+			$flags = $matches[1];
+			$code = $this->normalizeCode($matches[2]);
+
+			$token = $this->token('code', $code);
+			$token->escape = $flags[0] === '=';
+			$token->buffer = '=' === $flags[0] || (isset($flags[1]) && '=' === $flags[1]);
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @throws \ErrorException
+	 *
+	 * @return object
+	 */
+	protected function scanAttributes()
+	{
+		if (substr($this->input, 0, 1) === '(') {
+			// cant use ^ anchor in the regex because the pattern is recursive
+			// but this restriction is asserted by the if above
+			//$this->input = preg_replace('/([a-zA-Z0-9\'"\\]\\}\\)])([\t ]+[a-zA-Z])/', '$1,$2', $this->input);
+			if (!preg_match('/\((?:"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'|[^()\'"]++|(?R))*+\)/', $this->input, $matches)) {
+				throw new \ErrorException('Unable to find attributes closing parenthesis.', 21);
+			}
+			$this->consume($matches[0]);
+
+			//$str = preg_replace('/()([a-zA-Z0-9_\\x7f-\\xff\\)\\]\\}"\'])(\s+[a-zA-Z_])/', '$1,$2', $str);
+
+			$token = $this->token('attributes');
+			$token->attributes = array();
+			$token->escaped = array();
+			$token->selfClosing = false;
+
+			$parser = new Attributes($token);
+			$parser->parseWith(substr($matches[0], 1, strlen($matches[0]) - 2));
+
+			if ($this->length() && '/' === $this->input[0]) {
+				$this->consume(1);
+				$token->selfClosing = true;
+			}
+
+			return $token;
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanPipelessText()
+	{
+		if ($this->pipeless && "\n" !== substr($this->input, 0, 1)) {
+			$pos = strpos($this->input, "\n");
+
+			if ($pos === false) {
+				$pos = $this->length();
+			}
+
+			$str = substr($this->input, 0, $pos); // do not include the \n char
+
+			$this->consume($str);
+
+			return $this->token('text', ltrim($str));
+		}
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanColon()
+	{
+		return $this->scan('/^:(?!:) */', ':');
+	}
+
+	/**
+	 * @return object
+	 */
+	protected function scanAndAttributes()
+	{
+		return $this->scan('/^&attributes(\(((?>[^()]+|(?1))*)\))/', '&attributes', 2);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     protected function scanComment()
     {
         $indent = count($this->indentStack) ? $this->indentStack[0] : 0;
-        if (preg_match('/^ *\/\/(-)?([^\n]*(\n+[ \t]{' . ($indent + 1) . ',}[^\n]*)*)/', $this->input, $matches)) {
+        if (preg_match('/^ *\/\/(-)?([^\n]*(\n+[ \t]{'.($indent + 1).',}[^\n]*)*)/', $this->input, $matches)) {
             $this->consume($matches[0]);
             $value = isset($matches[2]) ? $matches[2] : '';
             if (isset($matches[3])) {
@@ -137,7 +137,7 @@ 
         if (preg_match('/^(\$?\w+) += *([^;\n]+|\'[^\']+\'|"[^"]+")( *;? *)/', $this->input, $matches)) {
             $this->consume($matches[0]);
 
-            return $this->token('code', (substr($matches[1], 0, 1) === '$' ? '' : '$') . $matches[1] . '=' . $matches[2]);
+            return $this->token('code', (substr($matches[1], 0, 1) === '$' ? '' : '$').$matches[1].'='.$matches[2]);
         }
     }
 

dist/jate/modules/ExternalModules/pug-php/pug/src/Jade/Parser.php

Doc Comments +15 added lines

@@ -56,6 +56,9 @@ 
         return $extensions->getExtensions();
     }
 
+    /**
+     * @param string $path
+     */
     protected function hasValidTemplateExtension($path)
     {
         $extensions = new ExtensionsHelper($this->extension);
@@ -79,6 +82,9 @@ 
         return $extensions->findValidTemplatePath($path, '');
     }
 
+    /**
+     * @param string|null $path
+     */
     protected function getTemplateContents($path, $value = null)
     {
         if ($path !== null) {
@@ -144,6 +150,9 @@ 
         return $this->lexer->advance();
     }
 
+    /**
+     * @param integer $n
+     */
     public function skip($n)
     {
         while ($n--) {
@@ -199,6 +208,9 @@ 
         return $block;
     }
 
+    /**
+     * @param string $type
+     */
     protected function expect($type)
     {
         if ($this->peekType() === $type) {
@@ -211,6 +223,9 @@ 
         throw new \ErrorException("\n" . sprintf('Expected %s, but got %s in %dth line : %s', $type, $this->peekType(), $lineNumber, $lineString) . "\n", 24);
     }
 
+    /**
+     * @param string $type
+     */
     protected function accept($type)
     {
         if ($this->peekType() === $type) {

Indentation +753 added lines, -753 removed lines

@@ -7,757 +7,757 @@
 
 class Parser
 {
-    public static $includeNotFound = ".alert.alert-danger.\n\tPage not found.";
-
-    protected $allowMixedIndent;
-    protected $basedir;
-    protected $extending;
-    protected $extension;
-    protected $filename;
-    protected $input;
-    protected $lexer;
-    protected $notFound;
-    protected $options = array();
-    protected $preRender;
-
-    protected $blocks = array();
-    protected $mixins = array();
-    protected $contexts = array();
-
-    public function __construct($input, $filename = null, array $options = array())
-    {
-        $defaultOptions = array(
-            'allowMixedIndent' => true,
-            'basedir' => null,
-            'customKeywords' => array(),
-            'extension' => array('.pug', '.jade'),
-            'notFound' => null,
-            'preRender' => null,
-        );
-        foreach ($defaultOptions as $key => $default) {
-            $this->$key = isset($options[$key]) ? $options[$key] : $default;
-            $this->options[$key] = $this->$key;
-        }
-
-        $this->setInput($filename, $input);
-
-        if ($this->input && $this->input[0] === "\xef" && $this->input[1] === "\xbb" && $this->input[2] === "\xbf") {
-            $this->input = substr($this->input, 3);
-        }
-
-        $this->lexer = new Lexer($this->input, $this->options);
-        array_push($this->contexts, $this);
-    }
-
-    protected function getExtensions()
-    {
-        $extensions = new ExtensionsHelper($this->extension);
-
-        return $extensions->getExtensions();
-    }
-
-    protected function hasValidTemplateExtension($path)
-    {
-        $extensions = new ExtensionsHelper($this->extension);
-
-        return $extensions->hasValidTemplateExtension($path);
-    }
-
-    protected function getTemplatePath($path)
-    {
-        $isAbsolutePath = substr($path, 0, 1) === '/';
-        if ($isAbsolutePath && !isset($this->options['basedir'])) {
-            throw new \ErrorException("The 'basedir' option need to be set to use absolute path like $path", 29);
-        }
-
-        $path = ($isAbsolutePath
-            ? rtrim($this->options['basedir'], '/\\')
-            : dirname($this->filename)
-        ) . DIRECTORY_SEPARATOR . $path;
-        $extensions = new ExtensionsHelper($this->extension);
-
-        return $extensions->findValidTemplatePath($path, '');
-    }
-
-    protected function getTemplateContents($path, $value = null)
-    {
-        if ($path !== null) {
-            $contents = file_get_contents($path);
-            if (is_callable($this->preRender)) {
-                $contents = call_user_func($this->preRender, $contents);
-            }
-
-            return $contents;
-        }
-
-        $notFound = isset($this->options['notFound'])
-            ? $this->options['notFound']
-            : static::$includeNotFound;
-
-        if ($notFound !== false) {
-            return $notFound;
-        }
-
-        $value = $value ?: $path;
-        throw new \InvalidArgumentException("The included file '$value' does not exists.", 22);
-    }
-
-    protected function setInput($filename, $input)
-    {
-        if ($filename === null && file_exists($input)) {
-            $filename = $input;
-            $input = file_get_contents($input);
-        }
-
-        $this->input = preg_replace('`\r\n|\r`', "\n", $input);
-        if (is_callable($this->preRender)) {
-            $this->input = call_user_func($this->preRender, $this->input);
-        }
-        $this->filename = $filename;
-    }
-
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Get a parser with the same settings.
-     *
-     * @return Parser
-     */
-    public function subParser($input)
-    {
-        return new static($input, $this->filename, $this->options);
-    }
-
-    public function context($parser = null)
-    {
-        if ($parser === null) {
-            return array_pop($this->contexts);
-        }
-        array_push($this->contexts, $parser);
-    }
-
-    public function advance()
-    {
-        return $this->lexer->advance();
-    }
-
-    public function skip($n)
-    {
-        while ($n--) {
-            $this->advance();
-        }
-    }
-
-    public function peek()
-    {
-        return $this->lookahead(1);
-    }
-
-    public function line()
-    {
-        return $this->lexer->lineno;
-    }
-
-    public function lookahead($n = 1)
-    {
-        return $this->lexer->lookahead($n);
-    }
-
-    public function parse()
-    {
-        $block = new Nodes\Block();
-        $block->line = $this->line();
-
-        while ($this->peekType() !== 'eos') {
-            if ($this->peekType() === 'newline') {
-                $this->advance();
-                continue;
-            }
-            $block->push($this->parseExpression());
-        }
-
-        if ($parser = $this->extending) {
-            $this->context($parser);
-            // $parser->blocks = $this->blocks;
-            try {
-                $ast = $parser->parse();
-            } catch (\Exception $e) {
-                throw new ParserException($parser->getFilename() . ' (' . $block->line . ') : ' . $e->getMessage(), 23, $e);
-            }
-            $this->context();
-
-            foreach ($this->mixins as $name => $v) {
-                $ast->unshift($this->mixins[$name]);
-            }
-
-            return $ast;
-        }
-
-        return $block;
-    }
-
-    protected function expect($type)
-    {
-        if ($this->peekType() === $type) {
-            return $this->lexer->advance();
-        }
-
-        $lineNumber = $this->line();
-        $lines = explode("\n", $this->input);
-        $lineString = isset($lines[$lineNumber]) ? $lines[$lineNumber] : '';
-        throw new \ErrorException("\n" . sprintf('Expected %s, but got %s in %dth line : %s', $type, $this->peekType(), $lineNumber, $lineString) . "\n", 24);
-    }
-
-    protected function accept($type)
-    {
-        if ($this->peekType() === $type) {
-            return $this->advance();
-        }
-    }
-
-    protected function parseExpression()
-    {
-        $_types = array('tag', 'mixin', 'block', 'case', 'when', 'default', 'extends', 'include', 'doctype', 'filter', 'comment', 'text', 'each', 'customKeyword', 'code', 'call', 'interpolation');
-
-        if (in_array($this->peekType(), $_types)) {
-            $_method = 'parse' . ucfirst($this->peekType());
-
-            return $this->$_method();
-        }
-
-        switch ($this->peekType()) {
-            case 'yield':
-                $this->advance();
-                $block = new Nodes\Block();
-                $block->yield = true;
-
-                return $block;
-
-            case 'id':
-            case 'class':
-                $token = $this->advance();
-                $this->lexer->defer($this->lexer->token('tag', 'div'));
-                $this->lexer->defer($token);
-
-                return $this->parseExpression();
-
-            default:
-                throw new \ErrorException($this->filename . ' (' . $this->line() . ') : Unexpected token "' . $this->peekType() . '"', 25);
-        }
-    }
-
-    protected function parseText()
-    {
-        $token = $this->expect('text');
-        if (preg_match('/^(.*?)#\[([^\]\n]+)\]/', $token->value)) {
-            $block = new Nodes\Block();
-            $this->parseInlineTags($block, $token->value);
-
-            return $block;
-        }
-        $node = new Nodes\Text($token->value);
-        $node->line = $this->line();
-
-        return $node;
-    }
-
-    protected function parseBlockExpansion()
-    {
-        if (':' === $this->peekType()) {
-            $this->advance();
-
-            return new Nodes\Block($this->parseExpression());
-        }
-
-        return $this->block();
-    }
-
-    protected function parseCase()
-    {
-        $value = $this->expect('case')->value;
-        $node = new Nodes\CaseNode($value);
-        $node->line = $this->line();
-        $node->block = $this->block();
-
-        return $node;
-    }
-
-    protected function parseWhen()
-    {
-        $value = $this->expect('when')->value;
-
-        return new Nodes\When($value, $this->parseBlockExpansion());
-    }
-
-    protected function parseDefault()
-    {
-        $this->expect('default');
-
-        return new Nodes\When('default', $this->parseBlockExpansion());
-    }
-
-    protected function parseCode()
-    {
-        $token = $this->expect('code');
-        $buffer = isset($token->buffer) ? $token->buffer : false;
-        $escape = isset($token->escape) ? $token->escape : true;
-        $node = new Nodes\Code($token->value, $buffer, $escape);
-        $node->line = $this->line();
-
-        $i = 1;
-        while ($this->lookahead($i)->type === 'newline') {
-            $i++;
-        }
-
-        if ($this->lookahead($i)->type === 'indent') {
-            $this->skip($i - 1);
-            $node->block = $this->block();
-        }
-
-        return $node;
-    }
-
-    protected function parseComment()
-    {
-        $token = $this->expect('comment');
-        $node = new Nodes\Comment($token->value, $token->buffer);
-        $node->line = $this->line();
-
-        return $node;
-    }
-
-    protected function parseDoctype()
-    {
-        $token = $this->expect('doctype');
-        $node = new Nodes\Doctype($token->value);
-        $node->line = $this->line();
-
-        return $node;
-    }
-
-    protected function parseFilter()
-    {
-        $token = $this->expect('filter');
-        $attributes = $this->accept('attributes');
-
-        $this->lexer->pipeless = true;
-        $block = $this->parseTextBlock();
-        $this->lexer->pipeless = false;
-
-        $node = new Nodes\Filter($token->value, $block, $attributes);
-        $node->line = $this->line();
-
-        return $node;
-    }
-
-    protected function parseEach()
-    {
-        $token = $this->expect('each');
-        $node = new Nodes\Each($token->code, $token->value, $token->key);
-        $node->line = $this->line();
-        $node->block = $this->block();
-        if ($this->peekType() === 'code' && $this->peek()->value === 'else') {
-            $this->advance();
-            $node->alternative = $this->block();
-        }
-
-        return $node;
-    }
-
-    protected function parseCustomKeyword()
-    {
-        $token = $this->expect('customKeyword');
-        $node = new Nodes\CustomKeyword($token->value, $token->args);
-        $node->line = $this->line();
-        if ('indent' === $this->peekType()) {
-            $node->block = $this->block();
-        }
-
-        return $node;
-    }
-
-    protected function parseExtends()
-    {
-        $extendValue = $this->expect('extends')->value;
-        $path = $this->getTemplatePath($extendValue);
-
-        $string = $this->getTemplateContents($path, $extendValue);
-        $parser = new static($string, $path, $this->options);
-        // need to be a reference, or be seted after the parse loop
-        $parser->blocks = &$this->blocks;
-        $parser->contexts = $this->contexts;
-        $this->extending = $parser;
-
-        return new Nodes\Literal('');
-    }
-
-    protected function parseBlock()
-    {
-        $block = $this->expect('block');
-        $mode = $block->mode;
-        $name = trim($block->value);
-
-        $block = 'indent' === $this->peekType()
-            ? $this->block()
-            : new Nodes\Block(empty($name)
-                ? new Nodes\MixinBlock()
-                : new Nodes\Literal('')
-            );
-
-        if (isset($this->blocks[$name])) {
-            $prev = &$this->blocks[$name];
-
-            switch ($prev->mode) {
-                case 'append':
-                    $block->nodes = array_merge($block->nodes, $prev->nodes);
-                    $prev = $block;
-                    break;
-
-                case 'prepend':
-                    $block->nodes = array_merge($prev->nodes, $block->nodes);
-                    $prev = $block;
-                    break;
-
-                case 'replace':
-                default:
-                    break;
-            }
-
-            return $this->blocks[$name];
-        }
-
-        $block->mode = $mode;
-        $this->blocks[$name] = $block;
-
-        return $block;
-    }
-
-    protected function parseInclude()
-    {
-        $token = $this->expect('include');
-        $includeValue = trim($token->value);
-        $path = $this->getTemplatePath($includeValue);
-
-        if ($path && !$this->hasValidTemplateExtension($path)) {
-            return new Nodes\Text(file_get_contents($path));
-        }
-
-        $string = $this->getTemplateContents($path, $includeValue);
-
-        $parser = new static($string, $path, $this->options);
-        $parser->blocks = $this->blocks;
-        $parser->mixins = $this->mixins;
-
-        $this->context($parser);
-        try {
-            $ast = $parser->parse();
-        } catch (\Exception $e) {
-            throw new \ErrorException($path . ' (' . $parser->lexer->lineno . ') : ' . $e->getMessage(), 27);
-        }
-        $this->context();
-        $ast->filename = $path;
-
-        if ('indent' === $this->peekType() && method_exists($ast, 'includeBlock')) {
-            $block = $ast->includeBlock();
-            if (is_object($block)) {
-                $handler = count($block->nodes) === 1 && isset($block->nodes[0]->block)
-                    ? $block->nodes[0]->block
-                    : $block;
-                $handler->push($this->block());
-            }
-        }
-
-        return $ast;
-    }
-
-    protected function parseCall()
-    {
-        $token = $this->expect('call');
-        $name = $token->value;
-
-        $arguments = isset($token->arguments)
-            ? $token->arguments
-            : null;
-
-        $mixin = new Nodes\Mixin($name, $arguments, new Nodes\Block(), true);
-
-        $this->tag($mixin);
-
-        if ($mixin->block->isEmpty()) {
-            $mixin->block = null;
-        }
-
-        return $mixin;
-    }
-
-    protected function parseMixin()
-    {
-        $token = $this->expect('mixin');
-        $name = $token->value;
-        $arguments = $token->arguments;
-
-        // definition
-        if ('indent' === $this->peekType()) {
-            $mixin = new Nodes\Mixin($name, $arguments, $this->block(), false);
-            $this->mixins[$name] = $mixin;
-
-            return $mixin;
-        }
-
-        // call
-        return new Nodes\Mixin($name, $arguments, null, true);
-    }
-
-    protected function parseTextBlock()
-    {
-        $block = new Nodes\Block();
-        $block->line = $this->line();
-        $spaces = $this->expect('indent')->value;
-
-        if (!isset($this->_spaces)) {
-            $this->_spaces = $spaces;
-        }
-
-        $indent = str_repeat(' ', $spaces - $this->_spaces + 1);
-
-        while ($this->peekType() != 'outdent') {
-            switch ($this->peekType()) {
-                case 'newline':
-                    $this->lexer->advance();
-                    break;
-
-                case 'indent':
-                    foreach ($this->parseTextBlock()->nodes as $n) {
-                        $block->push($n);
-                    }
-                    break;
-
-                default:
-                    $this->parseInlineTags($block, $indent . $this->advance()->value);
-            }
-        }
-
-        if (isset($this->_spaces) && $spaces === $this->_spaces) {
-            unset($this->_spaces);
-        }
-
-        $this->expect('outdent');
-
-        return $block;
-    }
-
-    protected function block()
-    {
-        $block = new Nodes\Block();
-        $block->line = $this->line();
-        $this->expect('indent');
-
-        while ($this->peekType() !== 'outdent') {
-            if ($this->peekType() === 'newline') {
-                $this->lexer->advance();
-                continue;
-            }
-
-            $block->push($this->parseExpression());
-        }
-
-        $this->expect('outdent');
-
-        return $block;
-    }
-
-    protected function parseInterpolation()
-    {
-        $token = $this->advance();
-        $tag = new Nodes\Tag($token->value);
-        $tag->buffer = true;
-
-        return $this->tag($tag);
-    }
-
-    protected function parseASTFilter()
-    {
-        $token = $this->expect('tag');
-        $attributes = $this->accept('attributes');
-        $this->expect(':');
-        $block = $this->block();
-        $node = new Nodes\Filter($token->value, $block, $attributes);
-        $node->line = $this->line();
-
-        return $node;
-    }
-
-    protected function parseTag()
-    {
-        $i = 2;
-
-        if ('attributes' === $this->lookahead($i)->type) {
-            $i++;
-        }
-
-        if (':' === $this->lookahead($i)->type) {
-            $i++;
-
-            if ('indent' === $this->lookahead($i)->type) {
-                return $this->parseASTFilter();
-            }
-        }
-
-        $token = $this->advance();
-        $tag = new Nodes\Tag($token->value);
-
-        $tag->selfClosing = isset($token->selfClosing)
-            ? $token->selfClosing
-            : false;
-
-        return $this->tag($tag);
-    }
-
-    public function parseInlineTags($block, $str)
-    {
-        while (preg_match('/^(.*?)#\[([^\]\n]+)\]/', $str, $matches)) {
-            if (!empty($matches[1])) {
-                $text = new Nodes\Text($matches[1]);
-                $text->line = $this->line();
-                $block->push($text);
-            }
-            $parser = $this->subParser($matches[2]);
-            $tag = $parser->parse();
-            $tag->line = $this->line();
-            $block->push($tag);
-            $str = substr($str, strlen($matches[0]));
-        }
-        if (substr($str, 0, 1) === ' ') {
-            $str = substr($str, 1);
-        }
-        $text = new Nodes\Text($str);
-        $text->line = $this->line();
-        $block->push($text);
-    }
-
-    protected function peekType()
-    {
-        return ($peek = $this->peek())
-            ? $peek->type
-            : null;
-    }
-
-    protected function tag($tag)
-    {
-        $tag->line = $this->line();
-
-        while (true) {
-            switch ($type = $this->peekType()) {
-                case 'id':
-                    $token = $this->advance();
-                    $peek = $this->peek();
-                    $escaped = isset($peek->escaped, $peek->escaped[$type]) && $peek->escaped[$type];
-                    $value = $escaped || !isset($peek->attributes, $peek->attributes[$type])
-                        ? "'" . $token->value . "'"
-                        : $peek->attributes[$type];
-                    $tag->setAttribute($token->type, $value, $escaped);
-                    unset($peek->attributes[$type]);
-                    continue;
-
-                case 'class':
-                    $token = $this->advance();
-                    $tag->setAttribute($token->type, "'" . $token->value . "'");
-                    continue;
-
-                case 'attributes':
-                    $token = $this->advance();
-                    $obj = $token->attributes;
-                    $escaped = $token->escaped;
-                    $nameList = array_keys($obj);
-
-                    if ($token->selfClosing) {
-                        $tag->selfClosing = true;
-                    }
-
-                    foreach ($nameList as $name) {
-                        $value = $obj[$name];
-                        $normalizedValue = strtolower($value);
-                        if ($normalizedValue === 'true' || $normalizedValue === 'false') {
-                            $value = $normalizedValue === 'true';
-                        }
-                        $tag->setAttribute($name, $value, $escaped[$name]);
-                    }
-                    continue;
-
-                case '&attributes':
-                    $token = $this->advance();
-                    $tag->setAttribute('&attributes', $token->value);
-                    continue;
-
-                default:
-                    break 2;
-            }
-        }
-
-        $dot = false;
-        $tag->textOnly = false;
-        if ('.' === $this->peek()->value) {
-            $dot = $tag->textOnly = true;
-            $this->advance();
-        }
-
-        switch ($this->peekType()) {
-            case 'text':
-                $this->parseInlineTags($tag->block, $this->expect('text')->value);
-                break;
-
-            case 'code':
-                $tag->code = $this->parseCode();
-                break;
-
-            case ':':
-                $this->advance();
-                $tag->block = new Nodes\Block();
-                $tag->block->push($this->parseExpression());
-                break;
-        }
-
-        while ('newline' === $this->peekType()) {
-            $this->advance();
-        }
-
-        if ('script' === $tag->name) {
-            $type = $tag->getAttribute('type');
-
-            if ($type !== null) {
-                $type = preg_replace('/^[\'\"]|[\'\"]$/', '', $type);
-
-                if (!$dot && 'text/javascript' != $type['value']) {
-                    $tag->textOnly = false;
-                }
-            }
-        }
-
-        if ('indent' === $this->peekType()) {
-            if ($tag->textOnly) {
-                $this->lexer->pipeless = true;
-                $tag->block = $this->parseTextBlock();
-                $this->lexer->pipeless = false;
-
-                return $tag;
-            }
-
-            $block = $this->block();
-
-            if ($tag->block && !$tag->block->isEmpty()) {
-                foreach ($block->nodes as $n) {
-                    $tag->block->push($n);
-                }
-
-                return $tag;
-            }
-
-            $tag->block = $block;
-        }
-
-        return $tag;
-    }
+	public static $includeNotFound = ".alert.alert-danger.\n\tPage not found.";
+
+	protected $allowMixedIndent;
+	protected $basedir;
+	protected $extending;
+	protected $extension;
+	protected $filename;
+	protected $input;
+	protected $lexer;
+	protected $notFound;
+	protected $options = array();
+	protected $preRender;
+
+	protected $blocks = array();
+	protected $mixins = array();
+	protected $contexts = array();
+
+	public function __construct($input, $filename = null, array $options = array())
+	{
+		$defaultOptions = array(
+			'allowMixedIndent' => true,
+			'basedir' => null,
+			'customKeywords' => array(),
+			'extension' => array('.pug', '.jade'),
+			'notFound' => null,
+			'preRender' => null,
+		);
+		foreach ($defaultOptions as $key => $default) {
+			$this->$key = isset($options[$key]) ? $options[$key] : $default;
+			$this->options[$key] = $this->$key;
+		}
+
+		$this->setInput($filename, $input);
+
+		if ($this->input && $this->input[0] === "\xef" && $this->input[1] === "\xbb" && $this->input[2] === "\xbf") {
+			$this->input = substr($this->input, 3);
+		}
+
+		$this->lexer = new Lexer($this->input, $this->options);
+		array_push($this->contexts, $this);
+	}
+
+	protected function getExtensions()
+	{
+		$extensions = new ExtensionsHelper($this->extension);
+
+		return $extensions->getExtensions();
+	}
+
+	protected function hasValidTemplateExtension($path)
+	{
+		$extensions = new ExtensionsHelper($this->extension);
+
+		return $extensions->hasValidTemplateExtension($path);
+	}
+
+	protected function getTemplatePath($path)
+	{
+		$isAbsolutePath = substr($path, 0, 1) === '/';
+		if ($isAbsolutePath && !isset($this->options['basedir'])) {
+			throw new \ErrorException("The 'basedir' option need to be set to use absolute path like $path", 29);
+		}
+
+		$path = ($isAbsolutePath
+			? rtrim($this->options['basedir'], '/\\')
+			: dirname($this->filename)
+		) . DIRECTORY_SEPARATOR . $path;
+		$extensions = new ExtensionsHelper($this->extension);
+
+		return $extensions->findValidTemplatePath($path, '');
+	}
+
+	protected function getTemplateContents($path, $value = null)
+	{
+		if ($path !== null) {
+			$contents = file_get_contents($path);
+			if (is_callable($this->preRender)) {
+				$contents = call_user_func($this->preRender, $contents);
+			}
+
+			return $contents;
+		}
+
+		$notFound = isset($this->options['notFound'])
+			? $this->options['notFound']
+			: static::$includeNotFound;
+
+		if ($notFound !== false) {
+			return $notFound;
+		}
+
+		$value = $value ?: $path;
+		throw new \InvalidArgumentException("The included file '$value' does not exists.", 22);
+	}
+
+	protected function setInput($filename, $input)
+	{
+		if ($filename === null && file_exists($input)) {
+			$filename = $input;
+			$input = file_get_contents($input);
+		}
+
+		$this->input = preg_replace('`\r\n|\r`', "\n", $input);
+		if (is_callable($this->preRender)) {
+			$this->input = call_user_func($this->preRender, $this->input);
+		}
+		$this->filename = $filename;
+	}
+
+	public function getFilename()
+	{
+		return $this->filename;
+	}
+
+	/**
+	 * Get a parser with the same settings.
+	 *
+	 * @return Parser
+	 */
+	public function subParser($input)
+	{
+		return new static($input, $this->filename, $this->options);
+	}
+
+	public function context($parser = null)
+	{
+		if ($parser === null) {
+			return array_pop($this->contexts);
+		}
+		array_push($this->contexts, $parser);
+	}
+
+	public function advance()
+	{
+		return $this->lexer->advance();
+	}
+
+	public function skip($n)
+	{
+		while ($n--) {
+			$this->advance();
+		}
+	}
+
+	public function peek()
+	{
+		return $this->lookahead(1);
+	}
+
+	public function line()
+	{
+		return $this->lexer->lineno;
+	}
+
+	public function lookahead($n = 1)
+	{
+		return $this->lexer->lookahead($n);
+	}
+
+	public function parse()
+	{
+		$block = new Nodes\Block();
+		$block->line = $this->line();
+
+		while ($this->peekType() !== 'eos') {
+			if ($this->peekType() === 'newline') {
+				$this->advance();
+				continue;
+			}
+			$block->push($this->parseExpression());
+		}
+
+		if ($parser = $this->extending) {
+			$this->context($parser);
+			// $parser->blocks = $this->blocks;
+			try {
+				$ast = $parser->parse();
+			} catch (\Exception $e) {
+				throw new ParserException($parser->getFilename() . ' (' . $block->line . ') : ' . $e->getMessage(), 23, $e);
+			}
+			$this->context();
+
+			foreach ($this->mixins as $name => $v) {
+				$ast->unshift($this->mixins[$name]);
+			}
+
+			return $ast;
+		}
+
+		return $block;
+	}
+
+	protected function expect($type)
+	{
+		if ($this->peekType() === $type) {
+			return $this->lexer->advance();
+		}
+
+		$lineNumber = $this->line();
+		$lines = explode("\n", $this->input);
+		$lineString = isset($lines[$lineNumber]) ? $lines[$lineNumber] : '';
+		throw new \ErrorException("\n" . sprintf('Expected %s, but got %s in %dth line : %s', $type, $this->peekType(), $lineNumber, $lineString) . "\n", 24);
+	}
+
+	protected function accept($type)
+	{
+		if ($this->peekType() === $type) {
+			return $this->advance();
+		}
+	}
+
+	protected function parseExpression()
+	{
+		$_types = array('tag', 'mixin', 'block', 'case', 'when', 'default', 'extends', 'include', 'doctype', 'filter', 'comment', 'text', 'each', 'customKeyword', 'code', 'call', 'interpolation');
+
+		if (in_array($this->peekType(), $_types)) {
+			$_method = 'parse' . ucfirst($this->peekType());
+
+			return $this->$_method();
+		}
+
+		switch ($this->peekType()) {
+			case 'yield':
+				$this->advance();
+				$block = new Nodes\Block();
+				$block->yield = true;
+
+				return $block;
+
+			case 'id':
+			case 'class':
+				$token = $this->advance();
+				$this->lexer->defer($this->lexer->token('tag', 'div'));
+				$this->lexer->defer($token);
+
+				return $this->parseExpression();
+
+			default:
+				throw new \ErrorException($this->filename . ' (' . $this->line() . ') : Unexpected token "' . $this->peekType() . '"', 25);
+		}
+	}
+
+	protected function parseText()
+	{
+		$token = $this->expect('text');
+		if (preg_match('/^(.*?)#\[([^\]\n]+)\]/', $token->value)) {
+			$block = new Nodes\Block();
+			$this->parseInlineTags($block, $token->value);
+
+			return $block;
+		}
+		$node = new Nodes\Text($token->value);
+		$node->line = $this->line();
+
+		return $node;
+	}
+
+	protected function parseBlockExpansion()
+	{
+		if (':' === $this->peekType()) {
+			$this->advance();
+
+			return new Nodes\Block($this->parseExpression());
+		}
+
+		return $this->block();
+	}
+
+	protected function parseCase()
+	{
+		$value = $this->expect('case')->value;
+		$node = new Nodes\CaseNode($value);
+		$node->line = $this->line();
+		$node->block = $this->block();
+
+		return $node;
+	}
+
+	protected function parseWhen()
+	{
+		$value = $this->expect('when')->value;
+
+		return new Nodes\When($value, $this->parseBlockExpansion());
+	}
+
+	protected function parseDefault()
+	{
+		$this->expect('default');
+
+		return new Nodes\When('default', $this->parseBlockExpansion());
+	}
+
+	protected function parseCode()
+	{
+		$token = $this->expect('code');
+		$buffer = isset($token->buffer) ? $token->buffer : false;
+		$escape = isset($token->escape) ? $token->escape : true;
+		$node = new Nodes\Code($token->value, $buffer, $escape);
+		$node->line = $this->line();
+
+		$i = 1;
+		while ($this->lookahead($i)->type === 'newline') {
+			$i++;
+		}
+
+		if ($this->lookahead($i)->type === 'indent') {
+			$this->skip($i - 1);
+			$node->block = $this->block();
+		}
+
+		return $node;
+	}
+
+	protected function parseComment()
+	{
+		$token = $this->expect('comment');
+		$node = new Nodes\Comment($token->value, $token->buffer);
+		$node->line = $this->line();
+
+		return $node;
+	}
+
+	protected function parseDoctype()
+	{
+		$token = $this->expect('doctype');
+		$node = new Nodes\Doctype($token->value);
+		$node->line = $this->line();
+
+		return $node;
+	}
+
+	protected function parseFilter()
+	{
+		$token = $this->expect('filter');
+		$attributes = $this->accept('attributes');
+
+		$this->lexer->pipeless = true;
+		$block = $this->parseTextBlock();
+		$this->lexer->pipeless = false;
+
+		$node = new Nodes\Filter($token->value, $block, $attributes);
+		$node->line = $this->line();
+
+		return $node;
+	}
+
+	protected function parseEach()
+	{
+		$token = $this->expect('each');
+		$node = new Nodes\Each($token->code, $token->value, $token->key);
+		$node->line = $this->line();
+		$node->block = $this->block();
+		if ($this->peekType() === 'code' && $this->peek()->value === 'else') {
+			$this->advance();
+			$node->alternative = $this->block();
+		}
+
+		return $node;
+	}
+
+	protected function parseCustomKeyword()
+	{
+		$token = $this->expect('customKeyword');
+		$node = new Nodes\CustomKeyword($token->value, $token->args);
+		$node->line = $this->line();
+		if ('indent' === $this->peekType()) {
+			$node->block = $this->block();
+		}
+
+		return $node;
+	}
+
+	protected function parseExtends()
+	{
+		$extendValue = $this->expect('extends')->value;
+		$path = $this->getTemplatePath($extendValue);
+
+		$string = $this->getTemplateContents($path, $extendValue);
+		$parser = new static($string, $path, $this->options);
+		// need to be a reference, or be seted after the parse loop
+		$parser->blocks = &$this->blocks;
+		$parser->contexts = $this->contexts;
+		$this->extending = $parser;
+
+		return new Nodes\Literal('');
+	}
+
+	protected function parseBlock()
+	{
+		$block = $this->expect('block');
+		$mode = $block->mode;
+		$name = trim($block->value);
+
+		$block = 'indent' === $this->peekType()
+			? $this->block()
+			: new Nodes\Block(empty($name)
+				? new Nodes\MixinBlock()
+				: new Nodes\Literal('')
+			);
+
+		if (isset($this->blocks[$name])) {
+			$prev = &$this->blocks[$name];
+
+			switch ($prev->mode) {
+				case 'append':
+					$block->nodes = array_merge($block->nodes, $prev->nodes);
+					$prev = $block;
+					break;
+
+				case 'prepend':
+					$block->nodes = array_merge($prev->nodes, $block->nodes);
+					$prev = $block;
+					break;
+
+				case 'replace':
+				default:
+					break;
+			}
+
+			return $this->blocks[$name];
+		}
+
+		$block->mode = $mode;
+		$this->blocks[$name] = $block;
+
+		return $block;
+	}
+
+	protected function parseInclude()
+	{
+		$token = $this->expect('include');
+		$includeValue = trim($token->value);
+		$path = $this->getTemplatePath($includeValue);
+
+		if ($path && !$this->hasValidTemplateExtension($path)) {
+			return new Nodes\Text(file_get_contents($path));
+		}
+
+		$string = $this->getTemplateContents($path, $includeValue);
+
+		$parser = new static($string, $path, $this->options);
+		$parser->blocks = $this->blocks;
+		$parser->mixins = $this->mixins;
+
+		$this->context($parser);
+		try {
+			$ast = $parser->parse();
+		} catch (\Exception $e) {
+			throw new \ErrorException($path . ' (' . $parser->lexer->lineno . ') : ' . $e->getMessage(), 27);
+		}
+		$this->context();
+		$ast->filename = $path;
+
+		if ('indent' === $this->peekType() && method_exists($ast, 'includeBlock')) {
+			$block = $ast->includeBlock();
+			if (is_object($block)) {
+				$handler = count($block->nodes) === 1 && isset($block->nodes[0]->block)
+					? $block->nodes[0]->block
+					: $block;
+				$handler->push($this->block());
+			}
+		}
+
+		return $ast;
+	}
+
+	protected function parseCall()
+	{
+		$token = $this->expect('call');
+		$name = $token->value;
+
+		$arguments = isset($token->arguments)
+			? $token->arguments
+			: null;
+
+		$mixin = new Nodes\Mixin($name, $arguments, new Nodes\Block(), true);
+
+		$this->tag($mixin);
+
+		if ($mixin->block->isEmpty()) {
+			$mixin->block = null;
+		}
+
+		return $mixin;
+	}
+
+	protected function parseMixin()
+	{
+		$token = $this->expect('mixin');
+		$name = $token->value;
+		$arguments = $token->arguments;
+
+		// definition
+		if ('indent' === $this->peekType()) {
+			$mixin = new Nodes\Mixin($name, $arguments, $this->block(), false);
+			$this->mixins[$name] = $mixin;
+
+			return $mixin;
+		}
+
+		// call
+		return new Nodes\Mixin($name, $arguments, null, true);
+	}
+
+	protected function parseTextBlock()
+	{
+		$block = new Nodes\Block();
+		$block->line = $this->line();
+		$spaces = $this->expect('indent')->value;
+
+		if (!isset($this->_spaces)) {
+			$this->_spaces = $spaces;
+		}
+
+		$indent = str_repeat(' ', $spaces - $this->_spaces + 1);
+
+		while ($this->peekType() != 'outdent') {
+			switch ($this->peekType()) {
+				case 'newline':
+					$this->lexer->advance();
+					break;
+
+				case 'indent':
+					foreach ($this->parseTextBlock()->nodes as $n) {
+						$block->push($n);
+					}
+					break;
+
+				default:
+					$this->parseInlineTags($block, $indent . $this->advance()->value);
+			}
+		}
+
+		if (isset($this->_spaces) && $spaces === $this->_spaces) {
+			unset($this->_spaces);
+		}
+
+		$this->expect('outdent');
+
+		return $block;
+	}
+
+	protected function block()
+	{
+		$block = new Nodes\Block();
+		$block->line = $this->line();
+		$this->expect('indent');
+
+		while ($this->peekType() !== 'outdent') {
+			if ($this->peekType() === 'newline') {
+				$this->lexer->advance();
+				continue;
+			}
+
+			$block->push($this->parseExpression());
+		}
+
+		$this->expect('outdent');
+
+		return $block;
+	}
+
+	protected function parseInterpolation()
+	{
+		$token = $this->advance();
+		$tag = new Nodes\Tag($token->value);
+		$tag->buffer = true;
+
+		return $this->tag($tag);
+	}
+
+	protected function parseASTFilter()
+	{
+		$token = $this->expect('tag');
+		$attributes = $this->accept('attributes');
+		$this->expect(':');
+		$block = $this->block();
+		$node = new Nodes\Filter($token->value, $block, $attributes);
+		$node->line = $this->line();
+
+		return $node;
+	}
+
+	protected function parseTag()
+	{
+		$i = 2;
+
+		if ('attributes' === $this->lookahead($i)->type) {
+			$i++;
+		}
+
+		if (':' === $this->lookahead($i)->type) {
+			$i++;
+
+			if ('indent' === $this->lookahead($i)->type) {
+				return $this->parseASTFilter();
+			}
+		}
+
+		$token = $this->advance();
+		$tag = new Nodes\Tag($token->value);
+
+		$tag->selfClosing = isset($token->selfClosing)
+			? $token->selfClosing
+			: false;
+
+		return $this->tag($tag);
+	}
+
+	public function parseInlineTags($block, $str)
+	{
+		while (preg_match('/^(.*?)#\[([^\]\n]+)\]/', $str, $matches)) {
+			if (!empty($matches[1])) {
+				$text = new Nodes\Text($matches[1]);
+				$text->line = $this->line();
+				$block->push($text);
+			}
+			$parser = $this->subParser($matches[2]);
+			$tag = $parser->parse();
+			$tag->line = $this->line();
+			$block->push($tag);
+			$str = substr($str, strlen($matches[0]));
+		}
+		if (substr($str, 0, 1) === ' ') {
+			$str = substr($str, 1);
+		}
+		$text = new Nodes\Text($str);
+		$text->line = $this->line();
+		$block->push($text);
+	}
+
+	protected function peekType()
+	{
+		return ($peek = $this->peek())
+			? $peek->type
+			: null;
+	}
+
+	protected function tag($tag)
+	{
+		$tag->line = $this->line();
+
+		while (true) {
+			switch ($type = $this->peekType()) {
+				case 'id':
+					$token = $this->advance();
+					$peek = $this->peek();
+					$escaped = isset($peek->escaped, $peek->escaped[$type]) && $peek->escaped[$type];
+					$value = $escaped || !isset($peek->attributes, $peek->attributes[$type])
+						? "'" . $token->value . "'"
+						: $peek->attributes[$type];
+					$tag->setAttribute($token->type, $value, $escaped);
+					unset($peek->attributes[$type]);
+					continue;
+
+				case 'class':
+					$token = $this->advance();
+					$tag->setAttribute($token->type, "'" . $token->value . "'");
+					continue;
+
+				case 'attributes':
+					$token = $this->advance();
+					$obj = $token->attributes;
+					$escaped = $token->escaped;
+					$nameList = array_keys($obj);
+
+					if ($token->selfClosing) {
+						$tag->selfClosing = true;
+					}
+
+					foreach ($nameList as $name) {
+						$value = $obj[$name];
+						$normalizedValue = strtolower($value);
+						if ($normalizedValue === 'true' || $normalizedValue === 'false') {
+							$value = $normalizedValue === 'true';
+						}
+						$tag->setAttribute($name, $value, $escaped[$name]);
+					}
+					continue;
+
+				case '&attributes':
+					$token = $this->advance();
+					$tag->setAttribute('&attributes', $token->value);
+					continue;
+
+				default:
+					break 2;
+			}
+		}
+
+		$dot = false;
+		$tag->textOnly = false;
+		if ('.' === $this->peek()->value) {
+			$dot = $tag->textOnly = true;
+			$this->advance();
+		}
+
+		switch ($this->peekType()) {
+			case 'text':
+				$this->parseInlineTags($tag->block, $this->expect('text')->value);
+				break;
+
+			case 'code':
+				$tag->code = $this->parseCode();
+				break;
+
+			case ':':
+				$this->advance();
+				$tag->block = new Nodes\Block();
+				$tag->block->push($this->parseExpression());
+				break;
+		}
+
+		while ('newline' === $this->peekType()) {
+			$this->advance();
+		}
+
+		if ('script' === $tag->name) {
+			$type = $tag->getAttribute('type');
+
+			if ($type !== null) {
+				$type = preg_replace('/^[\'\"]|[\'\"]$/', '', $type);
+
+				if (!$dot && 'text/javascript' != $type['value']) {
+					$tag->textOnly = false;
+				}
+			}
+		}
+
+		if ('indent' === $this->peekType()) {
+			if ($tag->textOnly) {
+				$this->lexer->pipeless = true;
+				$tag->block = $this->parseTextBlock();
+				$this->lexer->pipeless = false;
+
+				return $tag;
+			}
+
+			$block = $this->block();
+
+			if ($tag->block && !$tag->block->isEmpty()) {
+				foreach ($block->nodes as $n) {
+					$tag->block->push($n);
+				}
+
+				return $tag;
+			}
+
+			$tag->block = $block;
+		}
+
+		return $tag;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
         $path = ($isAbsolutePath
             ? rtrim($this->options['basedir'], '/\\')
             : dirname($this->filename)
-        ) . DIRECTORY_SEPARATOR . $path;
+        ).DIRECTORY_SEPARATOR.$path;
         $extensions = new ExtensionsHelper($this->extension);
 
         return $extensions->findValidTemplatePath($path, '');
@@ -185,7 +185,7 @@ 
             try {
                 $ast = $parser->parse();
             } catch (\Exception $e) {
-                throw new ParserException($parser->getFilename() . ' (' . $block->line . ') : ' . $e->getMessage(), 23, $e);
+                throw new ParserException($parser->getFilename().' ('.$block->line.') : '.$e->getMessage(), 23, $e);
             }
             $this->context();
 
@@ -208,7 +208,7 @@ 
         $lineNumber = $this->line();
         $lines = explode("\n", $this->input);
         $lineString = isset($lines[$lineNumber]) ? $lines[$lineNumber] : '';
-        throw new \ErrorException("\n" . sprintf('Expected %s, but got %s in %dth line : %s', $type, $this->peekType(), $lineNumber, $lineString) . "\n", 24);
+        throw new \ErrorException("\n".sprintf('Expected %s, but got %s in %dth line : %s', $type, $this->peekType(), $lineNumber, $lineString)."\n", 24);
     }
 
     protected function accept($type)
@@ -223,7 +223,7 @@ 
         $_types = array('tag', 'mixin', 'block', 'case', 'when', 'default', 'extends', 'include', 'doctype', 'filter', 'comment', 'text', 'each', 'customKeyword', 'code', 'call', 'interpolation');
 
         if (in_array($this->peekType(), $_types)) {
-            $_method = 'parse' . ucfirst($this->peekType());
+            $_method = 'parse'.ucfirst($this->peekType());
 
             return $this->$_method();
         }
@@ -245,7 +245,7 @@ 
                 return $this->parseExpression();
 
             default:
-                throw new \ErrorException($this->filename . ' (' . $this->line() . ') : Unexpected token "' . $this->peekType() . '"', 25);
+                throw new \ErrorException($this->filename.' ('.$this->line().') : Unexpected token "'.$this->peekType().'"', 25);
         }
     }
 
@@ -455,7 +455,7 @@ 
         try {
             $ast = $parser->parse();
         } catch (\Exception $e) {
-            throw new \ErrorException($path . ' (' . $parser->lexer->lineno . ') : ' . $e->getMessage(), 27);
+            throw new \ErrorException($path.' ('.$parser->lexer->lineno.') : '.$e->getMessage(), 27);
         }
         $this->context();
         $ast->filename = $path;
@@ -536,7 +536,7 @@ 
                     break;
 
                 default:
-                    $this->parseInlineTags($block, $indent . $this->advance()->value);
+                    $this->parseInlineTags($block, $indent.$this->advance()->value);
             }
         }
 
@@ -656,7 +656,7 @@ 
                     $peek = $this->peek();
                     $escaped = isset($peek->escaped, $peek->escaped[$type]) && $peek->escaped[$type];
                     $value = $escaped || !isset($peek->attributes, $peek->attributes[$type])
-                        ? "'" . $token->value . "'"
+                        ? "'".$token->value."'"
                         : $peek->attributes[$type];
                     $tag->setAttribute($token->type, $value, $escaped);
                     unset($peek->attributes[$type]);
@@ -664,7 +664,7 @@ 
 
                 case 'class':
                     $token = $this->advance();
-                    $tag->setAttribute($token->type, "'" . $token->value . "'");
+                    $tag->setAttribute($token->type, "'".$token->value."'");
                     continue;
 
                 case 'attributes':