XaBerr / JATE

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

Doc Comments +8 added lines

@@ -87,6 +87,10 @@ 
         return $this->escapeIfNeeded($escaped, '$__value');
     }
 
+    /**
+     * @param string $key
+     * @param string $value
+     */
     protected function getAttributeValue($escaped, $key, $value, &$classesCheck, &$valueCheck)
     {
         if ($this->isConstant($value)) {
@@ -113,6 +117,10 @@ 
             : $value;
     }
 
+    /**
+     * @param string $key
+     * @param callable $value
+     */
     protected function compileAttributeValue($key, $value, $attr, $valueCheck)
     {
         return $value === true || $attr['value'] === true

Indentation +189 added lines, -189 removed lines

@@ -4,193 +4,193 @@
 
 abstract class AttributesCompiler extends CompilerFacade
 {
-    protected function getAttributeDisplayCode($key, $value, $valueCheck)
-    {
-        if ($key === 'style') {
-            $value = preg_replace('/::get(Escaped|Unescaped)Value/', '::get$1Style', $value, 1);
-        }
-
-        return is_null($valueCheck)
-            ? ' ' . $key . '=' . $this->quote . $value . $this->quote
-            : $this->createCode('if (true === ($__value = %1$s)) { ', $valueCheck)
-                . $this->getBooleanAttributeDisplayCode($key)
-                . $this->createCode('} else if (\\Jade\\Compiler::isDisplayable($__value)) { ')
-                . ' ' . $key . '=' . $this->quote . $value . $this->quote
-                . $this->createCode('}');
-    }
-
-    protected function getBooleanAttributeDisplayCode($key)
-    {
-        return ' ' . $key . ($this->terse
-            ? ''
-            : '=' . $this->quote . $key . $this->quote
-        );
-    }
-
-    protected function getValueStatement($statements)
-    {
-        return is_string($statements[0])
-            ? $statements[0]
-            : $statements[0][0];
-    }
-
-    protected function getAndAttributeCode($attr, &$classes, &$classesCheck)
-    {
-        $addClasses = '""';
-        if (count($classes) || count($classesCheck)) {
-            foreach ($classes as &$value) {
-                $value = var_export($value, true);
-            }
-            foreach ($classesCheck as $value) {
-                $statements = $this->createStatements($value);
-                $classes[] = $statements[0][0];
-            }
-            $addClasses = '" " . implode(" ", array(' . implode(', ', $classes) . '))';
-            $classes = array();
-            $classesCheck = array();
-        }
-        $value = empty($attr['value']) ? 'attributes' : $attr['value'];
-        $statements = $this->createStatements($value);
-
-        return $this->createCode(
-            '$__attributes = ' . $this->getValueStatement($statements) . ';' .
-            'if (is_array($__attributes)) { ' .
-                '$__attributes["class"] = trim(' .
-                    '$__classes = (empty($__classes) ? "" : $__classes . " ") . ' .
-                    '(isset($__attributes["class"]) ? (is_array($__attributes["class"]) ? implode(" ", $__attributes["class"]) : $__attributes["class"]) : "") . ' .
-                    $addClasses .
-                '); ' .
-                'if (empty($__attributes["class"])) { ' .
-                    'unset($__attributes["class"]); ' .
-                '} ' .
-            '} ' .
-            '\\Jade\\Compiler::displayAttributes($__attributes, ' . var_export($this->quote, true) . ', ' . var_export($this->terse, true) . ');');
-    }
-
-    protected function getClassAttribute($value, &$classesCheck)
-    {
-        $statements = $this->createStatements($value);
-        $value = is_array($statements[0]) ? $statements[0][0] : $statements[0];
-        $classesCheck[] = '(is_array($_a = ' . $value . ') ? implode(" ", $_a) : $_a)';
-
-        return $this->keepNullAttributes ? '' : 'null';
-    }
-
-    protected function getValueCode($escaped, $value, &$valueCheck)
-    {
-        if ($this->keepNullAttributes) {
-            return $this->escapeIfNeeded($escaped, $value);
-        }
-
-        $valueCheck = $value;
-
-        return $this->escapeIfNeeded($escaped, '$__value');
-    }
-
-    protected function getAttributeValue($escaped, $key, $value, &$classesCheck, &$valueCheck)
-    {
-        if ($this->isConstant($value)) {
-            $value = trim($value, ' \'"');
-
-            return $value === 'undefined' ? 'null' : $value;
-        }
-
-        $json = static::parseValue($value);
-
-        if ($key === 'class') {
-            return $json !== null && is_array($json)
-                ? implode(' ', $json)
-                : $this->getClassAttribute($value, $classesCheck);
-        }
-
-        return $this->getValueCode($escaped, $value, $valueCheck);
-    }
-
-    protected function escapeValueIfNeeded($value, $escaped, $valueCheck)
-    {
-        return is_null($valueCheck) && $escaped && !$this->keepNullAttributes
-            ? $this->escapeValue($value)
-            : $value;
-    }
-
-    protected function compileAttributeValue($key, $value, $attr, $valueCheck)
-    {
-        return $value === true || $attr['value'] === true
-            ? $this->getBooleanAttributeDisplayCode($key)
-            : ($value !== false && $attr['value'] !== false && $value !== 'null' && $value !== 'undefined'
-                ? $this->getAttributeDisplayCode(
-                    $key,
-                    $this->escapeValueIfNeeded($value, $attr['escaped'], $valueCheck),
-                    $valueCheck
-                )
-                : ''
-            );
-    }
-
-    protected function getAttributeCode($attr, &$classes, &$classesCheck)
-    {
-        $key = trim($attr['name']);
-
-        if ($key === '&attributes') {
-            return $this->getAndAttributeCode($attr, $classes, $classesCheck);
-        }
-
-        $valueCheck = null;
-        $value = trim($attr['value']);
-
-        $value = $this->getAttributeValue($attr['escaped'], $key, $value, $classesCheck, $valueCheck);
-
-        if ($key === 'class') {
-            if ($value !== 'false' && $value !== 'null' && $value !== 'undefined') {
-                array_push($classes, $value);
-            }
-
-            return '';
-        }
-
-        return $this->compileAttributeValue($key, $value, $attr, $valueCheck);
-    }
-
-    protected function getClassesCode(&$classes, &$classesCheck)
-    {
-        return trim($this->createCode(
-            '$__classes = implode(" ", ' .
-                'array_unique(explode(" ", (empty($__classes) ? "" : $__classes) . ' .
-                    var_export(implode(' ', $classes), true) . ' . ' .
-                    'implode(" ", array(' . implode(', ', $classesCheck) . ')) ' .
-                ')) ' .
-            ');'
-        ));
-    }
-
-    protected function getClassesDisplayCode()
-    {
-        return trim($this->createCode(
-            'if (!empty($__classes)) { ' .
-                '?> ' . (isset($this->options['classAttribute'])
-                    ? $this->options['classAttribute']
-                    : 'class'
-                ) . '=' . $this->quote . '<?php echo $__classes; ?>' . $this->quote . '<?php ' .
-            '} ' .
-            'unset($__classes); '
-        ));
-    }
-
-    /**
-     * @param array $attributes
-     */
-    protected function compileAttributes($attributes)
-    {
-        $items = '';
-        $classes = array();
-        $classesCheck = array();
-
-        foreach ($attributes as $attr) {
-            $items .= $this->getAttributeCode($attr, $classes, $classesCheck);
-        }
-
-        $items .= $this->getClassesCode($classes, $classesCheck);
-
-        $this->buffer($items, false);
-    }
+	protected function getAttributeDisplayCode($key, $value, $valueCheck)
+	{
+		if ($key === 'style') {
+			$value = preg_replace('/::get(Escaped|Unescaped)Value/', '::get$1Style', $value, 1);
+		}
+
+		return is_null($valueCheck)
+			? ' ' . $key . '=' . $this->quote . $value . $this->quote
+			: $this->createCode('if (true === ($__value = %1$s)) { ', $valueCheck)
+				. $this->getBooleanAttributeDisplayCode($key)
+				. $this->createCode('} else if (\\Jade\\Compiler::isDisplayable($__value)) { ')
+				. ' ' . $key . '=' . $this->quote . $value . $this->quote
+				. $this->createCode('}');
+	}
+
+	protected function getBooleanAttributeDisplayCode($key)
+	{
+		return ' ' . $key . ($this->terse
+			? ''
+			: '=' . $this->quote . $key . $this->quote
+		);
+	}
+
+	protected function getValueStatement($statements)
+	{
+		return is_string($statements[0])
+			? $statements[0]
+			: $statements[0][0];
+	}
+
+	protected function getAndAttributeCode($attr, &$classes, &$classesCheck)
+	{
+		$addClasses = '""';
+		if (count($classes) || count($classesCheck)) {
+			foreach ($classes as &$value) {
+				$value = var_export($value, true);
+			}
+			foreach ($classesCheck as $value) {
+				$statements = $this->createStatements($value);
+				$classes[] = $statements[0][0];
+			}
+			$addClasses = '" " . implode(" ", array(' . implode(', ', $classes) . '))';
+			$classes = array();
+			$classesCheck = array();
+		}
+		$value = empty($attr['value']) ? 'attributes' : $attr['value'];
+		$statements = $this->createStatements($value);
+
+		return $this->createCode(
+			'$__attributes = ' . $this->getValueStatement($statements) . ';' .
+			'if (is_array($__attributes)) { ' .
+				'$__attributes["class"] = trim(' .
+					'$__classes = (empty($__classes) ? "" : $__classes . " ") . ' .
+					'(isset($__attributes["class"]) ? (is_array($__attributes["class"]) ? implode(" ", $__attributes["class"]) : $__attributes["class"]) : "") . ' .
+					$addClasses .
+				'); ' .
+				'if (empty($__attributes["class"])) { ' .
+					'unset($__attributes["class"]); ' .
+				'} ' .
+			'} ' .
+			'\\Jade\\Compiler::displayAttributes($__attributes, ' . var_export($this->quote, true) . ', ' . var_export($this->terse, true) . ');');
+	}
+
+	protected function getClassAttribute($value, &$classesCheck)
+	{
+		$statements = $this->createStatements($value);
+		$value = is_array($statements[0]) ? $statements[0][0] : $statements[0];
+		$classesCheck[] = '(is_array($_a = ' . $value . ') ? implode(" ", $_a) : $_a)';
+
+		return $this->keepNullAttributes ? '' : 'null';
+	}
+
+	protected function getValueCode($escaped, $value, &$valueCheck)
+	{
+		if ($this->keepNullAttributes) {
+			return $this->escapeIfNeeded($escaped, $value);
+		}
+
+		$valueCheck = $value;
+
+		return $this->escapeIfNeeded($escaped, '$__value');
+	}
+
+	protected function getAttributeValue($escaped, $key, $value, &$classesCheck, &$valueCheck)
+	{
+		if ($this->isConstant($value)) {
+			$value = trim($value, ' \'"');
+
+			return $value === 'undefined' ? 'null' : $value;
+		}
+
+		$json = static::parseValue($value);
+
+		if ($key === 'class') {
+			return $json !== null && is_array($json)
+				? implode(' ', $json)
+				: $this->getClassAttribute($value, $classesCheck);
+		}
+
+		return $this->getValueCode($escaped, $value, $valueCheck);
+	}
+
+	protected function escapeValueIfNeeded($value, $escaped, $valueCheck)
+	{
+		return is_null($valueCheck) && $escaped && !$this->keepNullAttributes
+			? $this->escapeValue($value)
+			: $value;
+	}
+
+	protected function compileAttributeValue($key, $value, $attr, $valueCheck)
+	{
+		return $value === true || $attr['value'] === true
+			? $this->getBooleanAttributeDisplayCode($key)
+			: ($value !== false && $attr['value'] !== false && $value !== 'null' && $value !== 'undefined'
+				? $this->getAttributeDisplayCode(
+					$key,
+					$this->escapeValueIfNeeded($value, $attr['escaped'], $valueCheck),
+					$valueCheck
+				)
+				: ''
+			);
+	}
+
+	protected function getAttributeCode($attr, &$classes, &$classesCheck)
+	{
+		$key = trim($attr['name']);
+
+		if ($key === '&attributes') {
+			return $this->getAndAttributeCode($attr, $classes, $classesCheck);
+		}
+
+		$valueCheck = null;
+		$value = trim($attr['value']);
+
+		$value = $this->getAttributeValue($attr['escaped'], $key, $value, $classesCheck, $valueCheck);
+
+		if ($key === 'class') {
+			if ($value !== 'false' && $value !== 'null' && $value !== 'undefined') {
+				array_push($classes, $value);
+			}
+
+			return '';
+		}
+
+		return $this->compileAttributeValue($key, $value, $attr, $valueCheck);
+	}
+
+	protected function getClassesCode(&$classes, &$classesCheck)
+	{
+		return trim($this->createCode(
+			'$__classes = implode(" ", ' .
+				'array_unique(explode(" ", (empty($__classes) ? "" : $__classes) . ' .
+					var_export(implode(' ', $classes), true) . ' . ' .
+					'implode(" ", array(' . implode(', ', $classesCheck) . ')) ' .
+				')) ' .
+			');'
+		));
+	}
+
+	protected function getClassesDisplayCode()
+	{
+		return trim($this->createCode(
+			'if (!empty($__classes)) { ' .
+				'?> ' . (isset($this->options['classAttribute'])
+					? $this->options['classAttribute']
+					: 'class'
+				) . '=' . $this->quote . '<?php echo $__classes; ?>' . $this->quote . '<?php ' .
+			'} ' .
+			'unset($__classes); '
+		));
+	}
+
+	/**
+	 * @param array $attributes
+	 */
+	protected function compileAttributes($attributes)
+	{
+		$items = '';
+		$classes = array();
+		$classesCheck = array();
+
+		foreach ($attributes as $attr) {
+			$items .= $this->getAttributeCode($attr, $classes, $classesCheck);
+		}
+
+		$items .= $this->getClassesCode($classes, $classesCheck);
+
+		$this->buffer($items, false);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -11,19 +11,19 @@ 
         }
 
         return is_null($valueCheck)
-            ? ' ' . $key . '=' . $this->quote . $value . $this->quote
+            ? ' '.$key.'='.$this->quote.$value.$this->quote
             : $this->createCode('if (true === ($__value = %1$s)) { ', $valueCheck)
                 . $this->getBooleanAttributeDisplayCode($key)
                 . $this->createCode('} else if (\\Jade\\Compiler::isDisplayable($__value)) { ')
-                . ' ' . $key . '=' . $this->quote . $value . $this->quote
+                . ' '.$key.'='.$this->quote.$value.$this->quote
                 . $this->createCode('}');
     }
 
     protected function getBooleanAttributeDisplayCode($key)
     {
-        return ' ' . $key . ($this->terse
+        return ' '.$key.($this->terse
             ? ''
-            : '=' . $this->quote . $key . $this->quote
+            : '='.$this->quote.$key.$this->quote
         );
     }
 
@@ -45,7 +45,7 @@ 
                 $statements = $this->createStatements($value);
                 $classes[] = $statements[0][0];
             }
-            $addClasses = '" " . implode(" ", array(' . implode(', ', $classes) . '))';
+            $addClasses = '" " . implode(" ", array('.implode(', ', $classes).'))';
             $classes = array();
             $classesCheck = array();
         }
@@ -53,25 +53,25 @@ 
         $statements = $this->createStatements($value);
 
         return $this->createCode(
-            '$__attributes = ' . $this->getValueStatement($statements) . ';' .
-            'if (is_array($__attributes)) { ' .
-                '$__attributes["class"] = trim(' .
-                    '$__classes = (empty($__classes) ? "" : $__classes . " ") . ' .
-                    '(isset($__attributes["class"]) ? (is_array($__attributes["class"]) ? implode(" ", $__attributes["class"]) : $__attributes["class"]) : "") . ' .
-                    $addClasses .
-                '); ' .
-                'if (empty($__attributes["class"])) { ' .
-                    'unset($__attributes["class"]); ' .
-                '} ' .
-            '} ' .
-            '\\Jade\\Compiler::displayAttributes($__attributes, ' . var_export($this->quote, true) . ', ' . var_export($this->terse, true) . ');');
+            '$__attributes = '.$this->getValueStatement($statements).';'.
+            'if (is_array($__attributes)) { '.
+                '$__attributes["class"] = trim('.
+                    '$__classes = (empty($__classes) ? "" : $__classes . " ") . '.
+                    '(isset($__attributes["class"]) ? (is_array($__attributes["class"]) ? implode(" ", $__attributes["class"]) : $__attributes["class"]) : "") . '.
+                    $addClasses.
+                '); '.
+                'if (empty($__attributes["class"])) { '.
+                    'unset($__attributes["class"]); '.
+                '} '.
+            '} '.
+            '\\Jade\\Compiler::displayAttributes($__attributes, '.var_export($this->quote, true).', '.var_export($this->terse, true).');');
     }
 
     protected function getClassAttribute($value, &$classesCheck)
     {
         $statements = $this->createStatements($value);
         $value = is_array($statements[0]) ? $statements[0][0] : $statements[0];
-        $classesCheck[] = '(is_array($_a = ' . $value . ') ? implode(" ", $_a) : $_a)';
+        $classesCheck[] = '(is_array($_a = '.$value.') ? implode(" ", $_a) : $_a)';
 
         return $this->keepNullAttributes ? '' : 'null';
     }
