XaBerr / JATE

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

Doc Comments +15 added lines, -3 removed lines

@@ -15,6 +15,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $containsOnlyArrays
+     */
     protected function parseMixinArguments(&$arguments, &$containsOnlyArrays, &$defaultAttributes)
     {
         $newArrayKey = null;
@@ -72,6 +75,9 @@ 
         return $this->parseMixinStringAttribute($data);
     }
 
+    /**
+     * @param string $defaultAttributes
+     */
     protected function parseMixinAttributes($attributes, $defaultAttributes, $mixinAttributes)
     {
         if (!count($attributes)) {
@@ -112,6 +118,9 @@ 
         );
     }
 
+    /**
+     * @param string $code
+     */
     protected function renderClosureClosing($code, $arguments = array())
     {
         if (!$this->restrictedScope) {
@@ -139,7 +148,9 @@ 
     }
 
     /**
-     * @param Nodes\Mixin $mixin
+     * @param Mixin $mixin
+     * @param string $name
+     * @param string $blockName
      */
     protected function visitMixinCall(Mixin $mixin, $name, $blockName, $attributes)
     {
@@ -234,7 +245,8 @@ 
     }
 
     /**
-     * @param Nodes\Mixin $mixin
+     * @param Mixin $mixin
+     * @param string $name
      */
     protected function visitMixinDeclaration(Mixin $mixin, $name)
     {
@@ -264,7 +276,7 @@ 
     }
 
     /**
-     * @param Nodes\Mixin $mixin
+     * @param Mixin $mixin
      */
     protected function visitMixin(Mixin $mixin)
     {

Indentation +277 added lines, -277 removed lines

@@ -6,281 +6,281 @@
 
 abstract class MixinVisitor extends CodeVisitor
 {
-    protected function getMixinArgumentAssign($argument)
-    {
-        $argument = trim($argument);
-
-        if (preg_match('`^[a-zA-Z][a-zA-Z0-9:_-]*\s*=`', $argument)) {
-            return explode('=', $argument, 2);
-        }
-    }
-
-    protected function parseMixinArguments(&$arguments, &$containsOnlyArrays, &$defaultAttributes)
-    {
-        $newArrayKey = null;
-        $arguments = is_null($arguments) ? array() : explode(',', $arguments);
-        foreach ($arguments as $key => &$argument) {
-            if ($tab = $this->getMixinArgumentAssign($argument)) {
-                if (is_null($newArrayKey)) {
-                    $newArrayKey = $key;
-                    $argument = array();
-                } else {
-                    unset($arguments[$key]);
-                }
-
-                $defaultAttributes[] = var_export($tab[0], true) . ' => ' . $tab[1];
-                $arguments[$newArrayKey][$tab[0]] = static::decodeValue($tab[1]);
-                continue;
-            }
-
-            $containsOnlyArrays = false;
-            $newArrayKey = null;
-        }
-
-        return array_map(function ($argument) {
-            if (is_array($argument)) {
-                $argument = var_export($argument, true);
-            }
-
-            return $argument;
-        }, $arguments);
-    }
-
-    protected function parseMixinStringAttribute($data)
-    {
-        $value = is_array($data['value'])
-            ? preg_split('`\s+`', trim(implode(' ', $data['value'])))
-            : trim($data['value']);
-
-        return $data['escaped'] === true
-            ? is_array($value)
-                ? array_map('htmlspecialchars', $value)
-                : htmlspecialchars($value)
-            : $value;
-    }
-
-    protected function parseMixinAttribute($data)
-    {
-        if ($data['value'] === 'null' || $data['value'] === 'undefined' || is_null($data['value'])) {
-            return;
-        }
-
-        if (is_bool($data['value'])) {
-            return $data['value'];
-        }
-
-        return $this->parseMixinStringAttribute($data);
-    }
-
-    protected function parseMixinAttributes($attributes, $defaultAttributes, $mixinAttributes)
-    {
-        if (!count($attributes)) {
-            return "(isset(\$attributes)) ? \$attributes : array($defaultAttributes)";
-        }
-
-        $parsedAttributes = array();
-        foreach ($attributes as $data) {
-            $parsedAttributes[$data['name']] = $this->parseMixinAttribute($data);
-        }
-
-        $attributes = var_export($parsedAttributes, true);
-        $mixinAttributes = var_export(static::decodeAttributes($mixinAttributes), true);
-
-        return "array_merge(\\Jade\\Compiler::withMixinAttributes($attributes, $mixinAttributes), (isset(\$attributes)) ? \$attributes : array($defaultAttributes))";
-    }
-
-    protected function renderClosureOpenning()
-    {
-        $arguments = func_get_args();
-        $begin = array_shift($arguments);
-        $begin = is_array($begin)
-            ? $begin[0] . 'function ' . $begin[1]
-            : $begin . 'function ';
-        $params = implode(', ', array_map(function ($name) {
-            return (substr($name, 0, 1) === '$' ? '' : '$') . $name;
-        }, $arguments));
-
-        if ($this->restrictedScope) {
-            return $this->buffer($this->createCode($begin . '(' . $params . ') {'));
-        }
-
-        $params = '&$__varHandler, ' . $params;
-
-        $this->buffer(
-            $this->createCode($begin . '(' . $params . ') {') .
-            $this->createCode($this->indent() . 'extract($__varHandler, EXTR_SKIP);')
-        );
-    }
-
-    protected function renderClosureClosing($code, $arguments = array())
-    {
-        if (!$this->restrictedScope) {
-            $arguments = array_filter(array_map(function ($argument) {
-                $argument = explode('=', $argument);
-                $argument = trim($argument[0]);
-
-                return substr($argument, 0, 1) === '$'
-                    ? substr($argument, 1)
-                    : false;
-            }, array_slice($arguments, 1)));
-            $exception = count($arguments)
-                ? ' && !in_array($key, ' . var_export($arguments, true) . ')'
-                : '';
-            $this->buffer($this->createCode(
-                'foreach ($__varHandler as $key => &$val) {' .
-                'if ($key !== \'__varHandler\'' . $exception . ') {' .
-                '$val = ${$key};' .
-                '}' .
-                '}'
-            ));
-        }
-
-        $this->buffer($this->createCode($code));
-    }
-
-    /**
-     * @param Nodes\Mixin $mixin
-     */
-    protected function visitMixinCall(Mixin $mixin, $name, $blockName, $attributes)
-    {
-        $arguments = $mixin->arguments;
-        $block = $mixin->block;
-        $defaultAttributes = array();
-        $containsOnlyArrays = true;
-        $arguments = $this->parseMixinArguments($mixin->arguments, $containsOnlyArrays, $defaultAttributes);
-
-        $defaultAttributes = implode(', ', $defaultAttributes);
-        $attributes = $this->parseMixinAttributes($attributes, $defaultAttributes, $mixin->attributes);
-
-        if ($block) {
-            $this->renderClosureOpenning("\\Jade\\Compiler::recordMixinBlock($blockName, ", 'attributes');
-            $this->visit($block);
-            $this->renderClosureClosing('});');
-        }
-
-        $strings = array();
-        $arguments = preg_replace_callback(
-            '#([\'"])(.*(?!<\\\\)(?:\\\\{2})*)\\1#U',
-            function ($match) use (&$strings) {
-                $nextIndex = count($strings);
-                $strings[] = $match[0];
-
-                return 'stringToReplaceBy' . $nextIndex . 'ThCapture';
-            },
-            $arguments
-        );
-        $arguments = array_map(
-            function ($arg) use ($strings) {
-                return preg_replace_callback(
-                    '#stringToReplaceBy([0-9]+)ThCapture#',
-                    function ($match) use ($strings) {
-                        return $strings[intval($match[1])];
-                    },
-                    $arg
-                );
-            },
-            $arguments
-        );
-
-        array_unshift($arguments, $attributes);
-        $arguments = array_filter($arguments, 'strlen');
-        $statements = $this->apply('createStatements', $arguments);
-
-        $variables = array_pop($statements);
-        if ($mixin->call && $containsOnlyArrays) {
-            array_splice($variables, 1, 0, array('null'));
-        }
-        $variables = implode(', ', $variables);
-        array_push($statements, $variables);
-
-        $arguments = $statements;
-
-        $paramsPrefix = '';
-        if (!$this->restrictedScope) {
-            $this->buffer($this->createCode('$__varHandler = get_defined_vars();'));
-            $paramsPrefix = '$__varHandler, ';
-        }
-        $codeFormat = str_repeat('%s;', count($arguments) - 1) . "{$name}({$paramsPrefix}%s)";
-
-        array_unshift($arguments, $codeFormat);
-
-        $this->buffer($this->apply('createCode', $arguments));
-        if (!$this->restrictedScope) {
-            $this->buffer(
-                $this->createCode(
-                    'extract(array_diff_key($__varHandler, array(\'__varHandler\' => 1, \'attributes\' => 1)));'
-                )
-            );
-        }
-
-        if ($block) {
-            $code = $this->createCode("\\Jade\\Compiler::terminateMixinBlock($blockName);");
-            $this->buffer($code);
-        }
-    }
-
-    protected function visitMixinCodeAndBlock($name, $block, $arguments)
-    {
-        $this->renderClosureOpenning(
-            $this->allowMixinOverride
-                ? "{$name} = "
-                : array("if(!function_exists('{$name}')) { ", $name),
-            implode(',', $arguments)
-        );
-        $this->indents++;
-        $this->visit($block);
-        $this->indents--;
-        $this->renderClosureClosing($this->allowMixinOverride ? '};' : '} }', $arguments);
-    }
-
-    /**
-     * @param Nodes\Mixin $mixin
-     */
-    protected function visitMixinDeclaration(Mixin $mixin, $name)
-    {
-        $arguments = $mixin->arguments;
-        $block = $mixin->block;
-        $previousVisitedMixin = isset($this->visitedMixin) ? $this->visitedMixin : null;
-        $this->visitedMixin = $mixin;
-        if ($arguments === null || empty($arguments)) {
-            $arguments = array();
-        } elseif (!is_array($arguments)) {
-            $arguments = array($arguments);
-        }
-
-        array_unshift($arguments, 'attributes');
-        $arguments = implode(',', $arguments);
-        $arguments = explode(',', $arguments);
-        array_walk($arguments, array(get_class(), 'initArgToNull'));
-        $this->visitMixinCodeAndBlock($name, $block, $arguments);
-
-        if (is_null($previousVisitedMixin)) {
-            unset($this->visitedMixin);
-
-            return;
-        }
-
-        $this->visitedMixin = $previousVisitedMixin;
-    }
-
-    /**
-     * @param Nodes\Mixin $mixin
-     */
-    protected function visitMixin(Mixin $mixin)
-    {
-        $name = strtr($mixin->name, '-', '_') . '_mixin';
-        $blockName = var_export($mixin->name, true);
-        if ($this->allowMixinOverride) {
-            $name = '$GLOBALS[\'' . $name . '\']';
-        }
-        $attributes = static::decodeAttributes($mixin->attributes);
-
-        if ($mixin->call) {
-            $this->visitMixinCall($mixin, $name, $blockName, $attributes);
-
-            return;
-        }
-
-        $this->visitMixinDeclaration($mixin, $name);
-    }
+	protected function getMixinArgumentAssign($argument)
+	{
+		$argument = trim($argument);
+
+		if (preg_match('`^[a-zA-Z][a-zA-Z0-9:_-]*\s*=`', $argument)) {
+			return explode('=', $argument, 2);
+		}
+	}
+
+	protected function parseMixinArguments(&$arguments, &$containsOnlyArrays, &$defaultAttributes)
+	{
+		$newArrayKey = null;
+		$arguments = is_null($arguments) ? array() : explode(',', $arguments);
+		foreach ($arguments as $key => &$argument) {
+			if ($tab = $this->getMixinArgumentAssign($argument)) {
+				if (is_null($newArrayKey)) {
+					$newArrayKey = $key;
+					$argument = array();
+				} else {
+					unset($arguments[$key]);
+				}
+
+				$defaultAttributes[] = var_export($tab[0], true) . ' => ' . $tab[1];
+				$arguments[$newArrayKey][$tab[0]] = static::decodeValue($tab[1]);
+				continue;
+			}
+
+			$containsOnlyArrays = false;
+			$newArrayKey = null;
+		}
+
+		return array_map(function ($argument) {
+			if (is_array($argument)) {
+				$argument = var_export($argument, true);
+			}
+
+			return $argument;
+		}, $arguments);
+	}
+
+	protected function parseMixinStringAttribute($data)
+	{
+		$value = is_array($data['value'])
+			? preg_split('`\s+`', trim(implode(' ', $data['value'])))
+			: trim($data['value']);
+
+		return $data['escaped'] === true
+			? is_array($value)
+				? array_map('htmlspecialchars', $value)
+				: htmlspecialchars($value)
+			: $value;
+	}
+
+	protected function parseMixinAttribute($data)
+	{
+		if ($data['value'] === 'null' || $data['value'] === 'undefined' || is_null($data['value'])) {
+			return;
+		}
+
+		if (is_bool($data['value'])) {
+			return $data['value'];
+		}
+
+		return $this->parseMixinStringAttribute($data);
+	}
+
+	protected function parseMixinAttributes($attributes, $defaultAttributes, $mixinAttributes)
+	{
+		if (!count($attributes)) {
+			return "(isset(\$attributes)) ? \$attributes : array($defaultAttributes)";
+		}
+
+		$parsedAttributes = array();
+		foreach ($attributes as $data) {
+			$parsedAttributes[$data['name']] = $this->parseMixinAttribute($data);
+		}
+
+		$attributes = var_export($parsedAttributes, true);
+		$mixinAttributes = var_export(static::decodeAttributes($mixinAttributes), true);
+
+		return "array_merge(\\Jade\\Compiler::withMixinAttributes($attributes, $mixinAttributes), (isset(\$attributes)) ? \$attributes : array($defaultAttributes))";
+	}
+
+	protected function renderClosureOpenning()
+	{
+		$arguments = func_get_args();
+		$begin = array_shift($arguments);
+		$begin = is_array($begin)
+			? $begin[0] . 'function ' . $begin[1]
+			: $begin . 'function ';
+		$params = implode(', ', array_map(function ($name) {
+			return (substr($name, 0, 1) === '$' ? '' : '$') . $name;
+		}, $arguments));
+
+		if ($this->restrictedScope) {
+			return $this->buffer($this->createCode($begin . '(' . $params . ') {'));
+		}
+
+		$params = '&$__varHandler, ' . $params;
+
+		$this->buffer(
+			$this->createCode($begin . '(' . $params . ') {') .
+			$this->createCode($this->indent() . 'extract($__varHandler, EXTR_SKIP);')
+		);
+	}
+
+	protected function renderClosureClosing($code, $arguments = array())
+	{
+		if (!$this->restrictedScope) {
+			$arguments = array_filter(array_map(function ($argument) {
+				$argument = explode('=', $argument);
+				$argument = trim($argument[0]);
+
+				return substr($argument, 0, 1) === '$'
+					? substr($argument, 1)
+					: false;
+			}, array_slice($arguments, 1)));
+			$exception = count($arguments)
+				? ' && !in_array($key, ' . var_export($arguments, true) . ')'
+				: '';
+			$this->buffer($this->createCode(
+				'foreach ($__varHandler as $key => &$val) {' .
+				'if ($key !== \'__varHandler\'' . $exception . ') {' .
+				'$val = ${$key};' .
+				'}' .
+				'}'
+			));
+		}
+
+		$this->buffer($this->createCode($code));
+	}
+
+	/**
+	 * @param Nodes\Mixin $mixin
+	 */
+	protected function visitMixinCall(Mixin $mixin, $name, $blockName, $attributes)
+	{
+		$arguments = $mixin->arguments;
+		$block = $mixin->block;
+		$defaultAttributes = array();
+		$containsOnlyArrays = true;
+		$arguments = $this->parseMixinArguments($mixin->arguments, $containsOnlyArrays, $defaultAttributes);
+
+		$defaultAttributes = implode(', ', $defaultAttributes);
+		$attributes = $this->parseMixinAttributes($attributes, $defaultAttributes, $mixin->attributes);
+
+		if ($block) {
+			$this->renderClosureOpenning("\\Jade\\Compiler::recordMixinBlock($blockName, ", 'attributes');
+			$this->visit($block);
+			$this->renderClosureClosing('});');
+		}
+
+		$strings = array();
+		$arguments = preg_replace_callback(
+			'#([\'"])(.*(?!<\\\\)(?:\\\\{2})*)\\1#U',
+			function ($match) use (&$strings) {
+				$nextIndex = count($strings);
+				$strings[] = $match[0];
+
+				return 'stringToReplaceBy' . $nextIndex . 'ThCapture';
+			},
+			$arguments
+		);
+		$arguments = array_map(
+			function ($arg) use ($strings) {
+				return preg_replace_callback(
+					'#stringToReplaceBy([0-9]+)ThCapture#',
+					function ($match) use ($strings) {
+						return $strings[intval($match[1])];
+					},
+					$arg
+				);
+			},
+			$arguments
+		);
+
+		array_unshift($arguments, $attributes);
+		$arguments = array_filter($arguments, 'strlen');
+		$statements = $this->apply('createStatements', $arguments);
+
+		$variables = array_pop($statements);
+		if ($mixin->call && $containsOnlyArrays) {
+			array_splice($variables, 1, 0, array('null'));
+		}
+		$variables = implode(', ', $variables);
+		array_push($statements, $variables);
+
+		$arguments = $statements;
+
+		$paramsPrefix = '';
+		if (!$this->restrictedScope) {
+			$this->buffer($this->createCode('$__varHandler = get_defined_vars();'));
+			$paramsPrefix = '$__varHandler, ';
+		}
+		$codeFormat = str_repeat('%s;', count($arguments) - 1) . "{$name}({$paramsPrefix}%s)";
+
+		array_unshift($arguments, $codeFormat);
+
+		$this->buffer($this->apply('createCode', $arguments));
+		if (!$this->restrictedScope) {
+			$this->buffer(
+				$this->createCode(
+					'extract(array_diff_key($__varHandler, array(\'__varHandler\' => 1, \'attributes\' => 1)));'
+				)
+			);
+		}
+
+		if ($block) {
+			$code = $this->createCode("\\Jade\\Compiler::terminateMixinBlock($blockName);");
+			$this->buffer($code);
+		}
+	}
+
+	protected function visitMixinCodeAndBlock($name, $block, $arguments)
+	{
+		$this->renderClosureOpenning(
+			$this->allowMixinOverride
+				? "{$name} = "
+				: array("if(!function_exists('{$name}')) { ", $name),
+			implode(',', $arguments)
+		);
+		$this->indents++;
+		$this->visit($block);
+		$this->indents--;
+		$this->renderClosureClosing($this->allowMixinOverride ? '};' : '} }', $arguments);
+	}
+
+	/**
+	 * @param Nodes\Mixin $mixin
+	 */
+	protected function visitMixinDeclaration(Mixin $mixin, $name)
+	{
+		$arguments = $mixin->arguments;
+		$block = $mixin->block;
+		$previousVisitedMixin = isset($this->visitedMixin) ? $this->visitedMixin : null;
+		$this->visitedMixin = $mixin;
+		if ($arguments === null || empty($arguments)) {
+			$arguments = array();
+		} elseif (!is_array($arguments)) {
+			$arguments = array($arguments);
+		}
+
+		array_unshift($arguments, 'attributes');
+		$arguments = implode(',', $arguments);
+		$arguments = explode(',', $arguments);
+		array_walk($arguments, array(get_class(), 'initArgToNull'));
+		$this->visitMixinCodeAndBlock($name, $block, $arguments);
+
+		if (is_null($previousVisitedMixin)) {
+			unset($this->visitedMixin);
+
+			return;
+		}
+
+		$this->visitedMixin = $previousVisitedMixin;
+	}
+
+	/**
+	 * @param Nodes\Mixin $mixin
+	 */
+	protected function visitMixin(Mixin $mixin)
+	{
+		$name = strtr($mixin->name, '-', '_') . '_mixin';
+		$blockName = var_export($mixin->name, true);
+		if ($this->allowMixinOverride) {
+			$name = '$GLOBALS[\'' . $name . '\']';
+		}
+		$attributes = static::decodeAttributes($mixin->attributes);
+
+		if ($mixin->call) {
+			$this->visitMixinCall($mixin, $name, $blockName, $attributes);
+
+			return;
+		}
+
+		$this->visitMixinDeclaration($mixin, $name);
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -28,7 +28,7 @@ 
                     unset($arguments[$key]);
                 }
 
-                $defaultAttributes[] = var_export($tab[0], true) . ' => ' . $tab[1];
+                $defaultAttributes[] = var_export($tab[0], true).' => '.$tab[1];
                 $arguments[$newArrayKey][$tab[0]] = static::decodeValue($tab[1]);
                 continue;
             }
@@ -37,7 +37,7 @@ 
             $newArrayKey = null;
         }
 
-        return array_map(function ($argument) {
+        return array_map(function($argument) {
             if (is_array($argument)) {
                 $argument = var_export($argument, true);
             }
@@ -94,28 +94,28 @@ 
         $arguments = func_get_args();
         $begin = array_shift($arguments);
         $begin = is_array($begin)
-            ? $begin[0] . 'function ' . $begin[1]
-            : $begin . 'function ';
-        $params = implode(', ', array_map(function ($name) {
-            return (substr($name, 0, 1) === '$' ? '' : '$') . $name;
+            ? $begin[0].'function '.$begin[1]
+            : $begin.'function ';
+        $params = implode(', ', array_map(function($name) {
+            return (substr($name, 0, 1) === '$' ? '' : '$').$name;
         }, $arguments));
 
         if ($this->restrictedScope) {
-            return $this->buffer($this->createCode($begin . '(' . $params . ') {'));
+            return $this->buffer($this->createCode($begin.'('.$params.') {'));
         }
 
-        $params = '&$__varHandler, ' . $params;
+        $params = '&$__varHandler, '.$params;
 
         $this->buffer(
-            $this->createCode($begin . '(' . $params . ') {') .
-            $this->createCode($this->indent() . 'extract($__varHandler, EXTR_SKIP);')
+            $this->createCode($begin.'('.$params.') {').
+            $this->createCode($this->indent().'extract($__varHandler, EXTR_SKIP);')
         );
     }
 
     protected function renderClosureClosing($code, $arguments = array())
     {
         if (!$this->restrictedScope) {
-            $arguments = array_filter(array_map(function ($argument) {
+            $arguments = array_filter(array_map(function($argument) {
                 $argument = explode('=', $argument);
                 $argument = trim($argument[0]);
 
@@ -124,13 +124,13 @@ 
                     : false;
             }, array_slice($arguments, 1)));
             $exception = count($arguments)
-                ? ' && !in_array($key, ' . var_export($arguments, true) . ')'
+                ? ' && !in_array($key, '.var_export($arguments, true).')'
                 : '';
             $this->buffer($this->createCode(
-                'foreach ($__varHandler as $key => &$val) {' .
-                'if ($key !== \'__varHandler\'' . $exception . ') {' .
-                '$val = ${$key};' .
-                '}' .
+                'foreach ($__varHandler as $key => &$val) {'.
+                'if ($key !== \'__varHandler\''.$exception.') {'.
+                '$val = ${$key};'.
+                '}'.
                 '}'
             ));
         }
@@ -161,19 +161,19 @@ 
         $strings = array();
         $arguments = preg_replace_callback(
             '#([\'"])(.*(?!<\\\\)(?:\\\\{2})*)\\1#U',
-            function ($match) use (&$strings) {
+            function($match) use (&$strings) {
                 $nextIndex = count($strings);
                 $strings[] = $match[0];
 
-                return 'stringToReplaceBy' . $nextIndex . 'ThCapture';
+                return 'stringToReplaceBy'.$nextIndex.'ThCapture';
             },
             $arguments
         );
         $arguments = array_map(
-            function ($arg) use ($strings) {
+            function($arg) use ($strings) {
                 return preg_replace_callback(
                     '#stringToReplaceBy([0-9]+)ThCapture#',
-                    function ($match) use ($strings) {
+                    function($match) use ($strings) {
                         return $strings[intval($match[1])];
                     },
                     $arg
@@ -200,7 +200,7 @@ 
             $this->buffer($this->createCode('$__varHandler = get_defined_vars();'));
             $paramsPrefix = '$__varHandler, ';
         }
-        $codeFormat = str_repeat('%s;', count($arguments) - 1) . "{$name}({$paramsPrefix}%s)";
+        $codeFormat = str_repeat('%s;', count($arguments) - 1)."{$name}({$paramsPrefix}%s)";
 
         array_unshift($arguments, $codeFormat);
 
@@ -268,10 +268,10 @@ 
      */
     protected function visitMixin(Mixin $mixin)
     {
-        $name = strtr($mixin->name, '-', '_') . '_mixin';
+        $name = strtr($mixin->name, '-', '_').'_mixin';
         $blockName = var_export($mixin->name, true);
         if ($this->allowMixinOverride) {
-            $name = '$GLOBALS[\'' . $name . '\']';
+            $name = '$GLOBALS[\''.$name.'\']';
         }
         $attributes = static::decodeAttributes($mixin->attributes);
 

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

Doc Comments +3 added lines

@@ -11,6 +11,9 @@
     protected $input;
     protected $name;
 
+    /**
+     * @param string $input
+     */
     public function __construct(CodeHandler $codeHandler, $input, $name)
     {
         $this->codeHandler = $codeHandler;

Indentation +164 added lines, -164 removed lines

@@ -7,168 +7,168 @@
  */
 class SubCodeHandler
 {
-    protected $codeHandler;
-    protected $input;
-    protected $name;
-
-    public function __construct(CodeHandler $codeHandler, $input, $name)
-    {
-        $this->codeHandler = $codeHandler;
-        $this->input = $input;
-        $this->name = $name;
-    }
-
-    public function getMiddleString()
-    {
-        $input = $this->input;
-
-        return function ($start, $end) use ($input) {
-            $offset = $start[1] + strlen($start[0]);
-
-            return substr($input, $offset, isset($end) ? $end[1] - $offset : strlen($input));
-        };
-    }
-
-    public function handleRecursion(&$result)
-    {
-        $getMiddleString = $this->getMiddleString();
-        $codeHandler = $this->codeHandler;
-
-        return function ($arg, $name = '') use (&$result, $codeHandler, $getMiddleString) {
-            list($start, $end) = $arg;
-            $str = trim($getMiddleString($start, $end));
-
-            if (!strlen($str)) {
-                return '';
-            }
-
-            $innerCode = $codeHandler->innerCode($str, $name);
-
-            if (count($innerCode) > 1) {
-                $result = array_merge($result, array_slice($innerCode, 0, -1));
-
-                return array_pop($innerCode);
-            }
-
-            return $innerCode[0];
-        };
-    }
-
-    protected function handleNestedExpression(&$result)
-    {
-        $handleRecursion = $this->handleRecursion($result);
-        $name = $this->name;
-
-        return function (&$arguments, $start, $end) use ($name, $handleRecursion) {
-            if ($end !== false && $start[1] !== $end[1]) {
-                array_push(
-                    $arguments,
-                    $handleRecursion(
-                        array($start, $end),
-                        $name * 10 + count($arguments)
-                    )
-                );
-            }
-        };
-    }
-
-    protected function scanSeparators(&$separators, &$result)
-    {
-        $handleNested = $this->handleNestedExpression($result);
-
-        return function (&$arguments, $open, $close) use (&$separators, $handleNested) {
-            $count = 1;
-
-            do {
-                $start = current($separators);
-
-                do {
-                    $curr = next($separators);
-
-                    if ($curr[0] === $open) {
-                        $count++;
-                    }
-                    if ($curr[0] === $close) {
-                        $count--;
-                    }
-                } while ($curr[0] !== null && $count > 0 && $curr[0] !== ',');
-
-                $handleNested($arguments, $start, current($separators));
-            } while ($curr !== false && $count > 0);
-
-            return $count;
-        };
-    }
-
-    public function handleCodeInbetween(&$separators, &$result)
-    {
-        $scanSeparators = $this->scanSeparators($separators, $result);
-        $input = $this->input;
-
-        return function () use (&$separators, $input, $scanSeparators) {
-            $arguments = array();
-
-            $start = current($separators);
-            $endPair = array(
-                '[' => ']',
-                '{' => '}',
-                '(' => ')',
-                ',' => false,
-            );
-            $open = $start[0];
-            $close = $endPair[$start[0]];
-
-            $count = $scanSeparators($arguments, $open, $close);
-
-            if ($close && $count > 0) {
-                throw new \ErrorException($input . "\nMissing closing: " . $close, 14);
-            }
-
-            if (($sep = current($separators)) !== false) {
-                $end = next($separators);
-                if ($end[0] === null && $sep[1] < $end[1]) {
-                    $key = count($arguments) - 1;
-                    $arguments[$key] .= substr($input, $sep[1] + 1, $end[1] - $sep[1] - 1);
-                }
-            }
-
-            return $arguments;
-        };
-    }
-
-    public function getNext($separators)
-    {
-        return function ($index) use ($separators) {
-            if (isset($separators[$index + 1])) {
-                return $separators[$index + 1];
-            }
-        };
-    }
-
-    public function addToOutput(&$output, &$key, &$value)
-    {
-        return function () use (&$output, &$key, &$value) {
-            foreach (array('key', 'value') as $var) {
-                ${$var} = trim(${$var});
-                if (empty(${$var})) {
-                    continue;
-                }
-                if (preg_match('/^\d*[a-zA-Z_]/', ${$var})) {
-                    ${$var} = var_export(${$var}, true);
-                }
-            }
-            $output[] = empty($value)
-                ? $key
-                : $key . ' => ' . $value;
-            $key = '';
-            $value = null;
-        };
-    }
-
-    public function consume()
-    {
-        return function (&$argument, $start) {
-            $argument = substr($argument, strlen($start));
-        };
-    }
+	protected $codeHandler;
+	protected $input;
+	protected $name;
+
+	public function __construct(CodeHandler $codeHandler, $input, $name)
+	{
+		$this->codeHandler = $codeHandler;
+		$this->input = $input;
+		$this->name = $name;
+	}
+
+	public function getMiddleString()
+	{
+		$input = $this->input;
+
+		return function ($start, $end) use ($input) {
+			$offset = $start[1] + strlen($start[0]);
+
+			return substr($input, $offset, isset($end) ? $end[1] - $offset : strlen($input));
+		};
+	}
+
+	public function handleRecursion(&$result)
+	{
+		$getMiddleString = $this->getMiddleString();
+		$codeHandler = $this->codeHandler;
+
+		return function ($arg, $name = '') use (&$result, $codeHandler, $getMiddleString) {
+			list($start, $end) = $arg;
+			$str = trim($getMiddleString($start, $end));
+
+			if (!strlen($str)) {
+				return '';
+			}
+
+			$innerCode = $codeHandler->innerCode($str, $name);
+
+			if (count($innerCode) > 1) {
+				$result = array_merge($result, array_slice($innerCode, 0, -1));
+
+				return array_pop($innerCode);
+			}
+
+			return $innerCode[0];
+		};
+	}
+
+	protected function handleNestedExpression(&$result)
+	{
+		$handleRecursion = $this->handleRecursion($result);
+		$name = $this->name;
+
+		return function (&$arguments, $start, $end) use ($name, $handleRecursion) {
+			if ($end !== false && $start[1] !== $end[1]) {
+				array_push(
+					$arguments,
+					$handleRecursion(
+						array($start, $end),
+						$name * 10 + count($arguments)
+					)
+				);
+			}
+		};
+	}
+
+	protected function scanSeparators(&$separators, &$result)
+	{
+		$handleNested = $this->handleNestedExpression($result);
+
+		return function (&$arguments, $open, $close) use (&$separators, $handleNested) {
+			$count = 1;
+
+			do {
+				$start = current($separators);
+
+				do {
+					$curr = next($separators);
+
+					if ($curr[0] === $open) {
+						$count++;
+					}
+					if ($curr[0] === $close) {
+						$count--;
+					}
+				} while ($curr[0] !== null && $count > 0 && $curr[0] !== ',');
+
+				$handleNested($arguments, $start, current($separators));
+			} while ($curr !== false && $count > 0);
+
+			return $count;
+		};
+	}
+
+	public function handleCodeInbetween(&$separators, &$result)
+	{
+		$scanSeparators = $this->scanSeparators($separators, $result);
+		$input = $this->input;
+
+		return function () use (&$separators, $input, $scanSeparators) {
+			$arguments = array();
+
+			$start = current($separators);
+			$endPair = array(
+				'[' => ']',
+				'{' => '}',
+				'(' => ')',
+				',' => false,
+			);
+			$open = $start[0];
+			$close = $endPair[$start[0]];
+
+			$count = $scanSeparators($arguments, $open, $close);
+
+			if ($close && $count > 0) {
+				throw new \ErrorException($input . "\nMissing closing: " . $close, 14);
+			}
+
+			if (($sep = current($separators)) !== false) {
+				$end = next($separators);
+				if ($end[0] === null && $sep[1] < $end[1]) {
+					$key = count($arguments) - 1;
+					$arguments[$key] .= substr($input, $sep[1] + 1, $end[1] - $sep[1] - 1);
+				}
+			}
+
+			return $arguments;
+		};
+	}
+
+	public function getNext($separators)
+	{
+		return function ($index) use ($separators) {
+			if (isset($separators[$index + 1])) {
+				return $separators[$index + 1];
+			}
+		};
+	}
+
+	public function addToOutput(&$output, &$key, &$value)
+	{
+		return function () use (&$output, &$key, &$value) {
+			foreach (array('key', 'value') as $var) {
+				${$var} = trim(${$var});
+				if (empty(${$var})) {
+					continue;
+				}
+				if (preg_match('/^\d*[a-zA-Z_]/', ${$var})) {
+					${$var} = var_export(${$var}, true);
+				}
+			}
+			$output[] = empty($value)
+				? $key
+				: $key . ' => ' . $value;
+			$key = '';
+			$value = null;
+		};
+	}
+
+	public function consume()
+	{
+		return function (&$argument, $start) {
+			$argument = substr($argument, strlen($start));
+		};
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -22,7 +22,7 @@ 
     {
         $input = $this->input;
 
-        return function ($start, $end) use ($input) {
+        return function($start, $end) use ($input) {
             $offset = $start[1] + strlen($start[0]);
 
             return substr($input, $offset, isset($end) ? $end[1] - $offset : strlen($input));
@@ -34,7 +34,7 @@ 
         $getMiddleString = $this->getMiddleString();
         $codeHandler = $this->codeHandler;
 
-        return function ($arg, $name = '') use (&$result, $codeHandler, $getMiddleString) {
+        return function($arg, $name = '') use (&$result, $codeHandler, $getMiddleString) {
             list($start, $end) = $arg;
             $str = trim($getMiddleString($start, $end));
 
@@ -59,7 +59,7 @@ 
         $handleRecursion = $this->handleRecursion($result);
         $name = $this->name;
 
-        return function (&$arguments, $start, $end) use ($name, $handleRecursion) {
+        return function(&$arguments, $start, $end) use ($name, $handleRecursion) {
             if ($end !== false && $start[1] !== $end[1]) {
                 array_push(
                     $arguments,
@@ -76,7 +76,7 @@ 
     {
         $handleNested = $this->handleNestedExpression($result);
 
-        return function (&$arguments, $open, $close) use (&$separators, $handleNested) {
+        return function(&$arguments, $open, $close) use (&$separators, $handleNested) {
             $count = 1;
 
             do {
@@ -105,7 +105,7 @@ 
         $scanSeparators = $this->scanSeparators($separators, $result);
         $input = $this->input;
 
-        return function () use (&$separators, $input, $scanSeparators) {
+        return function() use (&$separators, $input, $scanSeparators) {
             $arguments = array();
 
             $start = current($separators);
@@ -121,7 +121,7 @@ 
             $count = $scanSeparators($arguments, $open, $close);
 
             if ($close && $count > 0) {
-                throw new \ErrorException($input . "\nMissing closing: " . $close, 14);
+                throw new \ErrorException($input."\nMissing closing: ".$close, 14);
             }
 
             if (($sep = current($separators)) !== false) {
@@ -138,7 +138,7 @@ 
 
     public function getNext($separators)
     {
-        return function ($index) use ($separators) {
+        return function($index) use ($separators) {
             if (isset($separators[$index + 1])) {
                 return $separators[$index + 1];
             }
@@ -147,7 +147,7 @@ 
 
     public function addToOutput(&$output, &$key, &$value)
     {
-        return function () use (&$output, &$key, &$value) {
+        return function() use (&$output, &$key, &$value) {
             foreach (array('key', 'value') as $var) {
                 ${$var} = trim(${$var});
                 if (empty(${$var})) {
@@ -159,7 +159,7 @@ 
             }
             $output[] = empty($value)
                 ? $key
-                : $key . ' => ' . $value;
+                : $key.' => '.$value;
             $key = '';
             $value = null;
         };
@@ -167,7 +167,7 @@ 
 
     public function consume()
     {
-        return function (&$argument, $start) {
+        return function(&$argument, $start) {
             $argument = substr($argument, strlen($start));
         };
     }

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],
         );
     }