XaBerr / JATE

dist/jate/modules/ExternalModules/composer/ClassLoader.php

Doc Comments +4 added lines

@@ -341,6 +341,10 @@
         return $file;
     }
 
+    /**
+     * @param string $class
+     * @param string $ext
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

Indentation +359 added lines, -359 removed lines

@@ -42,364 +42,364 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-
-    private $classMapAuthoritative = false;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-    }
+	// PSR-4
+	private $prefixLengthsPsr4 = array();
+	private $prefixDirsPsr4 = array();
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	private $prefixesPsr0 = array();
+	private $fallbackDirsPsr0 = array();
+
+	private $useIncludePath = false;
+	private $classMap = array();
+
+	private $classMapAuthoritative = false;
+
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', $this->prefixesPsr0);
+		}
+
+		return array();
+	}
+
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param array $classMap Class to filename map
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string       $prefix  The prefix
+	 * @param array|string $paths   The PSR-0 root directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string       $prefix  The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths   The PSR-4 base directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string       $prefix The prefix
+	 * @param array|string $paths  The PSR-0 base directories
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string       $prefix The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return bool|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+		if ('\\' == $class[0]) {
+			$class = substr($class, 1);
+		}
+
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative) {
+			return false;
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if ($file === null && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if ($file === null) {
+			// Remember that this class does not exist.
+			return $this->classMap[$class] = false;
+		}
+
+		return $file;
+	}
+
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+	}
 }
 
 /**
@@ -409,5 +409,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

Spacing +6 added lines, -6 removed lines

@@ -344,14 +344,14 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -373,14 +373,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

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

Doc Comments +6 added lines, -3 removed lines

@@ -200,7 +200,7 @@ 
     }
 
     /**
-     * @param $method
+     * @param string $method
      * @param $arguments
      *
      * @throws \BadMethodCallException If the 'apply' rely on non existing method
@@ -255,7 +255,7 @@ 
     }
 
     /**
-     * @param $input
+     * @param string $input
      *
      * @throws \ErrorException
      *
@@ -312,7 +312,7 @@ 
     /**
      * @param string $text
      *
-     * @return mixed
+     * @return string
      */
     public function interpolate($text)
     {
@@ -379,6 +379,9 @@ 
         return $statements;
     }
 