@@ -154,11 +154,11 @@ 
     protected function getClassesCode(&$classes, &$classesCheck)
     {
         return trim($this->createCode(
-            '$__classes = implode(" ", ' .
-                'array_unique(explode(" ", (empty($__classes) ? "" : $__classes) . ' .
-                    var_export(implode(' ', $classes), true) . ' . ' .
-                    'implode(" ", array(' . implode(', ', $classesCheck) . ')) ' .
-                ')) ' .
+            '$__classes = implode(" ", '.
+                'array_unique(explode(" ", (empty($__classes) ? "" : $__classes) . '.
+                    var_export(implode(' ', $classes), true).' . '.
+                    'implode(" ", array('.implode(', ', $classesCheck).')) '.
+                ')) '.
             ');'
         ));
     }
@@ -166,12 +166,12 @@ 
     protected function getClassesDisplayCode()
     {
         return trim($this->createCode(
-            'if (!empty($__classes)) { ' .
-                '?> ' . (isset($this->options['classAttribute'])
+            'if (!empty($__classes)) { '.
+                '?> '.(isset($this->options['classAttribute'])
                     ? $this->options['classAttribute']
                     : 'class'
-                ) . '=' . $this->quote . '<?php echo $__classes; ?>' . $this->quote . '<?php ' .
-            '} ' .
+                ).'='.$this->quote.'<?php echo $__classes; ?>'.$this->quote.'<?php '.
+            '} '.
             'unset($__classes); '
         ));
     }

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

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,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 +159 added lines, -159 removed lines

@@ -7,163 +7,163 @@
 
 class CacheHelper
 {
-    protected $pug;
-
-    public function __construct(Jade $pug)
-    {
-        $this->pug = $pug;
-    }
-
-    /**
-     * Return a file path in the cache for a given name.
-     *
-     * @param string $name
-     *
-     * @return string
-     */
-    protected function getCachePath($name)
-    {
-        return str_replace('//', '/', $this->pug->getOption('cache') . '/' . $name) . '.php';
-    }
-
-    /**
-     * Return a hashed print from input file or content.
-     *
-     * @param string $input
-     *
-     * @return string
-     */
-    protected function hashPrint($input)
-    {
-        // Get the stronger hashing algorithm available to minimize collision risks
-        $algos = hash_algos();
-        $algo = $algos[0];
-        $number = 0;
-        foreach ($algos as $hashAlgorithm) {
-            if (strpos($hashAlgorithm, 'md') === 0) {
-                $hashNumber = substr($hashAlgorithm, 2);
-                if ($hashNumber > $number) {
-                    $number = $hashNumber;
-                    $algo = $hashAlgorithm;
-                }
-                continue;
-            }
-            if (strpos($hashAlgorithm, 'sha') === 0) {
-                $hashNumber = substr($hashAlgorithm, 3);
-                if ($hashNumber > $number) {
-                    $number = $hashNumber;
-                    $algo = $hashAlgorithm;
-                }
-                continue;
-            }
-        }
-
-        return rtrim(strtr(base64_encode(hash($algo, $input, true)), '+/', '-_'), '=');
-    }
-
-    /**
-     * Return true if the file or content is up to date in the cache folder,
-     * false else.
-     *
-     * @param string  $input file or pug code
-     * @param &string $path  to be filled
-     *
-     * @return bool
-     */
-    protected function isCacheUpToDate($input, &$path)
-    {
-        if (is_file($input)) {
-            $path = $this->getCachePath(
-                ($this->pug->getOption('keepBaseName') ? basename($input) : '') .
-                $this->hashPrint(realpath($input))
-            );
-
-            // Do not re-parse file if original is older
-            return (!$this->pug->getOption('upToDateCheck')) || (file_exists($path) && filemtime($input) < filemtime($path));
-        }
-
-        $path = $this->getCachePath($this->hashPrint($input));
-
-        // Do not re-parse file if the same hash exists
-        return file_exists($path);
-    }
-
-    protected function getCacheDirectory()
-    {
-        $cacheFolder = $this->pug->getOption('cache');
-
-        if (!is_dir($cacheFolder)) {
-            throw new \ErrorException($cacheFolder . ': Cache directory seem\'s to not exists', 5);
-        }
-
-        return $cacheFolder;
-    }
-
-    /**
-     * 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)
-    {
-        $cacheFolder = $this->getCacheDirectory();
-
-        if ($this->isCacheUpToDate($input, $path)) {
-            return $path;
-        }
-
-        if (!is_writable($cacheFolder)) {
-            throw new \ErrorException(sprintf('Cache directory must be writable. "%s" is not.', $cacheFolder), 6);
-        }
-
-        $rendered = $this->pug->compile($input);
-        file_put_contents($path, $rendered);
-
-        return $this->pug->stream($rendered);
-    }
-
-    /**
-     * 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)
-    {
-        $success = 0;
-        $errors = 0;
-
-        $extensions = new ExtensionsHelper($this->pug->getOption('extension'));
-
-        foreach (scandir($directory) as $object) {
-            if ($object === '.' || $object === '..') {
-                continue;
-            }
-            $input = $directory . DIRECTORY_SEPARATOR . $object;
-            if (is_dir($input)) {
-                list($subSuccess, $subErrors) = $this->cacheDirectory($input);
-                $success += $subSuccess;
-                $errors += $subErrors;
-                continue;
-            }
-            if ($extensions->hasValidTemplateExtension($object)) {
-                $this->isCacheUpToDate($input, $path);
-                try {
-                    file_put_contents($path, $this->pug->compile($input));
-                    $success++;
-                } catch (\Exception $e) {
-                    $errors++;
-                }
-            }
-        }
-
-        return array($success, $errors);
-    }
+	protected $pug;
+
+	public function __construct(Jade $pug)
+	{
+		$this->pug = $pug;
+	}
+
+	/**
+	 * Return a file path in the cache for a given name.
+	 *
+	 * @param string $name
+	 *
+	 * @return string
+	 */
+	protected function getCachePath($name)
+	{
+		return str_replace('//', '/', $this->pug->getOption('cache') . '/' . $name) . '.php';
+	}
+
+	/**
+	 * Return a hashed print from input file or content.
+	 *
+	 * @param string $input
+	 *
+	 * @return string
+	 */
+	protected function hashPrint($input)
+	{
+		// Get the stronger hashing algorithm available to minimize collision risks
+		$algos = hash_algos();
+		$algo = $algos[0];
+		$number = 0;
+		foreach ($algos as $hashAlgorithm) {
+			if (strpos($hashAlgorithm, 'md') === 0) {
+				$hashNumber = substr($hashAlgorithm, 2);
+				if ($hashNumber > $number) {
+					$number = $hashNumber;
+					$algo = $hashAlgorithm;
+				}
+				continue;
+			}
+			if (strpos($hashAlgorithm, 'sha') === 0) {
+				$hashNumber = substr($hashAlgorithm, 3);
+				if ($hashNumber > $number) {
+					$number = $hashNumber;
+					$algo = $hashAlgorithm;
+				}
+				continue;
+			}
+		}
+
+		return rtrim(strtr(base64_encode(hash($algo, $input, true)), '+/', '-_'), '=');
+	}
+
+	/**
+	 * Return true if the file or content is up to date in the cache folder,
+	 * false else.
+	 *
+	 * @param string  $input file or pug code
+	 * @param &string $path  to be filled
+	 *
+	 * @return bool
+	 */
+	protected function isCacheUpToDate($input, &$path)
+	{
+		if (is_file($input)) {
+			$path = $this->getCachePath(
+				($this->pug->getOption('keepBaseName') ? basename($input) : '') .
+				$this->hashPrint(realpath($input))
+			);
+
+			// Do not re-parse file if original is older
+			return (!$this->pug->getOption('upToDateCheck')) || (file_exists($path) && filemtime($input) < filemtime($path));
+		}
+
+		$path = $this->getCachePath($this->hashPrint($input));
+
+		// Do not re-parse file if the same hash exists
+		return file_exists($path);
+	}
+
+	protected function getCacheDirectory()
+	{
+		$cacheFolder = $this->pug->getOption('cache');
+
+		if (!is_dir($cacheFolder)) {
+			throw new \ErrorException($cacheFolder . ': Cache directory seem\'s to not exists', 5);
+		}
+
+		return $cacheFolder;
+	}
+
+	/**
+	 * 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)
+	{
+		$cacheFolder = $this->getCacheDirectory();
+
+		if ($this->isCacheUpToDate($input, $path)) {
+			return $path;
+		}
+
+		if (!is_writable($cacheFolder)) {
+			throw new \ErrorException(sprintf('Cache directory must be writable. "%s" is not.', $cacheFolder), 6);
+		}
+
+		$rendered = $this->pug->compile($input);
+		file_put_contents($path, $rendered);
+
+		return $this->pug->stream($rendered);
+	}
+
+	/**
+	 * 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)
+	{
+		$success = 0;
+		$errors = 0;
+
+		$extensions = new ExtensionsHelper($this->pug->getOption('extension'));
+
+		foreach (scandir($directory) as $object) {
+			if ($object === '.' || $object === '..') {
+				continue;
+			}
+			$input = $directory . DIRECTORY_SEPARATOR . $object;
+			if (is_dir($input)) {
+				list($subSuccess, $subErrors) = $this->cacheDirectory($input);
+				$success += $subSuccess;
+				$errors += $subErrors;
+				continue;
+			}
+			if ($extensions->hasValidTemplateExtension($object)) {
+				$this->isCacheUpToDate($input, $path);
+				try {
+					file_put_contents($path, $this->pug->compile($input));
+					$success++;
+				} catch (\Exception $e) {
+					$errors++;
+				}
+			}
+		}
+
+		return array($success, $errors);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
      */
     protected function getCachePath($name)
     {
-        return str_replace('//', '/', $this->pug->getOption('cache') . '/' . $name) . '.php';
+        return str_replace('//', '/', $this->pug->getOption('cache').'/'.$name).'.php';
     }
 
     /**
@@ -74,7 +74,7 @@ 
     {
         if (is_file($input)) {
             $path = $this->getCachePath(
-                ($this->pug->getOption('keepBaseName') ? basename($input) : '') .
+                ($this->pug->getOption('keepBaseName') ? basename($input) : '').
                 $this->hashPrint(realpath($input))
             );
 
@@ -93,7 +93,7 @@ 
         $cacheFolder = $this->pug->getOption('cache');
 
         if (!is_dir($cacheFolder)) {
-            throw new \ErrorException($cacheFolder . ': Cache directory seem\'s to not exists', 5);
+            throw new \ErrorException($cacheFolder.': Cache directory seem\'s to not exists', 5);
         }
 
         return $cacheFolder;
@@ -146,7 +146,7 @@ 
             if ($object === '.' || $object === '..') {
                 continue;
             }
-            $input = $directory . DIRECTORY_SEPARATOR . $object;
+            $input = $directory.DIRECTORY_SEPARATOR.$object;
             if (is_dir($input)) {
                 list($subSuccess, $subErrors) = $this->cacheDirectory($input);
                 $success += $subSuccess;

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

Doc Comments +10 added lines

@@ -26,6 +26,10 @@ 
         $this->separators = array();
     }
 
+    /**
+     * @param string $input
+     * @param string $name
+     */
     public function innerCode($input, $name)
     {
         $handler = new static($input, $name);
@@ -119,6 +123,9 @@ 
         $consume($argument, $match[0]);
     }
 
+    /**
+     * @param string[] $match
+     */
     protected function parseArrayElement(&$argument, $match, $consume, &$quote, &$key, &$value)
     {
         switch ($match[2]) {
@@ -171,6 +178,9 @@ 
         return $handleRecursion(array($sep, end($separators)));
     }
 
+    /**
+     * @param SubCodeHandler $subCodeHandler
+     */
     protected function parseSeparator($sep, &$separators, &$result, &$varname, $subCodeHandler, $innerName)
     {
         $handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);

Indentation +229 added lines, -229 removed lines

@@ -7,178 +7,178 @@ 
  */
 class CodeHandler extends CompilerUtils
 {
-    protected $input;
-    protected $name;
-    protected $separators;
-
-    public function __construct($input, $name)
-    {
-        if (!is_string($input)) {
-            throw new \InvalidArgumentException('Expecting a string of PHP, got: ' . gettype($input), 11);
-        }
-
-        if (strlen($input) === 0) {
-            throw new \InvalidArgumentException('Expecting a string of PHP, empty string received.', 12);
-        }
-
-        $this->input = trim(preg_replace('/\bvar\b/', '', $input));
-        $this->name = $name;
-        $this->separators = array();
-    }
-
-    public function innerCode($input, $name)
-    {
-        $handler = new static($input, $name);
-
-        return $handler->parse();
-    }
-
-    public function parse()
-    {
-        if ($this->isQuotedString()) {
-            return array($this->input);
-        }
-
-        if (strpos('=,;?', substr($this->input, 0, 1)) !== false) {
-            throw new \ErrorException('Expecting a variable name or an expression, got: ' . $this->input, 13);
-        }
-
-        preg_match_all(
-            '/(?<![<>=!])=(?!>|=)|[\[\]\{\}\(\),;\.]|(?!:):|->/', // punctuation
-            preg_replace_callback('/[a-zA-Z0-9\\\\_\\x7f-\\xff]*\((?:[0-9\/%\.\s*+-]++|(?R))*+\)/', function ($match) {
-                // no need to keep separators in simple PHP expressions (functions calls, parentheses, calculs)
-                return str_repeat(' ', strlen($match[0]));
-            }, preg_replace_callback('/([\'"]).*?(?<!\\\\)(?:\\\\{2})*\\1/', function ($match) {
-                // do not take separators in strings
-                return str_repeat(' ', strlen($match[0]));
-            }, $this->input)),
-            $separators,
-            PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
-        );
-
-        $this->separators = $separators[0];
-
-        if (count($this->separators) === 0) {
-            if (strstr('0123456789-+("\'$', substr($this->input, 0, 1)) === false) {
-                $this->input = static::addDollarIfNeeded($this->input);
-            }
-
-            return array($this->input);
-        }
-
-        // add a pseudo separator for the end of the input
-        array_push($this->separators, array(null, strlen($this->input)));
-
-        return $this->parseBetweenSeparators();
-    }
-
-    protected function isQuotedString()
-    {
-        $firstChar = substr($this->input, 0, 1);
-        $lastChar = substr($this->input, -1);
-
-        return false !== strpos('"\'', $firstChar) && $lastChar === $firstChar;
-    }
-
-    protected function getVarname($separator)
-    {
-        // do not add $ if it is not like a variable
-        $varname = static::convertVarPath(substr($this->input, 0, $separator[1]), '/^%s/');
-
-        return $separator[0] !== '(' && $varname !== '' && strstr('0123456789-+("\'$', substr($varname, 0, 1)) === false
-            ? static::addDollarIfNeeded($varname)
-            : $varname;
-    }
-
-    protected function parseArrayString(&$argument, $match, $consume, &$quote, &$key, &$value)
-    {
-        $quote = $quote
-            ? CommonUtils::escapedEnd($match[1])
-                ? $quote
-                : null
-            : $match[2];
-        ${is_null($value) ? 'key' : 'value'} .= $match[0];
-        $consume($argument, $match[0]);
-    }
-
-    protected function parseArrayAssign(&$argument, $match, $consume, &$quote, &$key, &$value)
-    {
-        if ($quote) {
-            ${is_null($value) ? 'key' : 'value'} .= $match[0];
-            $consume($argument, $match[0]);
-
-            return;
-        }
-
-        if (!is_null($value)) {
-            throw new \ErrorException('Parse error on ' . substr($argument, strlen($match[1])), 15);
-        }
-
-        $key .= $match[1];
-        $value = '';
-        $consume($argument, $match[0]);
-    }
-
-    protected function parseArrayElement(&$argument, $match, $consume, &$quote, &$key, &$value)
-    {
-        switch ($match[2]) {
-            case '"':
-            case "'":
-                $this->parseArrayString($argument, $match, $consume, $quote, $key, $value);
-                break;
-            case ':':
-            case '=>':
-                $this->parseArrayAssign($argument, $match, $consume, $quote, $key, $value);
-                break;
-            case ',':
-                ${is_null($value) ? 'key' : 'value'} .= $match[0];
-                $consume($argument, $match[0]);
-                break;
-        }
-    }
-
-    protected function parseArray($input, $subCodeHandler)
-    {
-        $output = array();
-        $key = '';
-        $value = null;
-        $addToOutput = $subCodeHandler->addToOutput($output, $key, $value);
-        $consume = $subCodeHandler->consume();
-        foreach ($input as $argument) {
-            $argument = ltrim($argument, '$');
-            $quote = null;
-            while (preg_match('/^(.*?)(=>|[\'",:])/', $argument, $match)) {
-                $this->parseArrayElement($argument, $match, $consume, $quote, $key, $value);
-            }
-            ${is_null($value) ? 'key' : 'value'} .= $argument;
-            $addToOutput();
-        }
-
-        return 'array(' . implode(', ', $output) . ')';
-    }
-
-    protected function parseEqual($sep, &$separators, &$result, $innerName, $subCodeHandler)
-    {
-        if (preg_match('/^[[:space:]]*$/', $innerName)) {
-            next($separators);
-            $handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);
-
-            return implode($handleCodeInbetween());
-        }
-
-        $handleRecursion = $subCodeHandler->handleRecursion($result);
-
-        return $handleRecursion(array($sep, end($separators)));
-    }
-
-    protected function parseSeparator($sep, &$separators, &$result, &$varname, $subCodeHandler, $innerName)
-    {
-        $handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);
-        $var = '$__' . $this->name;
-
-        switch ($sep[0]) {
-            // translate the javascript's obj.attr into php's obj->attr or obj['attr']
-            /*
+	protected $input;
+	protected $name;
+	protected $separators;
+
+	public function __construct($input, $name)
+	{
+		if (!is_string($input)) {
+			throw new \InvalidArgumentException('Expecting a string of PHP, got: ' . gettype($input), 11);
+		}
+
+		if (strlen($input) === 0) {
+			throw new \InvalidArgumentException('Expecting a string of PHP, empty string received.', 12);
+		}
+
+		$this->input = trim(preg_replace('/\bvar\b/', '', $input));
+		$this->name = $name;
+		$this->separators = array();
+	}
+
+	public function innerCode($input, $name)
+	{
+		$handler = new static($input, $name);
+
+		return $handler->parse();
+	}
+
+	public function parse()
+	{
+		if ($this->isQuotedString()) {
+			return array($this->input);
+		}
+
+		if (strpos('=,;?', substr($this->input, 0, 1)) !== false) {
+			throw new \ErrorException('Expecting a variable name or an expression, got: ' . $this->input, 13);
+		}
+
+		preg_match_all(
+			'/(?<![<>=!])=(?!>|=)|[\[\]\{\}\(\),;\.]|(?!:):|->/', // punctuation
+			preg_replace_callback('/[a-zA-Z0-9\\\\_\\x7f-\\xff]*\((?:[0-9\/%\.\s*+-]++|(?R))*+\)/', function ($match) {
+				// no need to keep separators in simple PHP expressions (functions calls, parentheses, calculs)
+				return str_repeat(' ', strlen($match[0]));
+			}, preg_replace_callback('/([\'"]).*?(?<!\\\\)(?:\\\\{2})*\\1/', function ($match) {
+				// do not take separators in strings
+				return str_repeat(' ', strlen($match[0]));
+			}, $this->input)),
+			$separators,
+			PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
+		);
+
+		$this->separators = $separators[0];
+
+		if (count($this->separators) === 0) {
+			if (strstr('0123456789-+("\'$', substr($this->input, 0, 1)) === false) {
+				$this->input = static::addDollarIfNeeded($this->input);
+			}
+
+			return array($this->input);
+		}
+
+		// add a pseudo separator for the end of the input
+		array_push($this->separators, array(null, strlen($this->input)));
+
+		return $this->parseBetweenSeparators();
+	}
+
+	protected function isQuotedString()
+	{
+		$firstChar = substr($this->input, 0, 1);
+		$lastChar = substr($this->input, -1);
+
+		return false !== strpos('"\'', $firstChar) && $lastChar === $firstChar;
+	}
+
+	protected function getVarname($separator)
+	{
+		// do not add $ if it is not like a variable
+		$varname = static::convertVarPath(substr($this->input, 0, $separator[1]), '/^%s/');
+
+		return $separator[0] !== '(' && $varname !== '' && strstr('0123456789-+("\'$', substr($varname, 0, 1)) === false
+			? static::addDollarIfNeeded($varname)
+			: $varname;
+	}
+
+	protected function parseArrayString(&$argument, $match, $consume, &$quote, &$key, &$value)
+	{
+		$quote = $quote
+			? CommonUtils::escapedEnd($match[1])
+				? $quote
+				: null
+			: $match[2];
+		${is_null($value) ? 'key' : 'value'} .= $match[0];
+		$consume($argument, $match[0]);
+	}
+
+	protected function parseArrayAssign(&$argument, $match, $consume, &$quote, &$key, &$value)
+	{
+		if ($quote) {
+			${is_null($value) ? 'key' : 'value'} .= $match[0];
+			$consume($argument, $match[0]);
+
+			return;
+		}
+
+		if (!is_null($value)) {
+			throw new \ErrorException('Parse error on ' . substr($argument, strlen($match[1])), 15);
+		}
+
+		$key .= $match[1];
+		$value = '';
+		$consume($argument, $match[0]);
+	}
+
+	protected function parseArrayElement(&$argument, $match, $consume, &$quote, &$key, &$value)
+	{
+		switch ($match[2]) {
+			case '"':
+			case "'":
+				$this->parseArrayString($argument, $match, $consume, $quote, $key, $value);
+				break;
+			case ':':
+			case '=>':
+				$this->parseArrayAssign($argument, $match, $consume, $quote, $key, $value);
+				break;
+			case ',':
+				${is_null($value) ? 'key' : 'value'} .= $match[0];
+				$consume($argument, $match[0]);
+				break;
+		}
+	}
+
+	protected function parseArray($input, $subCodeHandler)
+	{
+		$output = array();
+		$key = '';
+		$value = null;
+		$addToOutput = $subCodeHandler->addToOutput($output, $key, $value);
+		$consume = $subCodeHandler->consume();
+		foreach ($input as $argument) {
+			$argument = ltrim($argument, '$');
+			$quote = null;
+			while (preg_match('/^(.*?)(=>|[\'",:])/', $argument, $match)) {
+				$this->parseArrayElement($argument, $match, $consume, $quote, $key, $value);
+			}
+			${is_null($value) ? 'key' : 'value'} .= $argument;
+			$addToOutput();
+		}
+
+		return 'array(' . implode(', ', $output) . ')';
+	}
+
+	protected function parseEqual($sep, &$separators, &$result, $innerName, $subCodeHandler)
+	{
+		if (preg_match('/^[[:space:]]*$/', $innerName)) {
+			next($separators);
+			$handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);
+
+			return implode($handleCodeInbetween());
+		}
+
+		$handleRecursion = $subCodeHandler->handleRecursion($result);
+
+		return $handleRecursion(array($sep, end($separators)));
+	}
+
+	protected function parseSeparator($sep, &$separators, &$result, &$varname, $subCodeHandler, $innerName)
+	{
+		$handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);
+		$var = '$__' . $this->name;
+
+		switch ($sep[0]) {
+			// translate the javascript's obj.attr into php's obj->attr or obj['attr']
+			/*
             case '.':
                 $result[] = sprintf("%s=is_array(%s)?%s['%s']:%s->%s",
                     $var, $varname, $varname, $innerName, $varname, $innerName
@@ -187,61 +187,61 @@ 
                 break;
             //*/
 
-            // funcall
-            case '(':
-                $arguments = $handleCodeInbetween();
-                $call = $varname . '(' . implode(', ', $arguments) . ')';
-                $call = static::addDollarIfNeeded($call);
-                $varname = $var;
-                array_push($result, "{$var}={$call}");
-                break;
-
-            case '[':
-                if (preg_match('/[a-zA-Z0-9\\\\_\\x7f-\\xff]$/', $varname)) {
-                    $varname .= $sep[0] . $innerName;
-                    break;
-                }
-            case '{':
-                $varname .= $this->parseArray($handleCodeInbetween(), $subCodeHandler);
-                break;
-
-            case '=':
-                $varname .= '=' . $this->parseEqual($sep, $separators, $result, $innerName, $subCodeHandler);
-                break;
-
-            default:
-                if (($innerName !== false && $innerName !== '') || $sep[0] !== ')') {
-                    $varname .= $sep[0] . $innerName;
-                }
-                break;
-        }
-    }
-
-    protected function parseBetweenSeparators()
-    {
-        $separators = $this->separators;
-
-        $result = array();
-
-        $varname = $this->getVarname($separators[0]);
-
-        $subCodeHandler = new SubCodeHandler($this, $this->input, $this->name);
-        $getMiddleString = $subCodeHandler->getMiddleString();
-        $getNext = $subCodeHandler->getNext($separators);
-
-        // using next() ourselves so that we can advance the array pointer inside inner loops
-        while (($sep = current($separators)) && $sep[0] !== null) {
-            // $sep[0] - the separator string due to PREG_SPLIT_OFFSET_CAPTURE flag or null if end of string
-            // $sep[1] - the offset due to PREG_SPLIT_OFFSET_CAPTURE
-
-            $innerName = $getMiddleString($sep, $getNext(key($separators)));
-
-            $this->parseSeparator($sep, $separators, $result, $varname, $subCodeHandler, $innerName);
-
-            next($separators);
-        }
-        array_push($result, $varname);
-
-        return $result;
-    }
+			// funcall
+			case '(':
+				$arguments = $handleCodeInbetween();
+				$call = $varname . '(' . implode(', ', $arguments) . ')';
+				$call = static::addDollarIfNeeded($call);
+				$varname = $var;
+				array_push($result, "{$var}={$call}");
+				break;
+
+			case '[':
+				if (preg_match('/[a-zA-Z0-9\\\\_\\x7f-\\xff]$/', $varname)) {
+					$varname .= $sep[0] . $innerName;
+					break;
+				}
+			case '{':
+				$varname .= $this->parseArray($handleCodeInbetween(), $subCodeHandler);
+				break;
+
+			case '=':
+				$varname .= '=' . $this->parseEqual($sep, $separators, $result, $innerName, $subCodeHandler);
+				break;
+
+			default:
+				if (($innerName !== false && $innerName !== '') || $sep[0] !== ')') {
+					$varname .= $sep[0] . $innerName;
+				}
+				break;
+		}
+	}
+
+	protected function parseBetweenSeparators()
+	{
+		$separators = $this->separators;
+
+		$result = array();
+
+		$varname = $this->getVarname($separators[0]);
+
+		$subCodeHandler = new SubCodeHandler($this, $this->input, $this->name);
+		$getMiddleString = $subCodeHandler->getMiddleString();
+		$getNext = $subCodeHandler->getNext($separators);
+
+		// using next() ourselves so that we can advance the array pointer inside inner loops
+		while (($sep = current($separators)) && $sep[0] !== null) {
+			// $sep[0] - the separator string due to PREG_SPLIT_OFFSET_CAPTURE flag or null if end of string
+			// $sep[1] - the offset due to PREG_SPLIT_OFFSET_CAPTURE
+
+			$innerName = $getMiddleString($sep, $getNext(key($separators)));
+
+			$this->parseSeparator($sep, $separators, $result, $varname, $subCodeHandler, $innerName);
+
+			next($separators);
+		}
+		array_push($result, $varname);
+
+		return $result;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
     public function __construct($input, $name)
     {
         if (!is_string($input)) {
-            throw new \InvalidArgumentException('Expecting a string of PHP, got: ' . gettype($input), 11);
+            throw new \InvalidArgumentException('Expecting a string of PHP, got: '.gettype($input), 11);
         }
 
         if (strlen($input) === 0) {
@@ -40,15 +40,15 @@ 
         }
 
         if (strpos('=,;?', substr($this->input, 0, 1)) !== false) {
-            throw new \ErrorException('Expecting a variable name or an expression, got: ' . $this->input, 13);
+            throw new \ErrorException('Expecting a variable name or an expression, got: '.$this->input, 13);
         }
 
         preg_match_all(
             '/(?<![<>=!])=(?!>|=)|[\[\]\{\}\(\),;\.]|(?!:):|->/', // punctuation
-            preg_replace_callback('/[a-zA-Z0-9\\\\_\\x7f-\\xff]*\((?:[0-9\/%\.\s*+-]++|(?R))*+\)/', function ($match) {
+            preg_replace_callback('/[a-zA-Z0-9\\\\_\\x7f-\\xff]*\((?:[0-9\/%\.\s*+-]++|(?R))*+\)/', function($match) {
                 // no need to keep separators in simple PHP expressions (functions calls, parentheses, calculs)
                 return str_repeat(' ', strlen($match[0]));
-            }, preg_replace_callback('/([\'"]).*?(?<!\\\\)(?:\\\\{2})*\\1/', function ($match) {
+            }, preg_replace_callback('/([\'"]).*?(?<!\\\\)(?:\\\\{2})*\\1/', function($match) {
                 // do not take separators in strings
                 return str_repeat(' ', strlen($match[0]));
             }, $this->input)),
@@ -111,7 +111,7 @@ 
         }
 
         if (!is_null($value)) {
-            throw new \ErrorException('Parse error on ' . substr($argument, strlen($match[1])), 15);
+            throw new \ErrorException('Parse error on '.substr($argument, strlen($match[1])), 15);
         }
 
         $key .= $match[1];
@@ -154,7 +154,7 @@ 
             $addToOutput();
         }
 
-        return 'array(' . implode(', ', $output) . ')';
+        return 'array('.implode(', ', $output).')';
     }
 
     protected function parseEqual($sep, &$separators, &$result, $innerName, $subCodeHandler)
@@ -174,7 +174,7 @@ 
     protected function parseSeparator($sep, &$separators, &$result, &$varname, $subCodeHandler, $innerName)
     {
         $handleCodeInbetween = $subCodeHandler->handleCodeInbetween($separators, $result);
-        $var = '$__' . $this->name;
+        $var = '$__'.$this->name;
 
         switch ($sep[0]) {
             // translate the javascript's obj.attr into php's obj->attr or obj['attr']
@@ -190,7 +190,7 @@ 
             // funcall
             case '(':
                 $arguments = $handleCodeInbetween();
-                $call = $varname . '(' . implode(', ', $arguments) . ')';
+                $call = $varname.'('.implode(', ', $arguments).')';
                 $call = static::addDollarIfNeeded($call);
                 $varname = $var;
                 array_push($result, "{$var}={$call}");
@@ -198,7 +198,7 @@ 
 
             case '[':
                 if (preg_match('/[a-zA-Z0-9\\\\_\\x7f-\\xff]$/', $varname)) {
-                    $varname .= $sep[0] . $innerName;
+                    $varname .= $sep[0].$innerName;
                     break;
                 }
             case '{':
@@ -206,12 +206,12 @@ 
                 break;
 
             case '=':
-                $varname .= '=' . $this->parseEqual($sep, $separators, $result, $innerName, $subCodeHandler);
+                $varname .= '='.$this->parseEqual($sep, $separators, $result, $innerName, $subCodeHandler);
                 break;
 
             default:
                 if (($innerName !== false && $innerName !== '') || $sep[0] !== ')') {
-                    $varname .= $sep[0] . $innerName;
+                    $varname .= $sep[0].$innerName;
                 }
                 break;
         }

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

Doc Comments +2 added lines, -3 removed lines

@@ -7,7 +7,6 @@ 
 abstract class CodeVisitor extends TagVisitor
 {
     /**
-     * @param Nodes\Code $node
      */
     protected function visitCodeConditional(array $matches)
     {
@@ -44,7 +43,7 @@ 
     }
 
     /**
-     * @param Nodes\Code $node
+     * @param Code $node
      */
     protected function visitCodeOpening(Code $node)
     {
@@ -68,7 +67,7 @@ 
     }
 
     /**
-     * @param Nodes\Code $node
+     * @param Code $node
      */
     protected function visitCode(Code $node)
     {

Indentation +78 added lines, -78 removed lines

@@ -6,82 +6,82 @@
 
 abstract class CodeVisitor extends TagVisitor
 {
-    /**
-     * @param Nodes\Code $node
-     */
-    protected function visitCodeConditional(array $matches)
-    {
-        $code = trim($matches[2], '; ');
-        while (($len = strlen($code)) > 1 && ($code[0] === '(' || $code[0] === '{') && ord($code[0]) === ord(substr($code, -1)) - 1) {
-            $code = trim(substr($code, 1, $len - 2));
-        }
-
-        $index = count($this->buffer) - 1;
-        $conditional = '';
-
-        if (isset($this->buffer[$index]) && false !== strpos($this->buffer[$index], $this->createCode('}'))) {
-            // the "else" statement needs to be in the php block that closes the if
-            $this->buffer[$index] = null;
-            $conditional .= '} ';
-        }
-
-        $conditional .= '%s';
-
-        if (strlen($code) > 0) {
-            $conditional .= '(%s) {';
-            $conditional = $matches[1] === 'unless'
-                ? sprintf($conditional, 'if', '!(%s)')
-                : sprintf($conditional, $matches[1], '%s');
-            $this->buffer($this->createCode($conditional, $code));
-
-            return;
-        }
-
-        $conditional .= ' {';
-        $conditional = sprintf($conditional, $matches[1]);
-
-        $this->buffer($this->createCode($conditional));
-    }
-
-    /**
-     * @param Nodes\Code $node
-     */
-    protected function visitCodeOpening(Code $node)
-    {
-        $code = trim($node->value);
-
-        if ($node->buffer) {
-            $this->buffer($this->escapeIfNeeded($node->escape, $code));
-
-            return;
-        }
-
-        $phpOpen = implode('|', $this->phpOpenBlock);
-
-        if (preg_match("/^[[:space:]]*({$phpOpen})(.*)/", $code, $matches)) {
-            $this->visitCodeConditional($matches);
-
-            return;
-        }
-
-        $this->buffer($this->createCode('%s', $code));
-    }
-
-    /**
-     * @param Nodes\Code $node
-     */
-    protected function visitCode(Code $node)
-    {
-        $this->visitCodeOpening($node);
-
-        if (isset($node->block)) {
-            $this->indents++;
-            $this->visit($node->block);
-            $this->indents--;
-
-            if (!$node->buffer) {
-                $this->buffer($this->createCode('}'));
-            }
-        }
-    }
+	/**
+	 * @param Nodes\Code $node
+	 */
+	protected function visitCodeConditional(array $matches)
+	{
+		$code = trim($matches[2], '; ');
+		while (($len = strlen($code)) > 1 && ($code[0] === '(' || $code[0] === '{') && ord($code[0]) === ord(substr($code, -1)) - 1) {
+			$code = trim(substr($code, 1, $len - 2));
+		}
+
+		$index = count($this->buffer) - 1;
+		$conditional = '';
+
+		if (isset($this->buffer[$index]) && false !== strpos($this->buffer[$index], $this->createCode('}'))) {
+			// the "else" statement needs to be in the php block that closes the if
+			$this->buffer[$index] = null;
+			$conditional .= '} ';
+		}
+
+		$conditional .= '%s';
+
+		if (strlen($code) > 0) {
+			$conditional .= '(%s) {';
+			$conditional = $matches[1] === 'unless'
+				? sprintf($conditional, 'if', '!(%s)')
+				: sprintf($conditional, $matches[1], '%s');
+			$this->buffer($this->createCode($conditional, $code));
+
+			return;
+		}
+
+		$conditional .= ' {';
+		$conditional = sprintf($conditional, $matches[1]);
+
+		$this->buffer($this->createCode($conditional));
+	}
+
+	/**
+	 * @param Nodes\Code $node
+	 */
+	protected function visitCodeOpening(Code $node)
+	{
+		$code = trim($node->value);
+
+		if ($node->buffer) {
+			$this->buffer($this->escapeIfNeeded($node->escape, $code));
+
+			return;
+		}
+
+		$phpOpen = implode('|', $this->phpOpenBlock);
+
+		if (preg_match("/^[[:space:]]*({$phpOpen})(.*)/", $code, $matches)) {
+			$this->visitCodeConditional($matches);
+
+			return;
+		}
+
+		$this->buffer($this->createCode('%s', $code));
+	}
+
+	/**
+	 * @param Nodes\Code $node
+	 */
+	protected function visitCode(Code $node)
+	{
+		$this->visitCodeOpening($node);
+
+		if (isset($node->block)) {
+			$this->indents++;
+			$this->visit($node->block);
+			$this->indents--;
+
+			if (!$node->buffer) {
+				$this->buffer($this->createCode('}'));
+			}
+		}
+	}
 }

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

Doc Comments -2 removed lines

@@ -56,8 +56,6 @@
      * Return true if the ending quote of the string is escaped.
      *
      * @param object|array $anything    object or array (PHP >= 7) that contains a callable
-     * @param string|int   $key|$method key or method name
-     * @param bool         $isMethod    true if the second argument is a method
      *
      * @return string
      */

Indentation +56 added lines, -56 removed lines

@@ -8,64 +8,64 @@
  */
 class CommonUtils
 {
-    /**
-     * @param string $call
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return string
-     */
-    public static function addDollarIfNeeded($call)
-    {
-        if ($call === 'Inf') {
-            throw new \InvalidArgumentException($call . ' cannot be read from PHP', 16);
-        }
-        if ($call === 'undefined') {
-            return 'null';
-        }
-        $firstChar = substr($call, 0, 1);
-        if (
-            !in_array($firstChar, array('$', '\\')) &&
-            !preg_match('#^(?:' . CompilerConfig::VARNAME . '\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call) &&
-            (
-                preg_match('#^' . CompilerConfig::VARNAME . '#', $call) ||
-                $firstChar === '_'
-            )
-        ) {
-            $call = '$' . $call;
-        }
+	/**
+	 * @param string $call
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return string
+	 */
+	public static function addDollarIfNeeded($call)
+	{
+		if ($call === 'Inf') {
+			throw new \InvalidArgumentException($call . ' cannot be read from PHP', 16);
+		}
+		if ($call === 'undefined') {
+			return 'null';
+		}
+		$firstChar = substr($call, 0, 1);
+		if (
+			!in_array($firstChar, array('$', '\\')) &&
+			!preg_match('#^(?:' . CompilerConfig::VARNAME . '\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call) &&
+			(
+				preg_match('#^' . CompilerConfig::VARNAME . '#', $call) ||
+				$firstChar === '_'
+			)
+		) {
+			$call = '$' . $call;
+		}
 
-        return $call;
-    }
+		return $call;
+	}
 
-    /**
-     * Return true if the ending quote of the string is escaped.
-     *
-     * @param string $quotedString
-     *
-     * @return bool
-     */
-    public static function escapedEnd($quotedString)
-    {
-        $end = substr($quotedString, strlen(rtrim($quotedString, '\\')));
+	/**
+	 * Return true if the ending quote of the string is escaped.
+	 *
+	 * @param string $quotedString
+	 *
+	 * @return bool
+	 */
+	public static function escapedEnd($quotedString)
+	{
+		$end = substr($quotedString, strlen(rtrim($quotedString, '\\')));
 
-        return substr($end, 0, 1) === '\\' && strlen($end) & 1;
-    }
+		return substr($end, 0, 1) === '\\' && strlen($end) & 1;
+	}
 
-    /**
-     * Return true if the ending quote of the string is escaped.
-     *
-     * @param object|array $anything    object or array (PHP >= 7) that contains a callable
-     * @param string|int   $key|$method key or method name
-     * @param bool         $isMethod    true if the second argument is a method
-     *
-     * @return string
-     */
-    public static function getGetter($anything, $key)
-    {
-        return '\\Jade\\Compiler::getPropertyFromAnything(' .
-                static::addDollarIfNeeded($anything) . ', ' .
-                var_export($key, true) .
-            ')';
-    }
+	/**
+	 * Return true if the ending quote of the string is escaped.
+	 *
+	 * @param object|array $anything    object or array (PHP >= 7) that contains a callable
+	 * @param string|int   $key|$method key or method name
+	 * @param bool         $isMethod    true if the second argument is a method
+	 *
+	 * @return string
+	 */
+	public static function getGetter($anything, $key)
+	{
+		return '\\Jade\\Compiler::getPropertyFromAnything(' .
+				static::addDollarIfNeeded($anything) . ', ' .
+				var_export($key, true) .
+			')';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
     public static function addDollarIfNeeded($call)
     {
         if ($call === 'Inf') {
-            throw new \InvalidArgumentException($call . ' cannot be read from PHP', 16);
+            throw new \InvalidArgumentException($call.' cannot be read from PHP', 16);
         }
         if ($call === 'undefined') {
             return 'null';
@@ -26,13 +26,13 @@ 
         $firstChar = substr($call, 0, 1);
         if (
             !in_array($firstChar, array('$', '\\')) &&
-            !preg_match('#^(?:' . CompilerConfig::VARNAME . '\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call) &&
+            !preg_match('#^(?:'.CompilerConfig::VARNAME.'\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call) &&
             (
-                preg_match('#^' . CompilerConfig::VARNAME . '#', $call) ||
+                preg_match('#^'.CompilerConfig::VARNAME.'#', $call) ||
                 $firstChar === '_'
             )
         ) {
-            $call = '$' . $call;
+            $call = '$'.$call;
         }
 
         return $call;
@@ -63,9 +63,9 @@ 
      */
     public static function getGetter($anything, $key)
     {
-        return '\\Jade\\Compiler::getPropertyFromAnything(' .
-                static::addDollarIfNeeded($anything) . ', ' .
-                var_export($key, true) .
+        return '\\Jade\\Compiler::getPropertyFromAnything('.
+                static::addDollarIfNeeded($anything).', '.
+                var_export($key, true).
             ')';
     }
 }

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

Doc Comments -1 removed lines

@@ -73,7 +73,6 @@
     /**
      * Get property from object.
      *
-     * @param object $object source object
      * @param mixed  $key    key to retrive from the object or the array
      *
      * @return mixed

Indentation +151 added lines, -151 removed lines

@@ -8,165 +8,165 @@
  */
 abstract class CompilerFacade extends ValuesCompiler
 {
-    protected static $mixinBlocks = array();
+	protected static $mixinBlocks = array();
 
-    /**
-     * Record a closure as a mixin block during execution jade template time.
-     *
-     * @param string  mixin name
-     * @param string  mixin block treatment
-     */
-    public static function recordMixinBlock($name, $func = null)
-    {
-        if (!isset(static::$mixinBlocks[$name])) {
-            static::$mixinBlocks[$name] = array();
-        }
-        array_push(static::$mixinBlocks[$name], $func);
-    }
+	/**
+	 * Record a closure as a mixin block during execution jade template time.
+	 *
+	 * @param string  mixin name
+	 * @param string  mixin block treatment
+	 */
+	public static function recordMixinBlock($name, $func = null)
+	{
+		if (!isset(static::$mixinBlocks[$name])) {
+			static::$mixinBlocks[$name] = array();
+		}
+		array_push(static::$mixinBlocks[$name], $func);
+	}
 
-    /**
-     * Record a closure as a mixin block during execution jade template time.
-     *
-     * @param string  mixin name
-     * @param string  mixin block treatment
-     */
-    public static function callMixinBlock($name, $attributes = array())
-    {
-        if (isset(static::$mixinBlocks[$name]) && is_array($mixinBlocks = static::$mixinBlocks[$name])) {
-            $func = end($mixinBlocks);
-            if (is_callable($func)) {
-                $func($attributes);
-            }
-        }
-    }
+	/**
+	 * Record a closure as a mixin block during execution jade template time.
+	 *
+	 * @param string  mixin name
+	 * @param string  mixin block treatment
+	 */
+	public static function callMixinBlock($name, $attributes = array())
+	{
+		if (isset(static::$mixinBlocks[$name]) && is_array($mixinBlocks = static::$mixinBlocks[$name])) {
+			$func = end($mixinBlocks);
+			if (is_callable($func)) {
+				$func($attributes);
+			}
+		}
+	}
 
-    /**
-     * Record a closure as a mixin block during execution jade template time
-     * and propagate variables.
-     *
-     * @param string  mixin name
-     * @param &array  variables handler propagated from parent scope
-     * @param string  mixin block treatment
-     */
-    public static function callMixinBlockWithVars($name, &$varHandler, $attributes = array())
-    {
-        if (isset(static::$mixinBlocks[$name]) && is_array($mixinBlocks = static::$mixinBlocks[$name])) {
-            $func = end($mixinBlocks);
-            if (is_callable($func)) {
-                $func($varHandler, $attributes);
-            }
-        }
-    }
+	/**
+	 * Record a closure as a mixin block during execution jade template time
+	 * and propagate variables.
+	 *
+	 * @param string  mixin name
+	 * @param &array  variables handler propagated from parent scope
+	 * @param string  mixin block treatment
+	 */
+	public static function callMixinBlockWithVars($name, &$varHandler, $attributes = array())
+	{
+		if (isset(static::$mixinBlocks[$name]) && is_array($mixinBlocks = static::$mixinBlocks[$name])) {
+			$func = end($mixinBlocks);
+			if (is_callable($func)) {
+				$func($varHandler, $attributes);
+			}
+		}
+	}
 
-    /**
-     * End of the record of the mixin block.
-     *
-     * @param string  mixin name
-     */
-    public static function terminateMixinBlock($name)
-    {
-        if (isset(static::$mixinBlocks[$name])) {
-            array_pop(static::$mixinBlocks);
-        }
-    }
+	/**
+	 * End of the record of the mixin block.
+	 *
+	 * @param string  mixin name
+	 */
+	public static function terminateMixinBlock($name)
+	{
+		if (isset(static::$mixinBlocks[$name])) {
+			array_pop(static::$mixinBlocks);
+		}
+	}
 
-    /**
-     * Get property from object.
-     *
-     * @param object $object source object
-     * @param mixed  $key    key to retrive from the object or the array
-     *
-     * @return mixed
-     */
-    public static function getPropertyFromObject($anything, $key)
-    {
-        return isset($anything->$key)
-            ? $anything->$key
-            : (method_exists($anything, $method = 'get' . ucfirst($key))
-                ? $anything->$method()
-                : (method_exists($anything, $key)
-                    ? array($anything, $key)
-                    : null
-                )
-            );
-    }
+	/**
+	 * Get property from object.
+	 *
+	 * @param object $object source object
+	 * @param mixed  $key    key to retrive from the object or the array
+	 *
+	 * @return mixed
+	 */
+	public static function getPropertyFromObject($anything, $key)
+	{
+		return isset($anything->$key)
+			? $anything->$key
+			: (method_exists($anything, $method = 'get' . ucfirst($key))
+				? $anything->$method()
+				: (method_exists($anything, $key)
+					? array($anything, $key)
+					: null
+				)
+			);
+	}
 
-    /**
-     * Get property from object or entry from array.
-     *
-     * @param object|array $anything source
-     * @param mixed        $key      key to retrive from the object or the array
-     *
-     * @return mixed
-     */
-    public static function getPropertyFromAnything($anything, $key)
-    {
-        return is_array($anything)
-            ? (isset($anything[$key])
-                ? $anything[$key]
-                : null
-            ) : (is_object($anything)
-                ? static::getPropertyFromObject($anything, $key)
-                : null
-            );
-    }
+	/**
+	 * Get property from object or entry from array.
+	 *
+	 * @param object|array $anything source
+	 * @param mixed        $key      key to retrive from the object or the array
+	 *
+	 * @return mixed
+	 */
+	public static function getPropertyFromAnything($anything, $key)
+	{
+		return is_array($anything)
+			? (isset($anything[$key])
+				? $anything[$key]
+				: null
+			) : (is_object($anything)
+				? static::getPropertyFromObject($anything, $key)
+				: null
+			);
+	}
 
-    /**
-     * Merge given attributes such as tag attributes with mixin attributes.
-     *
-     * @param array $attributes
-     * @param array $mixinAttributes
-     *
-     * @return array
-     */
-    public static function withMixinAttributes($attributes, $mixinAttributes)
-    {
-        foreach ($mixinAttributes as $attribute) {
-            if ($attribute['name'] === 'class') {
-                $value = static::joinAny($attribute['value']);
-                $attributes['class'] = empty($attributes['class'])
-                    ? $value
-                    : static::joinAny($attributes['class']) . ' ' . $value;
-            }
-        }
-        if (isset($attributes['class'])) {
-            $attributes['class'] = implode(' ', array_unique(explode(' ', $attributes['class'])));
-        }
+	/**
+	 * Merge given attributes such as tag attributes with mixin attributes.
+	 *
+	 * @param array $attributes
+	 * @param array $mixinAttributes
+	 *
+	 * @return array
+	 */
+	public static function withMixinAttributes($attributes, $mixinAttributes)
+	{
+		foreach ($mixinAttributes as $attribute) {
+			if ($attribute['name'] === 'class') {
+				$value = static::joinAny($attribute['value']);
+				$attributes['class'] = empty($attributes['class'])
+					? $value
+					: static::joinAny($attributes['class']) . ' ' . $value;
+			}
+		}
+		if (isset($attributes['class'])) {
+			$attributes['class'] = implode(' ', array_unique(explode(' ', $attributes['class'])));
+		}
 
-        return $attributes;
-    }
+		return $attributes;
+	}
 
-    /**
-     * Display a list of attributes with the given quote character in HTML.
-     *
-     * @param array  $attributes
-     * @param string $quote
-     */
-    public static function displayAttributes($attributes, $quote, $terse)
-    {
-        if (is_array($attributes) || $attributes instanceof Traversable) {
-            foreach ($attributes as $key => $value) {
-                if ($key !== 'class' && $value !== false && $value !== 'null') {
-                    if ($value === true) {
-                        echo ' ' . $key . ($terse ? '' : '=' . $quote . $key . $quote);
-                        continue;
-                    }
-                    echo ' ' . $key . '=' . $quote . htmlspecialchars($value) . $quote;
-                }
-            }
-        }
-    }
+	/**
+	 * Display a list of attributes with the given quote character in HTML.
+	 *
+	 * @param array  $attributes
+	 * @param string $quote
+	 */
+	public static function displayAttributes($attributes, $quote, $terse)
+	{
+		if (is_array($attributes) || $attributes instanceof Traversable) {
+			foreach ($attributes as $key => $value) {
+				if ($key !== 'class' && $value !== false && $value !== 'null') {
+					if ($value === true) {
+						echo ' ' . $key . ($terse ? '' : '=' . $quote . $key . $quote);
+						continue;
+					}
+					echo ' ' . $key . '=' . $quote . htmlspecialchars($value) . $quote;
+				}
+			}
+		}
+	}
 
-    /**
-     * Return true if the given value can be display
-     * (null or false should not be displayed in the output HTML).
-     *
-     * @param $value
-     *
-     * @return bool
-     */
-    public static function isDisplayable($value)
-    {
-        return !is_null($value) && $value !== false;
-    }
+	/**
+	 * Return true if the given value can be display
+	 * (null or false should not be displayed in the output HTML).
+	 *
+	 * @param $value
+	 *
+	 * @return bool
+	 */
+	public static function isDisplayable($value)
+	{
+		return !is_null($value) && $value !== false;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -82,7 +82,7 @@ 
     {
         return isset($anything->$key)
             ? $anything->$key
-            : (method_exists($anything, $method = 'get' . ucfirst($key))
+            : (method_exists($anything, $method = 'get'.ucfirst($key))
                 ? $anything->$method()
                 : (method_exists($anything, $key)
                     ? array($anything, $key)
@@ -126,7 +126,7 @@ 
                 $value = static::joinAny($attribute['value']);
                 $attributes['class'] = empty($attributes['class'])
                     ? $value
-                    : static::joinAny($attributes['class']) . ' ' . $value;
+                    : static::joinAny($attributes['class']).' '.$value;
             }
         }
         if (isset($attributes['class'])) {
@@ -148,10 +148,10 @@ 
             foreach ($attributes as $key => $value) {
                 if ($key !== 'class' && $value !== false && $value !== 'null') {
                     if ($value === true) {
-                        echo ' ' . $key . ($terse ? '' : '=' . $quote . $key . $quote);
+                        echo ' '.$key.($terse ? '' : '='.$quote.$key.$quote);
                         continue;
                     }
-                    echo ' ' . $key . '=' . $quote . htmlspecialchars($value) . $quote;
+                    echo ' '.$key.'='.$quote.htmlspecialchars($value).$quote;
                 }
             }
         }

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

Doc Comments +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
      *
      * @param array $value
      *
-     * @return string|mixed
+     * @return string
      */
     protected static function joinAny($value)
     {

Indentation +179 added lines, -179 removed lines

@@ -8,183 +8,183 @@
  */
 abstract class CompilerUtils extends Indenter
 {
-    /**
-     * Prepend "$" to the given input if it's a varname.
-     *
-     * @param string $call
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return string
-     */
-    protected static function addDollarIfNeeded($call)
-    {
-        return CommonUtils::addDollarIfNeeded($call);
-    }
-
-    /**
-     * Escape value depanding on the current quote.
-     *
-     * @param string $val input value
-     *
-     * @return string
-     */
-    protected function escapeValue($val)
-    {
-        return static::getEscapedValue($val, $this->quote);
-    }
-
-    /**
-     * Return PHP code to translate dot to object/array getter.
-     *
-     * @example foo.bar return $foo->bar (if foo is an object), or $foo["bar"] if it's an array.
-     *
-     * @param array $match regex match
-     *
-     * @return string
-     */
-    protected static function convertVarPathCallback($match)
-    {
-        if (empty($match[1])) {
-            return $match[0];
-        }
-
-        $var = ($match[0] === ',' ? ',' : '') . $match[1];
-        foreach (explode('.', substr($match[2], 1)) as $name) {
-            if (!empty($name)) {
-                $var = CommonUtils::getGetter($var, $name, false);
-            }
-        }
-
-        return $var;
-    }
-
-    /**
-     * Replace var paths in a string.
-     *
-     * @param string $arg
-     * @param string $regexp
-     *
-     * @return string
-     */
-    protected static function convertVarPath($arg, $regexp = '/^%s|,%s/')
-    {
-        $pattern = '\s*(\\${0,2}' . static::VARNAME . ')((\.' . static::VARNAME . ')*)';
-
-        return preg_replace_callback(
-            str_replace('%s', $pattern, $regexp),
-            array(get_class(), 'convertVarPathCallback'),
-            $arg
-        );
-    }
-
-    /**
-     * Concat " = null" to initializations to simulate the JS "var foo;".
-     *
-     * @param &string $arg reference of an argument containing an expression
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected static function initArgToNull(&$arg)
-    {
-        $arg = static::addDollarIfNeeded(trim($arg));
-        if (strpos($arg, '=') === false) {
-            $arg .= ' = null';
-        }
-    }
-
-    /**
-     * Parse a value from its quoted string (or JSON) representation.
-     *
-     * @param string $value
-     *
-     * @return mixed
-     */
-    protected static function parseValue($value)
-    {
-        return json_decode(preg_replace("/'([^']*?)'/", '"$1"', $value));
-    }
-
-    /**
-     * Decode a value (parse it except if it's null).
-     *
-     * @param string $value
-     *
-     * @return mixed
-     */
-    protected static function decodeValue($value)
-    {
-        $parsedValue = static::parseValue($value);
-
-        return is_null($parsedValue) ? $value : $parsedValue;
-    }
-
-    /**
-     * Decode each attribute in the given list.
-     *
-     * @param array $attributes
-     *
-     * @return array
-     */
-    protected static function decodeAttributes($attributes)
-    {
-        foreach ($attributes as &$attribute) {
-            if (is_array($attribute)) {
-                $attribute['value'] = is_bool($attribute['value']) ? $attribute['value'] : static::decodeValue($attribute['value']);
-                continue;
-            }
-
-            $attribute = static::decodeValue($attribute);
-        }
-
-        return $attributes;
-    }
-
-    /**
-     * Get filter by name.
-     *
-     * @param string $name
-     *
-     * @return callable
-     */
-    protected function getFilter($name)
-    {
-        $helper = new FilterHelper($this->filters, $this->filterAutoLoad);
-
-        return $helper->getValidFilter($name);
-    }
-
-    /**
-     * Return PHP code wich wrap the given value and escape it if $escaped is true.
-     *
-     * @param bool  $escaped need to be escaped
-     * @param mixed $value   to be escaped if $escaped is true
-     *
-     * @return callable
-     */
-    protected function escapeIfNeeded($escaped, $value)
-    {
-        $value = rtrim($value, ';');
-
-        if ($escaped) {
-            return $this->createCode(static::ESCAPED, $value, var_export($this->quote, true));
-        }
-
-        return $this->createCode(static::UNESCAPED, $value);
-    }
-
-    /**
-     * Join with space if the value is an array, else return the input value
-     * with no changes.
-     *
-     * @param array $value
-     *
-     * @return string|mixed
-     */
-    protected static function joinAny($value)
-    {
-        return is_array($value)
-            ? implode(' ', $value)
-            : $value;
-    }
+	/**
+	 * Prepend "$" to the given input if it's a varname.
+	 *
+	 * @param string $call
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return string
+	 */
+	protected static function addDollarIfNeeded($call)
+	{
+		return CommonUtils::addDollarIfNeeded($call);
+	}
+
+	/**
+	 * Escape value depanding on the current quote.
+	 *
+	 * @param string $val input value
+	 *
+	 * @return string
+	 */
+	protected function escapeValue($val)
+	{
+		return static::getEscapedValue($val, $this->quote);
+	}
+
+	/**
+	 * Return PHP code to translate dot to object/array getter.
+	 *
+	 * @example foo.bar return $foo->bar (if foo is an object), or $foo["bar"] if it's an array.
+	 *
+	 * @param array $match regex match
+	 *
+	 * @return string
+	 */
+	protected static function convertVarPathCallback($match)
+	{
+		if (empty($match[1])) {
+			return $match[0];
+		}
+
+		$var = ($match[0] === ',' ? ',' : '') . $match[1];
+		foreach (explode('.', substr($match[2], 1)) as $name) {
+			if (!empty($name)) {
+				$var = CommonUtils::getGetter($var, $name, false);
+			}
+		}
+
+		return $var;
+	}
+
+	/**
+	 * Replace var paths in a string.
+	 *
+	 * @param string $arg
+	 * @param string $regexp
+	 *
+	 * @return string
+	 */
+	protected static function convertVarPath($arg, $regexp = '/^%s|,%s/')
+	{
+		$pattern = '\s*(\\${0,2}' . static::VARNAME . ')((\.' . static::VARNAME . ')*)';
+
+		return preg_replace_callback(
+			str_replace('%s', $pattern, $regexp),
+			array(get_class(), 'convertVarPathCallback'),
+			$arg
+		);
+	}
+
+	/**
+	 * Concat " = null" to initializations to simulate the JS "var foo;".
+	 *
+	 * @param &string $arg reference of an argument containing an expression
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	protected static function initArgToNull(&$arg)
+	{
+		$arg = static::addDollarIfNeeded(trim($arg));
+		if (strpos($arg, '=') === false) {
+			$arg .= ' = null';
+		}
+	}
+
+	/**
+	 * Parse a value from its quoted string (or JSON) representation.
+	 *
+	 * @param string $value
+	 *
+	 * @return mixed
+	 */
+	protected static function parseValue($value)
+	{
+		return json_decode(preg_replace("/'([^']*?)'/", '"$1"', $value));
+	}
+
+	/**
+	 * Decode a value (parse it except if it's null).
+	 *
+	 * @param string $value
+	 *
+	 * @return mixed
+	 */
+	protected static function decodeValue($value)
+	{
+		$parsedValue = static::parseValue($value);
+
+		return is_null($parsedValue) ? $value : $parsedValue;
+	}
+
+	/**
+	 * Decode each attribute in the given list.
+	 *
+	 * @param array $attributes
+	 *
+	 * @return array
+	 */
+	protected static function decodeAttributes($attributes)
+	{
+		foreach ($attributes as &$attribute) {
+			if (is_array($attribute)) {
+				$attribute['value'] = is_bool($attribute['value']) ? $attribute['value'] : static::decodeValue($attribute['value']);
+				continue;
+			}
+
+			$attribute = static::decodeValue($attribute);
+		}
+
+		return $attributes;
+	}
+
+	/**
+	 * Get filter by name.
+	 *
+	 * @param string $name
+	 *
+	 * @return callable
+	 */
+	protected function getFilter($name)
+	{
+		$helper = new FilterHelper($this->filters, $this->filterAutoLoad);
+
+		return $helper->getValidFilter($name);
+	}
+
+	/**
+	 * Return PHP code wich wrap the given value and escape it if $escaped is true.
+	 *
+	 * @param bool  $escaped need to be escaped
+	 * @param mixed $value   to be escaped if $escaped is true
+	 *
+	 * @return callable
+	 */
+	protected function escapeIfNeeded($escaped, $value)
+	{
+		$value = rtrim($value, ';');
+
+		if ($escaped) {
+			return $this->createCode(static::ESCAPED, $value, var_export($this->quote, true));
+		}
+
+		return $this->createCode(static::UNESCAPED, $value);
+	}
+
+	/**
+	 * Join with space if the value is an array, else return the input value
+	 * with no changes.
+	 *
+	 * @param array $value
+	 *
+	 * @return string|mixed
+	 */
+	protected static function joinAny($value)
+	{
+		return is_array($value)
+			? implode(' ', $value)
+			: $value;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
             return $match[0];
         }
 
-        $var = ($match[0] === ',' ? ',' : '') . $match[1];
+        $var = ($match[0] === ',' ? ',' : '').$match[1];
         foreach (explode('.', substr($match[2], 1)) as $name) {
             if (!empty($name)) {
                 $var = CommonUtils::getGetter($var, $name, false);
@@ -69,7 +69,7 @@ 
      */
     protected static function convertVarPath($arg, $regexp = '/^%s|,%s/')
     {
-        $pattern = '\s*(\\${0,2}' . static::VARNAME . ')((\.' . static::VARNAME . ')*)';
+        $pattern = '\s*(\\${0,2}'.static::VARNAME.')((\.'.static::VARNAME.')*)';
 
         return preg_replace_callback(
             str_replace('%s', $pattern, $regexp),

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

Doc Comments +8 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 abstract class KeywordsCompiler extends AttributesCompiler
 {
     /**
-     * @param Nodes\CaseNode $node
+     * @param CaseNode $node
      */
     protected function visitCasenode(CaseNode $node)
     {
@@ -45,7 +45,7 @@ 
     }
 
     /**
-     * @param Nodes\When $node
+     * @param When $node
      */
     protected function visitWhen(When $node)
     {
@@ -75,7 +75,7 @@ 
     }
 
     /**
-     * @param Nodes\Filter $node
+     * @param Filter $node
      *
      * @throws \InvalidArgumentException
      */
@@ -94,7 +94,7 @@ 
     }
 
     /**
-     * @param Nodes\Each $node
+     * @param Each $node
      */
     protected function visitEach(Each $node)
     {
@@ -138,6 +138,9 @@ 
         }
     }
 
+    /**
+     * @param \Jade\Nodes\Block $block
+     */
     protected function bufferCustomKeyword($data, $block)
     {
         if (isset($data['begin'])) {
@@ -156,7 +159,7 @@ 
     }
 
     /**
-     * @param Nodes\CustomKeyword $node
+     * @param CustomKeyword $node
      */
     protected function visitCustomKeyword(CustomKeyword $node)
     {

Indentation +176 added lines, -176 removed lines

@@ -10,180 +10,180 @@
 
 abstract class KeywordsCompiler extends AttributesCompiler
 {
-    /**
-     * @param Nodes\CaseNode $node
-     */
-    protected function visitCasenode(CaseNode $node)
-    {
-        $this->switchNode = $node;
-        $this->visit($node->block);
-
-        if (!isset($this->switchNode)) {
-            unset($this->switchNode);
-            $this->indents--;
-
-            $code = $this->createCode('}');
-            $this->buffer($code);
-        }
-    }
-
-    /**
-     * @param string $expression
-     * @param &array $arguments
-     *
-     * @return string
-     */
-    protected function visitCase($expression, &$arguments)
-    {
-        if ('default' === $expression) {
-            return 'default:';
-        }
-
-        $arguments[] = $expression;
-
-        return 'case %s:';
-    }
-
-    /**
-     * @param Nodes\When $node
-     */
-    protected function visitWhen(When $node)
-    {
-        $code = '';
-        $arguments = array();
-
-        if (isset($this->switchNode)) {
-            $code .= 'switch (%s) {';
-            $arguments[] = $this->switchNode->expr;
-            unset($this->switchNode);
-
-            $this->indents++;
-        }
-
-        $code .= $this->visitCase($node->expr, $arguments);
-
-        array_unshift($arguments, $code);
-
-        $code = call_user_func_array(array($this, 'createCode'), $arguments);
-
-        $this->buffer($code);
-
-        $this->visit($node->block);
-
-        $code = $this->createCode('break;');
-        $this->buffer($code . $this->newline());
-    }
-
-    /**
-     * @param Nodes\Filter $node
-     *
-     * @throws \InvalidArgumentException
-     */
-    protected function visitFilter(Filter $node)
-    {
-        $filter = $this->getFilter($node->name);
-
-        // Filters can be either a iFilter implementation, nor a callable
-        if (is_string($filter) && class_exists($filter)) {
-            $filter = new $filter();
-        }
-        if (!is_callable($filter)) {
-            throw new \InvalidArgumentException($node->name . ': Filter must be callable', 18);
-        }
-        $this->buffer($filter($node, $this));
-    }
-
-    /**
-     * @param Nodes\Each $node
-     */
-    protected function visitEach(Each $node)
-    {
-        //if (is_numeric($node->obj)) {
-        //if (is_string($node->obj)) {
-        //$serialized = serialize($node->obj);
-        if (isset($node->alternative)) {
-            $this->buffer($this->createCode(
-                'if (isset(%s) && %s) {',
-                $node->obj, $node->obj
-            ));
-            $this->indents++;
-        }
-
-        $this->buffer(isset($node->key) && strlen($node->key) > 0
-            ? $this->createCode(
-                'foreach (%s as %s => %s) {',
-                $node->obj, $node->key, $node->value
-            )
-            : $this->createCode(
-                'foreach (%s as %s) {',
-                $node->obj, $node->value
-            )
-        );
-
-        $this->indents++;
-        $this->visit($node->block);
-        $this->indents--;
-
-        $this->buffer($this->createCode('}'));
-
-        if (isset($node->alternative)) {
-            $this->indents--;
-            $this->buffer($this->createCode('} else {'));
-            $this->indents++;
-
-            $this->visit($node->alternative);
-            $this->indents--;
-
-            $this->buffer($this->createCode('}'));
-        }
-    }
-
-    protected function bufferCustomKeyword($data, $block)
-    {
-        if (isset($data['begin'])) {
-            $this->buffer($data['begin']);
-        }
-
-        if ($block) {
-            $this->indents++;
-            $this->visit($block);
-            $this->indents--;
-        }
-
-        if (isset($data['end'])) {
-            $this->buffer($data['end']);
-        }
-    }
-
-    /**
-     * @param Nodes\CustomKeyword $node
-     */
-    protected function visitCustomKeyword(CustomKeyword $node)
-    {
-        $action = $this->options['customKeywords'][$node->keyWord];
-
-        $data = $action($node->args, $node->block, $node->keyWord);
-
-        if (is_string($data)) {
-            $data = array(
-                'begin' => $data,
-            );
-        }
-
-        if (!is_array($data) && !($data instanceof \ArrayAccess)) {
-            throw new \ErrorException("The keyword {$node->keyWord} returned an invalid value type, string or array was expected.", 33);
-        }
-
-        foreach (array('begin', 'end') as $key) {
-            $data[$key] = (isset($data[$key . 'Php'])
-                ? $this->createCode($data[$key . 'Php'])
-                : ''
-            ) . (isset($data[$key])
-                ? $data[$key]
-                : ''
-            );
-        }
-
-        $this->bufferCustomKeyword($data, $node->block);
-    }
+	/**
+	 * @param Nodes\CaseNode $node
+	 */
+	protected function visitCasenode(CaseNode $node)
+	{
+		$this->switchNode = $node;
+		$this->visit($node->block);
+
+		if (!isset($this->switchNode)) {
+			unset($this->switchNode);
+			$this->indents--;
+
+			$code = $this->createCode('}');
+			$this->buffer($code);
+		}
+	}
+
+	/**
+	 * @param string $expression
+	 * @param &array $arguments
+	 *
+	 * @return string
+	 */
+	protected function visitCase($expression, &$arguments)
+	{
+		if ('default' === $expression) {
+			return 'default:';
+		}
+
+		$arguments[] = $expression;
+
+		return 'case %s:';
+	}
+
+	/**
+	 * @param Nodes\When $node
+	 */
+	protected function visitWhen(When $node)
+	{
+		$code = '';
+		$arguments = array();
+
+		if (isset($this->switchNode)) {
+			$code .= 'switch (%s) {';
+			$arguments[] = $this->switchNode->expr;
+			unset($this->switchNode);
+
+			$this->indents++;
+		}
+
+		$code .= $this->visitCase($node->expr, $arguments);
+
+		array_unshift($arguments, $code);
+
+		$code = call_user_func_array(array($this, 'createCode'), $arguments);
+
+		$this->buffer($code);
+
+		$this->visit($node->block);
+
+		$code = $this->createCode('break;');
+		$this->buffer($code . $this->newline());
+	}
+
+	/**
+	 * @param Nodes\Filter $node
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	protected function visitFilter(Filter $node)
+	{
+		$filter = $this->getFilter($node->name);
+
+		// Filters can be either a iFilter implementation, nor a callable
+		if (is_string($filter) && class_exists($filter)) {
+			$filter = new $filter();
+		}
+		if (!is_callable($filter)) {
+			throw new \InvalidArgumentException($node->name . ': Filter must be callable', 18);
+		}
+		$this->buffer($filter($node, $this));
+	}
+
+	/**
+	 * @param Nodes\Each $node
+	 */
+	protected function visitEach(Each $node)
+	{
+		//if (is_numeric($node->obj)) {
+		//if (is_string($node->obj)) {
+		//$serialized = serialize($node->obj);
+		if (isset($node->alternative)) {
+			$this->buffer($this->createCode(
+				'if (isset(%s) && %s) {',
+				$node->obj, $node->obj
+			));
+			$this->indents++;
+		}
+
+		$this->buffer(isset($node->key) && strlen($node->key) > 0
+			? $this->createCode(
+				'foreach (%s as %s => %s) {',
+				$node->obj, $node->key, $node->value
+			)
+			: $this->createCode(
+				'foreach (%s as %s) {',
+				$node->obj, $node->value
+			)
+		);
+
+		$this->indents++;
+		$this->visit($node->block);
+		$this->indents--;
+
+		$this->buffer($this->createCode('}'));
+
+		if (isset($node->alternative)) {
+			$this->indents--;
+			$this->buffer($this->createCode('} else {'));
+			$this->indents++;
+
+			$this->visit($node->alternative);
+			$this->indents--;
+
+			$this->buffer($this->createCode('}'));
+		}
+	}
+
+	protected function bufferCustomKeyword($data, $block)
+	{
+		if (isset($data['begin'])) {
+			$this->buffer($data['begin']);
+		}
+
+		if ($block) {
+			$this->indents++;
+			$this->visit($block);
+			$this->indents--;
+		}
+
+		if (isset($data['end'])) {
+			$this->buffer($data['end']);
+		}
+	}
+
+	/**
+	 * @param Nodes\CustomKeyword $node
+	 */
+	protected function visitCustomKeyword(CustomKeyword $node)
+	{
+		$action = $this->options['customKeywords'][$node->keyWord];
+
+		$data = $action($node->args, $node->block, $node->keyWord);
+
+		if (is_string($data)) {
+			$data = array(
+				'begin' => $data,
+			);
+		}
+
+		if (!is_array($data) && !($data instanceof \ArrayAccess)) {
+			throw new \ErrorException("The keyword {$node->keyWord} returned an invalid value type, string or array was expected.", 33);
+		}
+
+		foreach (array('begin', 'end') as $key) {
+			$data[$key] = (isset($data[$key . 'Php'])
+				? $this->createCode($data[$key . 'Php'])
+				: ''
+			) . (isset($data[$key])
+				? $data[$key]
+				: ''
+			);
+		}
+
+		$this->bufferCustomKeyword($data, $node->block);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -71,7 +71,7 @@ 
         $this->visit($node->block);
 
         $code = $this->createCode('break;');
-        $this->buffer($code . $this->newline());
+        $this->buffer($code.$this->newline());
     }
 
     /**
@@ -88,7 +88,7 @@ 
             $filter = new $filter();
         }
         if (!is_callable($filter)) {
-            throw new \InvalidArgumentException($node->name . ': Filter must be callable', 18);
+            throw new \InvalidArgumentException($node->name.': Filter must be callable', 18);
         }
         $this->buffer($filter($node, $this));
     }
@@ -175,10 +175,10 @@ 
         }
 
         foreach (array('begin', 'end') as $key) {
-            $data[$key] = (isset($data[$key . 'Php'])
-                ? $this->createCode($data[$key . 'Php'])
+            $data[$key] = (isset($data[$key.'Php'])
+                ? $this->createCode($data[$key.'Php'])
                 : ''
-            ) . (isset($data[$key])
+            ).(isset($data[$key])
                 ? $data[$key]
                 : ''
             );

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);