+    /**
+     * @param string $arg
+     */
     protected function handleArgumentValue($arg)
     {
         if (preg_match('/^"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'/', $arg)) {

Indentation +439 added lines, -439 removed lines

@@ -11,443 +11,443 @@
  */
 class Compiler extends MixinVisitor
 {
-    /**
-     * Constants and configuration in Compiler/CompilerConfig.php.
-     */
-
-    /**
-     * @var
-     */
-    protected $xml;
-
-    /**
-     * @var
-     */
-    protected $parentIndents;
-
-    /**
-     * @var array
-     */
-    protected $buffer = array();
-    /**
-     * @var array
-     */
-    protected $options = array();
-    /**
-     * @var array
-     */
-    protected $filters = array();
-
-    /**
-     * @var bool
-     */
-    protected $phpSingleLine = false;
-    /**
-     * @var bool
-     */
-    protected $allowMixinOverride = false;
-    /**
-     * @var bool
-     */
-    protected $keepNullAttributes = false;
-    /**
-     * @var bool
-     */
-    protected $filterAutoLoad = true;
-    /**
-     * @var bool
-     */
-    protected $terse = true;
-    /**
-     * @var bool
-     */
-    protected $restrictedScope = false;
-    /**
-     * @var array
-     */
-    protected $customKeywords = array();
-    /**
-     * @var Jade
-     */
-    protected $jade = null;
-
-    /**
-     * @var string
-     */
-    protected $quote;
-
-    /**
-     * @var string
-     */
-    protected $filename;
-
-    /**
-     * @param array/Jade $options
-     * @param array      $filters
-     */
-    public function __construct($options = array(), array $filters = array(), $filename = null)
-    {
-        $this->options = $this->setOptions($options);
-        $this->filters = $filters;
-        $this->filename = $filename;
-    }
-
-    /**
-     * Get a jade engine reference or an options array and return needed options.
-     *
-     * @param array/Jade $options
-     *
-     * @return array
-     */
-    protected function setOptions($options)
-    {
-        $optionTypes = array(
-            'prettyprint' => 'boolean',
-            'phpSingleLine' => 'boolean',
-            'allowMixinOverride' => 'boolean',
-            'keepNullAttributes' => 'boolean',
-            'filterAutoLoad' => 'boolean',
-            'restrictedScope' => 'boolean',
-            'indentSize' => 'integer',
-            'indentChar' => 'string',
-            'customKeywords' => 'array',
-        );
-
-        if ($options instanceof Jade) {
-            $this->jade = $options;
-            $options = array();
-
-            foreach ($optionTypes as $option => $type) {
-                $this->$option = $this->jade->getOption($option);
-                $options[$option] = $this->$option;
-                settype($this->$option, $type);
-            }
-
-            $this->quote = $this->jade->getOption('singleQuote') ? '\'' : '"';
-
-            return $options;
-        }
-
-        foreach (array_intersect_key($optionTypes, $options) as $option => $type) {
-            $this->$option = $options[$option];
-            settype($this->$option, $type);
-        }
-
-        $this->quote = isset($options['singleQuote']) && $options['singleQuote'] ? '\'' : '"';
-
-        return $options;
-    }
-
-    /**
-     * Get an option from the jade engine if set or from the options array else.
-     *
-     * @param string $option
-     *
-     * @throws \InvalidArgumentException
-     *
-     * @return mixed
-     */
-    public function getOption($option)
-    {
-        if (is_null($this->jade)) {
-            if (!isset($this->options[$option])) {
-                throw new \InvalidArgumentException("$option is not a valid option name.", 28);
-            }
-
-            return $this->options[$option];
-        }
-
-        return $this->jade->getOption($option);
-    }
-
-    /**
-     * Get a compiler with the same settings.
-     *
-     * @return Compiler
-     */
-    public function subCompiler()
-    {
-        return new static($this->options, $this->filters);
-    }
-
-    /**
-     * php closing tag depanding on the pretty print setting.
-     *
-     * @return string
-     */
-    protected function closingTag()
-    {
-        return '?>' . ($this->prettyprint ? ' ' : '');
-    }
-
-    /**
-     * @param $node
-     *
-     * @return string
-     */
-    public function compile($node)
-    {
-        $this->visit($node);
-
-        $code = ltrim(implode('', $this->buffer));
-
-        // Separate in several lines to get a useable line number in case of an error occurs
-        if ($this->phpSingleLine) {
-            $code = str_replace(array('<?php', '?>'), array("<?php\n", "\n" . $this->closingTag()), $code);
-        }
-        // Remove the $ wich are not needed
-        return $code;
-    }
-
-    /**
-     * @param $method
-     * @param $arguments
-     *
-     * @throws \BadMethodCallException If the 'apply' rely on non existing method
-     *
-     * @return mixed
-     */
-    protected function apply($method, $arguments)
-    {
-        if (!method_exists($this, $method)) {
-            throw new \BadMethodCallException(sprintf('Method %s do not exists', $method), 7);
-        }
-
-        return call_user_func_array(array($this, $method), $arguments);
-    }
-
-    /**
-     * @param      $line
-     * @param null $indent
-     */
-    protected function buffer($line, $indent = null)
-    {
-        if ($indent === true || ($indent === null && $this->prettyprint)) {
-            $line = $this->indent() . $line . $this->newline();
-        }
-
-        $this->buffer[] = $line;
-    }
-
-    /**
-     * @param string $str
-     *
-     * @return bool|int
-     */
-    protected function isConstant($str)
-    {
-        return preg_match('/^' . static::CONSTANT_VALUE . '$/', trim($str));
-    }
-
-    /**
-     * @param        $input
-     * @param string $name
-     *
-     * @throws \ErrorException
-     *
-     * @return array
-     */
-    public function handleCode($input, $name = '')
-    {
-        $handler = new CodeHandler($input, $name);
-
-        return $handler->parse();
-    }
-
-    /**
-     * @param $input
-     *
-     * @throws \ErrorException
-     *
-     * @return array
-     */
-    public function handleString($input)
-    {
-        $result = array();
-        $resultsString = array();
-
-        $separators = preg_split(
-            '/[+](?!\\()/', // concatenation operator - only js
-            $input,
-            -1,
-            PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE | PREG_SPLIT_DELIM_CAPTURE
-        );
-
-        foreach ($separators as $part) {
-            // $sep[0] - the separator string due to PREG_SPLIT_OFFSET_CAPTURE flag
-            // $sep[1] - the offset due to PREG_SPLIT_OFFSET_CAPTURE
-            // @todo: = find original usage of this
-            //$sep = substr(
-            //    $input,
-            //    strlen($part[0]) + $part[1] + 1,
-            //    isset($separators[$i+1]) ? $separators[$i+1][1] : strlen($input)
-            //);
-
-            // @todo: handleCode() in concat
-            $part[0] = trim($part[0]);
-
-            if (preg_match('/^("(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\')(.*)$/', $part[0], $match)) {
-                $quote = substr($match[1], 0, 1);
-
-                if (strlen(trim($match[2]))) {
-                    throw new \ErrorException('Unexpected value: ' . $match[2], 8);
-                }
-
-                array_push($resultsString, $match[1]);
-
-                continue;
-            }
-
-            $code = $this->handleCode($part[0]);
-
-            $result = array_merge($result, array_slice($code, 0, -1));
-            array_push($resultsString, array_pop($code));
-        }
-
-        array_push($result, implode(' . ', $resultsString));
-
-        return $result;
-    }
-
-    /**
-     * @param string $text
-     *
-     * @return mixed
-     */
-    public function interpolate($text)
-    {
-        return preg_replace_callback('/(\\\\)?([#!]){(.*?)}/', array($this, 'interpolateFromCapture'), $text);
-    }
-
-    /**
-     * @param array $match
-     *
-     * @return string
-     */
-    protected function interpolateFromCapture($match)
-    {
-        if ($match[1] === '') {
-            return $this->escapeIfNeeded($match[2] === '!', $match[3]);
-        }
-
-        return substr($match[0], 1);
-    }
-
-    /**
-     * @throws \InvalidArgumentException
-     *
-     * @return array
-     */
-    protected function createStatements()
-    {
-        if (func_num_args() === 0) {
-            throw new \InvalidArgumentException('No Arguments provided', 9);
-        }
-
-        $arguments = func_get_args();
-        $statements = array();
-        $variables = array();
-
-        foreach ($arguments as $arg) {
-            $arg = static::convertVarPath($arg);
-
-            // add dollar if missing
-            if (preg_match('/^' . static::VARNAME . '(\s*,.+)?$/', $arg)) {
-                $arg = static::addDollarIfNeeded($arg);
-            }
-
-            // shortcut for constants
-            if ($this->isConstant($arg)) {
-                array_push($variables, $arg);
-                continue;
-            }
-
-            // if we have a php variable assume that the string is good php
-            if (strpos('{[', substr($arg, 0, 1)) === false && preg_match('/&?\${1,2}' . static::VARNAME . '|[A-Za-z0-9_\\\\]+::/', $arg)) {
-                array_push($variables, $arg);
-                continue;
-            }
-
-            $code = $this->handleArgumentValue($arg);
-
-            $statements = array_merge($statements, array_slice($code, 0, -1));
-            array_push($variables, array_pop($code));
-        }
-
-        array_push($statements, $variables);
-
-        return $statements;
-    }
-
-    protected function handleArgumentValue($arg)
-    {
-        if (preg_match('/^"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'/', $arg)) {
-            return $this->handleString(trim($arg));
-        }
-
-        try {
-            return $this->handleCode($arg);
-        } catch (\Exception $e) {
-            // if a bug occur, try to remove comments
-            try {
-                return $this->handleCode(preg_replace('#/\*(.*)\*/#', '', $arg));
-            } catch (\Exception $e) {
-                throw new ParserException('Pug.php did not understand ' . $arg, 10, $e);
-            }
-        }
-    }
-
-    /**
-     * @param      $code
-     * @param null $statements
-     *
-     * @return string
-     */
-    protected function createPhpBlock($code, $statements = null)
-    {
-        if ($statements === null) {
-            return '<?php ' . $code . ' ' . $this->closingTag();
-        }
-
-        $codeFormat = array_pop($statements);
-        array_unshift($codeFormat, $code);
-
-        if (count($statements) === 0) {
-            $phpString = call_user_func_array('sprintf', $codeFormat);
-
-            return '<?php ' . $phpString . ' ' . $this->closingTag();
-        }
-
-        $stmtString = '';
-        foreach ($statements as $stmt) {
-            $stmtString .= $this->newline() . $this->indent() . $stmt . ';';
-        }
-
-        $stmtString .= $this->newline() . $this->indent();
-        $stmtString .= call_user_func_array('sprintf', $codeFormat);
-
-        $phpString = '<?php ';
-        $phpString .= $stmtString;
-        $phpString .= $this->newline() . $this->indent() . ' ' . $this->closingTag();
-
-        return $phpString;
-    }
-
-    /**
-     * @param $code
-     *
-     * @return string
-     */
-    protected function createCode($code)
-    {
-        if (func_num_args() > 1) {
-            $arguments = func_get_args();
-            array_shift($arguments); // remove $code
-            $statements = $this->apply('createStatements', $arguments);
-
-            return $this->createPhpBlock($code, $statements);
-        }
-
-        return $this->createPhpBlock($code);
-    }
+	/**
+	 * Constants and configuration in Compiler/CompilerConfig.php.
+	 */
+
+	/**
+	 * @var
+	 */
+	protected $xml;
+
+	/**
+	 * @var
+	 */
+	protected $parentIndents;
+
+	/**
+	 * @var array
+	 */
+	protected $buffer = array();
+	/**
+	 * @var array
+	 */
+	protected $options = array();
+	/**
+	 * @var array
+	 */
+	protected $filters = array();
+
+	/**
+	 * @var bool
+	 */
+	protected $phpSingleLine = false;
+	/**
+	 * @var bool
+	 */
+	protected $allowMixinOverride = false;
+	/**
+	 * @var bool
+	 */
+	protected $keepNullAttributes = false;
+	/**
+	 * @var bool
+	 */
+	protected $filterAutoLoad = true;
+	/**
+	 * @var bool
+	 */
+	protected $terse = true;
+	/**
+	 * @var bool
+	 */
+	protected $restrictedScope = false;
+	/**
+	 * @var array
+	 */
+	protected $customKeywords = array();
+	/**
+	 * @var Jade
+	 */
+	protected $jade = null;
+
+	/**
+	 * @var string
+	 */
+	protected $quote;
+
+	/**
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * @param array/Jade $options
+	 * @param array      $filters
+	 */
+	public function __construct($options = array(), array $filters = array(), $filename = null)
+	{
+		$this->options = $this->setOptions($options);
+		$this->filters = $filters;
+		$this->filename = $filename;
+	}
+
+	/**
+	 * Get a jade engine reference or an options array and return needed options.
+	 *
+	 * @param array/Jade $options
+	 *
+	 * @return array
+	 */
+	protected function setOptions($options)
+	{
+		$optionTypes = array(
+			'prettyprint' => 'boolean',
+			'phpSingleLine' => 'boolean',
+			'allowMixinOverride' => 'boolean',
+			'keepNullAttributes' => 'boolean',
+			'filterAutoLoad' => 'boolean',
+			'restrictedScope' => 'boolean',
+			'indentSize' => 'integer',
+			'indentChar' => 'string',
+			'customKeywords' => 'array',
+		);
+
+		if ($options instanceof Jade) {
+			$this->jade = $options;
+			$options = array();
+
+			foreach ($optionTypes as $option => $type) {
+				$this->$option = $this->jade->getOption($option);
+				$options[$option] = $this->$option;
+				settype($this->$option, $type);
+			}
+
+			$this->quote = $this->jade->getOption('singleQuote') ? '\'' : '"';
+
+			return $options;
+		}
+
+		foreach (array_intersect_key($optionTypes, $options) as $option => $type) {
+			$this->$option = $options[$option];
+			settype($this->$option, $type);
+		}
+
+		$this->quote = isset($options['singleQuote']) && $options['singleQuote'] ? '\'' : '"';
+
+		return $options;
+	}
+
+	/**
+	 * Get an option from the jade engine if set or from the options array else.
+	 *
+	 * @param string $option
+	 *
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return mixed
+	 */
+	public function getOption($option)
+	{
+		if (is_null($this->jade)) {
+			if (!isset($this->options[$option])) {
+				throw new \InvalidArgumentException("$option is not a valid option name.", 28);
+			}
+
+			return $this->options[$option];
+		}
+
+		return $this->jade->getOption($option);
+	}
+
+	/**
+	 * Get a compiler with the same settings.
+	 *
+	 * @return Compiler
+	 */
+	public function subCompiler()
+	{
+		return new static($this->options, $this->filters);
+	}
+
+	/**
+	 * php closing tag depanding on the pretty print setting.
+	 *
+	 * @return string
+	 */
+	protected function closingTag()
+	{
+		return '?>' . ($this->prettyprint ? ' ' : '');
+	}
+
+	/**
+	 * @param $node
+	 *
+	 * @return string
+	 */
+	public function compile($node)
+	{
+		$this->visit($node);
+
+		$code = ltrim(implode('', $this->buffer));
+
+		// Separate in several lines to get a useable line number in case of an error occurs
+		if ($this->phpSingleLine) {
+			$code = str_replace(array('<?php', '?>'), array("<?php\n", "\n" . $this->closingTag()), $code);
+		}
+		// Remove the $ wich are not needed
+		return $code;
+	}
+
+	/**
+	 * @param $method
+	 * @param $arguments
+	 *
+	 * @throws \BadMethodCallException If the 'apply' rely on non existing method
+	 *
+	 * @return mixed
+	 */
+	protected function apply($method, $arguments)
+	{
+		if (!method_exists($this, $method)) {
+			throw new \BadMethodCallException(sprintf('Method %s do not exists', $method), 7);
+		}
+
+		return call_user_func_array(array($this, $method), $arguments);
+	}
+
+	/**
+	 * @param      $line
+	 * @param null $indent
+	 */
+	protected function buffer($line, $indent = null)
+	{
+		if ($indent === true || ($indent === null && $this->prettyprint)) {
+			$line = $this->indent() . $line . $this->newline();
+		}
+
+		$this->buffer[] = $line;
+	}
+
+	/**
+	 * @param string $str
+	 *
+	 * @return bool|int
+	 */
+	protected function isConstant($str)
+	{
+		return preg_match('/^' . static::CONSTANT_VALUE . '$/', trim($str));
+	}
+
+	/**
+	 * @param        $input
+	 * @param string $name
+	 *
+	 * @throws \ErrorException
+	 *
+	 * @return array
+	 */
+	public function handleCode($input, $name = '')
+	{
+		$handler = new CodeHandler($input, $name);
+
+		return $handler->parse();
+	}
+
+	/**
+	 * @param $input
+	 *
+	 * @throws \ErrorException
+	 *
+	 * @return array
+	 */
+	public function handleString($input)
+	{
+		$result = array();
+		$resultsString = array();
+
+		$separators = preg_split(
+			'/[+](?!\\()/', // concatenation operator - only js
+			$input,
+			-1,
+			PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE | PREG_SPLIT_DELIM_CAPTURE
+		);
+
+		foreach ($separators as $part) {
+			// $sep[0] - the separator string due to PREG_SPLIT_OFFSET_CAPTURE flag
+			// $sep[1] - the offset due to PREG_SPLIT_OFFSET_CAPTURE
+			// @todo: = find original usage of this
+			//$sep = substr(
+			//    $input,
+			//    strlen($part[0]) + $part[1] + 1,
+			//    isset($separators[$i+1]) ? $separators[$i+1][1] : strlen($input)
+			//);
+
+			// @todo: handleCode() in concat
+			$part[0] = trim($part[0]);
+
+			if (preg_match('/^("(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\')(.*)$/', $part[0], $match)) {
+				$quote = substr($match[1], 0, 1);
+
+				if (strlen(trim($match[2]))) {
+					throw new \ErrorException('Unexpected value: ' . $match[2], 8);
+				}
+
+				array_push($resultsString, $match[1]);
+
+				continue;
+			}
+
+			$code = $this->handleCode($part[0]);
+
+			$result = array_merge($result, array_slice($code, 0, -1));
+			array_push($resultsString, array_pop($code));
+		}
+
+		array_push($result, implode(' . ', $resultsString));
+
+		return $result;
+	}
+
+	/**
+	 * @param string $text
+	 *
+	 * @return mixed
+	 */
+	public function interpolate($text)
+	{
+		return preg_replace_callback('/(\\\\)?([#!]){(.*?)}/', array($this, 'interpolateFromCapture'), $text);
+	}
+
+	/**
+	 * @param array $match
+	 *
+	 * @return string
+	 */
+	protected function interpolateFromCapture($match)
+	{
+		if ($match[1] === '') {
+			return $this->escapeIfNeeded($match[2] === '!', $match[3]);
+		}
+
+		return substr($match[0], 1);
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 *
+	 * @return array
+	 */
+	protected function createStatements()
+	{
+		if (func_num_args() === 0) {
+			throw new \InvalidArgumentException('No Arguments provided', 9);
+		}
+
+		$arguments = func_get_args();
+		$statements = array();
+		$variables = array();
+
+		foreach ($arguments as $arg) {
+			$arg = static::convertVarPath($arg);
+
+			// add dollar if missing
+			if (preg_match('/^' . static::VARNAME . '(\s*,.+)?$/', $arg)) {
+				$arg = static::addDollarIfNeeded($arg);
+			}
+
+			// shortcut for constants
+			if ($this->isConstant($arg)) {
+				array_push($variables, $arg);
+				continue;
+			}
+
+			// if we have a php variable assume that the string is good php
+			if (strpos('{[', substr($arg, 0, 1)) === false && preg_match('/&?\${1,2}' . static::VARNAME . '|[A-Za-z0-9_\\\\]+::/', $arg)) {
+				array_push($variables, $arg);
+				continue;
+			}
+
+			$code = $this->handleArgumentValue($arg);
+
+			$statements = array_merge($statements, array_slice($code, 0, -1));
+			array_push($variables, array_pop($code));
+		}
+
+		array_push($statements, $variables);
+
+		return $statements;
+	}
+
+	protected function handleArgumentValue($arg)
+	{
+		if (preg_match('/^"(?:\\\\.|[^"\\\\])*"|\'(?:\\\\.|[^\'\\\\])*\'/', $arg)) {
+			return $this->handleString(trim($arg));
+		}
+
+		try {
+			return $this->handleCode($arg);
+		} catch (\Exception $e) {
+			// if a bug occur, try to remove comments
+			try {
+				return $this->handleCode(preg_replace('#/\*(.*)\*/#', '', $arg));
+			} catch (\Exception $e) {
+				throw new ParserException('Pug.php did not understand ' . $arg, 10, $e);
+			}
+		}
+	}
+
+	/**
+	 * @param      $code
+	 * @param null $statements
+	 *
+	 * @return string
+	 */
+	protected function createPhpBlock($code, $statements = null)
+	{
+		if ($statements === null) {
+			return '<?php ' . $code . ' ' . $this->closingTag();
+		}
+
+		$codeFormat = array_pop($statements);
+		array_unshift($codeFormat, $code);
+
+		if (count($statements) === 0) {
+			$phpString = call_user_func_array('sprintf', $codeFormat);
+
+			return '<?php ' . $phpString . ' ' . $this->closingTag();
+		}
+
+		$stmtString = '';
+		foreach ($statements as $stmt) {
+			$stmtString .= $this->newline() . $this->indent() . $stmt . ';';
+		}
+
+		$stmtString .= $this->newline() . $this->indent();
+		$stmtString .= call_user_func_array('sprintf', $codeFormat);
+
+		$phpString = '<?php ';
+		$phpString .= $stmtString;
+		$phpString .= $this->newline() . $this->indent() . ' ' . $this->closingTag();
+
+		return $phpString;
+	}
+
+	/**
+	 * @param $code
+	 *
+	 * @return string
+	 */
+	protected function createCode($code)
+	{
+		if (func_num_args() > 1) {
+			$arguments = func_get_args();
+			array_shift($arguments); // remove $code
+			$statements = $this->apply('createStatements', $arguments);
+
+			return $this->createPhpBlock($code, $statements);
+		}
+
+		return $this->createPhpBlock($code);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -177,7 +177,7 @@ 
      */
     protected function closingTag()
     {
-        return '?>' . ($this->prettyprint ? ' ' : '');
+        return '?>'.($this->prettyprint ? ' ' : '');
     }
 
     /**
@@ -193,7 +193,7 @@ 
 
         // Separate in several lines to get a useable line number in case of an error occurs
         if ($this->phpSingleLine) {
-            $code = str_replace(array('<?php', '?>'), array("<?php\n", "\n" . $this->closingTag()), $code);
+            $code = str_replace(array('<?php', '?>'), array("<?php\n", "\n".$this->closingTag()), $code);
         }
         // Remove the $ wich are not needed
         return $code;
@@ -223,7 +223,7 @@ 
     protected function buffer($line, $indent = null)
     {
         if ($indent === true || ($indent === null && $this->prettyprint)) {
-            $line = $this->indent() . $line . $this->newline();
+            $line = $this->indent().$line.$this->newline();
         }
 
         $this->buffer[] = $line;
@@ -236,7 +236,7 @@ 
      */
     protected function isConstant($str)
     {
-        return preg_match('/^' . static::CONSTANT_VALUE . '$/', trim($str));
+        return preg_match('/^'.static::CONSTANT_VALUE.'$/', trim($str));
     }
 
     /**
@@ -290,7 +290,7 @@ 
                 $quote = substr($match[1], 0, 1);
 
                 if (strlen(trim($match[2]))) {
-                    throw new \ErrorException('Unexpected value: ' . $match[2], 8);
+                    throw new \ErrorException('Unexpected value: '.$match[2], 8);
                 }
 
                 array_push($resultsString, $match[1]);
@@ -352,7 +352,7 @@ 
             $arg = static::convertVarPath($arg);
 
             // add dollar if missing
-            if (preg_match('/^' . static::VARNAME . '(\s*,.+)?$/', $arg)) {
+            if (preg_match('/^'.static::VARNAME.'(\s*,.+)?$/', $arg)) {
                 $arg = static::addDollarIfNeeded($arg);
             }
 
@@ -363,7 +363,7 @@ 
             }
 
             // if we have a php variable assume that the string is good php
-            if (strpos('{[', substr($arg, 0, 1)) === false && preg_match('/&?\${1,2}' . static::VARNAME . '|[A-Za-z0-9_\\\\]+::/', $arg)) {
+            if (strpos('{[', substr($arg, 0, 1)) === false && preg_match('/&?\${1,2}'.static::VARNAME.'|[A-Za-z0-9_\\\\]+::/', $arg)) {
                 array_push($variables, $arg);
                 continue;
             }
@@ -392,7 +392,7 @@ 
             try {
                 return $this->handleCode(preg_replace('#/\*(.*)\*/#', '', $arg));
             } catch (\Exception $e) {
-                throw new ParserException('Pug.php did not understand ' . $arg, 10, $e);
+                throw new ParserException('Pug.php did not understand '.$arg, 10, $e);
             }
         }
     }
@@ -406,7 +406,7 @@ 
     protected function createPhpBlock($code, $statements = null)
     {
         if ($statements === null) {
-            return '<?php ' . $code . ' ' . $this->closingTag();
+            return '<?php '.$code.' '.$this->closingTag();
         }
 
         $codeFormat = array_pop($statements);
@@ -415,20 +415,20 @@ 
         if (count($statements) === 0) {
             $phpString = call_user_func_array('sprintf', $codeFormat);
 
-            return '<?php ' . $phpString . ' ' . $this->closingTag();
+            return '<?php '.$phpString.' '.$this->closingTag();
         }
 
         $stmtString = '';
         foreach ($statements as $stmt) {
-            $stmtString .= $this->newline() . $this->indent() . $stmt . ';';
+            $stmtString .= $this->newline().$this->indent().$stmt.';';
         }
 
-        $stmtString .= $this->newline() . $this->indent();
+        $stmtString .= $this->newline().$this->indent();
         $stmtString .= call_user_func_array('sprintf', $codeFormat);
 
         $phpString = '<?php ';
         $phpString .= $stmtString;
-        $phpString .= $this->newline() . $this->indent() . ' ' . $this->closingTag();
+        $phpString .= $this->newline().$this->indent().' '.$this->closingTag();
 
         return $phpString;
     }

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