SimpleMachines / SMF2.1

index.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',

Sources/minify/path-converter/src/Converter.php

Indentation +169 added lines, -169 removed lines

@@ -18,178 +18,178 @@
  */
 class Converter
 {
-    /**
-     * @var string
-     */
-    protected $from;
-
-    /**
-     * @var string
-     */
-    protected $to;
-
-    /**
-     * @param string $from The original base path (directory, not file!)
-     * @param string $to   The new base path (directory, not file!)
-     */
-    public function __construct($from, $to)
-    {
-        $shared = $this->shared($from, $to);
-        if ($shared === '') {
-            // when both paths have nothing in common, one of them is probably
-            // absolute while the other is relative
-            $cwd = getcwd();
-            $from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
-            $to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
-
-            // or traveling the tree via `..`
-            // attempt to resolve path, or assume it's fine if it doesn't exist
-            $from = realpath($from) ?: $from;
-            $to = realpath($to) ?: $to;
-        }
-
-        $from = $this->dirname($from);
-        $to = $this->dirname($to);
-
-        $from = $this->normalize($from);
-        $to = $this->normalize($to);
-
-        $this->from = $from;
-        $this->to = $to;
-    }
-
-    /**
-     * Normalize path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    protected function normalize($path)
-    {
-        // deal with different operating systems' directory structure
-        $path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
-
-        /*
+	/**
+	 * @var string
+	 */
+	protected $from;
+
+	/**
+	 * @var string
+	 */
+	protected $to;
+
+	/**
+	 * @param string $from The original base path (directory, not file!)
+	 * @param string $to   The new base path (directory, not file!)
+	 */
+	public function __construct($from, $to)
+	{
+		$shared = $this->shared($from, $to);
+		if ($shared === '') {
+			// when both paths have nothing in common, one of them is probably
+			// absolute while the other is relative
+			$cwd = getcwd();
+			$from = strpos($from, $cwd) === 0 ? $from : $cwd.'/'.$from;
+			$to = strpos($to, $cwd) === 0 ? $to : $cwd.'/'.$to;
+
+			// or traveling the tree via `..`
+			// attempt to resolve path, or assume it's fine if it doesn't exist
+			$from = realpath($from) ?: $from;
+			$to = realpath($to) ?: $to;
+		}
+
+		$from = $this->dirname($from);
+		$to = $this->dirname($to);
+
+		$from = $this->normalize($from);
+		$to = $this->normalize($to);
+
+		$this->from = $from;
+		$this->to = $to;
+	}
+
+	/**
+	 * Normalize path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	protected function normalize($path)
+	{
+		// deal with different operating systems' directory structure
+		$path = rtrim(str_replace(DIRECTORY_SEPARATOR, '/', $path), '/');
+
+		/*
          * Example:
          *     /home/forkcms/frontend/cache/compiled_templates/../../core/layout/css/../images/img.gif
          * to
          *     /home/forkcms/frontend/core/layout/images/img.gif
          */
-        do {
-            $path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
-        } while ($count);
-
-        return $path;
-    }
-
-    /**
-     * Figure out the shared path of 2 locations.
-     *
-     * Example:
-     *     /home/forkcms/frontend/core/layout/images/img.gif
-     * and
-     *     /home/forkcms/frontend/cache/minified_css
-     * share
-     *     /home/forkcms/frontend
-     *
-     * @param string $path1
-     * @param string $path2
-     *
-     * @return string
-     */
-    protected function shared($path1, $path2)
-    {
-        // $path could theoretically be empty (e.g. no path is given), in which
-        // case it shouldn't expand to array(''), which would compare to one's
-        // root /
-        $path1 = $path1 ? explode('/', $path1) : array();
-        $path2 = $path2 ? explode('/', $path2) : array();
-
-        $shared = array();
-
-        // compare paths & strip identical ancestors
-        foreach ($path1 as $i => $chunk) {
-            if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
-                $shared[] = $chunk;
-            } else {
-                break;
-            }
-        }
-
-        return implode('/', $shared);
-    }
-
-    /**
-     * Convert paths relative from 1 file to another.
-     *
-     * E.g.
-     *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
-     * should become:
-     *     ../../core/layout/images/img.gif relative to
-     *     /home/forkcms/frontend/cache/minified_css
-     *
-     * @param string $path The relative path that needs to be converted.
-     *
-     * @return string The new relative path.
-     */
-    public function convert($path)
-    {
-        // quit early if conversion makes no sense
-        if ($this->from === $this->to) {
-            return $path;
-        }
-
-        $path = $this->normalize($path);
-        // if we're not dealing with a relative path, just return absolute
-        if (strpos($path, '/') === 0) {
-            return $path;
-        }
-
-        // normalize paths
-        $path = $this->normalize($this->from.'/'.$path);
-
-        // strip shared ancestor paths
-        $shared = $this->shared($path, $this->to);
-        $path = mb_substr($path, mb_strlen($shared));
-        $to = mb_substr($this->to, mb_strlen($shared));
-
-        // add .. for every directory that needs to be traversed to new path
-        $to = str_repeat('../', mb_substr_count($to, '/'));
-
-        return $to.ltrim($path, '/');
-    }
-
-    /**
-     * Attempt to get the directory name from a path.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function dirname($path)
-    {
-        if (is_file($path)) {
-            return dirname($path);
-        }
-
-        if (is_dir($path)) {
-            return rtrim($path, '/');
-        }
-
-        // no known file/dir, start making assumptions
-
-        // ends in / = dir
-        if (mb_substr($path, -1) === '/') {
-            return rtrim($path, '/');
-        }
-
-        // has a dot in the name, likely a file
-        if (preg_match('/.*\..*$/', basename($path)) !== 0) {
-            return dirname($path);
-        }
-
-        // you're on your own here!
-        return $path;
-    }
+		do {
+			$path = preg_replace('/[^\/]+(?<!\.\.)\/\.\.\//', '', $path, -1, $count);
+		} while ($count);
+
+		return $path;
+	}
+
+	/**
+	 * Figure out the shared path of 2 locations.
+	 *
+	 * Example:
+	 *     /home/forkcms/frontend/core/layout/images/img.gif
+	 * and
+	 *     /home/forkcms/frontend/cache/minified_css
+	 * share
+	 *     /home/forkcms/frontend
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 *
+	 * @return string
+	 */
+	protected function shared($path1, $path2)
+	{
+		// $path could theoretically be empty (e.g. no path is given), in which
+		// case it shouldn't expand to array(''), which would compare to one's
+		// root /
+		$path1 = $path1 ? explode('/', $path1) : array();
+		$path2 = $path2 ? explode('/', $path2) : array();
+
+		$shared = array();
+
+		// compare paths & strip identical ancestors
+		foreach ($path1 as $i => $chunk) {
+			if (isset($path2[$i]) && $path1[$i] == $path2[$i]) {
+				$shared[] = $chunk;
+			} else {
+				break;
+			}
+		}
+
+		return implode('/', $shared);
+	}
+
+	/**
+	 * Convert paths relative from 1 file to another.
+	 *
+	 * E.g.
+	 *     ../images/img.gif relative to /home/forkcms/frontend/core/layout/css
+	 * should become:
+	 *     ../../core/layout/images/img.gif relative to
+	 *     /home/forkcms/frontend/cache/minified_css
+	 *
+	 * @param string $path The relative path that needs to be converted.
+	 *
+	 * @return string The new relative path.
+	 */
+	public function convert($path)
+	{
+		// quit early if conversion makes no sense
+		if ($this->from === $this->to) {
+			return $path;
+		}
+
+		$path = $this->normalize($path);
+		// if we're not dealing with a relative path, just return absolute
+		if (strpos($path, '/') === 0) {
+			return $path;
+		}
+
+		// normalize paths
+		$path = $this->normalize($this->from.'/'.$path);
+
+		// strip shared ancestor paths
+		$shared = $this->shared($path, $this->to);
+		$path = mb_substr($path, mb_strlen($shared));
+		$to = mb_substr($this->to, mb_strlen($shared));
+
+		// add .. for every directory that needs to be traversed to new path
+		$to = str_repeat('../', mb_substr_count($to, '/'));
+
+		return $to.ltrim($path, '/');
+	}
+
+	/**
+	 * Attempt to get the directory name from a path.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function dirname($path)
+	{
+		if (is_file($path)) {
+			return dirname($path);
+		}
+
+		if (is_dir($path)) {
+			return rtrim($path, '/');
+		}
+
+		// no known file/dir, start making assumptions
+
+		// ends in / = dir
+		if (mb_substr($path, -1) === '/') {
+			return rtrim($path, '/');
+		}
+
+		// has a dot in the name, likely a file
+		if (preg_match('/.*\..*$/', basename($path)) !== 0) {
+			return dirname($path);
+		}
+
+		// you're on your own here!
+		return $path;
+	}
 }

Sources/minify/src/CSS.php

Indentation +488 added lines, -488 removed lines

@@ -17,96 +17,96 @@ 
  */
 class CSS extends Minify
 {
-    /**
-     * @var int
-     */
-    protected $maxImportSize = 5;
-
-    /**
-     * @var string[]
-     */
-    protected $importExtensions = array(
-        'gif' => 'data:image/gif',
-        'png' => 'data:image/png',
-        'jpe' => 'data:image/jpeg',
-        'jpg' => 'data:image/jpeg',
-        'jpeg' => 'data:image/jpeg',
-        'svg' => 'data:image/svg+xml',
-        'woff' => 'data:application/x-font-woff',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'xbm' => 'image/x-xbitmap',
-    );
-
-    /**
-     * Set the maximum size if files to be imported.
-     *
-     * Files larger than this size (in kB) will not be imported into the CSS.
-     * Importing files into the CSS as data-uri will save you some connections,
-     * but we should only import relatively small decorative images so that our
-     * CSS file doesn't get too bulky.
-     *
-     * @param int $size Size in kB
-     */
-    public function setMaxImportSize($size)
-    {
-        $this->maxImportSize = $size;
-    }
-
-    /**
-     * Set the type of extensions to be imported into the CSS (to save network
-     * connections).
-     * Keys of the array should be the file extensions & respective values
-     * should be the data type.
-     *
-     * @param string[] $extensions Array of file extensions
-     */
-    public function setImportExtensions(array $extensions)
-    {
-        $this->importExtensions = $extensions;
-    }
-
-    /**
-     * Move any import statements to the top.
-     *
-     * @param string $content Nearly finished CSS content
-     *
-     * @return string
-     */
-    protected function moveImportsToTop($content)
-    {
-        if (preg_match_all('/@import[^;]+;/', $content, $matches)) {
-            // remove from content
-            foreach ($matches[0] as $import) {
-                $content = str_replace($import, '', $content);
-            }
-
-            // add to top
-            $content = implode('', $matches[0]).$content;
-        }
-
-        return $content;
-    }
-
-    /**
-     * Combine CSS from import statements.
-     *
-     * @import's will be loaded and their content merged into the original file,
-     * to save HTTP requests.
-     *
-     * @param string   $source  The file to combine imports for
-     * @param string   $content The CSS content to combine imports for
-     * @param string[] $parents Parent paths, for circular reference checks
-     *
-     * @return string
-     *
-     * @throws FileImportException
-     */
-    protected function combineImports($source, $content, $parents)
-    {
-        $importRegexes = array(
-            // @import url(xxx)
-            '/
+	/**
+	 * @var int
+	 */
+	protected $maxImportSize = 5;
+
+	/**
+	 * @var string[]
+	 */
+	protected $importExtensions = array(
+		'gif' => 'data:image/gif',
+		'png' => 'data:image/png',
+		'jpe' => 'data:image/jpeg',
+		'jpg' => 'data:image/jpeg',
+		'jpeg' => 'data:image/jpeg',
+		'svg' => 'data:image/svg+xml',
+		'woff' => 'data:application/x-font-woff',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'xbm' => 'image/x-xbitmap',
+	);
+
+	/**
+	 * Set the maximum size if files to be imported.
+	 *
+	 * Files larger than this size (in kB) will not be imported into the CSS.
+	 * Importing files into the CSS as data-uri will save you some connections,
+	 * but we should only import relatively small decorative images so that our
+	 * CSS file doesn't get too bulky.
+	 *
+	 * @param int $size Size in kB
+	 */
+	public function setMaxImportSize($size)
+	{
+		$this->maxImportSize = $size;
+	}
+
+	/**
+	 * Set the type of extensions to be imported into the CSS (to save network
+	 * connections).
+	 * Keys of the array should be the file extensions & respective values
+	 * should be the data type.
+	 *
+	 * @param string[] $extensions Array of file extensions
+	 */
+	public function setImportExtensions(array $extensions)
+	{
+		$this->importExtensions = $extensions;
+	}
+
+	/**
+	 * Move any import statements to the top.
+	 *
+	 * @param string $content Nearly finished CSS content
+	 *
+	 * @return string
+	 */
+	protected function moveImportsToTop($content)
+	{
+		if (preg_match_all('/@import[^;]+;/', $content, $matches)) {
+			// remove from content
+			foreach ($matches[0] as $import) {
+				$content = str_replace($import, '', $content);
+			}
+
+			// add to top
+			$content = implode('', $matches[0]).$content;
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Combine CSS from import statements.
+	 *
+	 * @import's will be loaded and their content merged into the original file,
+	 * to save HTTP requests.
+	 *
+	 * @param string   $source  The file to combine imports for
+	 * @param string   $content The CSS content to combine imports for
+	 * @param string[] $parents Parent paths, for circular reference checks
+	 *
+	 * @return string
+	 *
+	 * @throws FileImportException
+	 */
+	protected function combineImports($source, $content, $parents)
+	{
+		$importRegexes = array(
+			// @import url(xxx)
+			'/
             # import statement
             @import
 
@@ -151,8 +151,8 @@ 
 
             /ix',
 
-            // @import 'xxx'
-            '/
+			// @import 'xxx'
+			'/
 
             # import statement
             @import
@@ -191,173 +191,173 @@ 
             ;?
 
             /ix',
-        );
-
-        // find all relative imports in css
-        $matches = array();
-        foreach ($importRegexes as $importRegex) {
-            if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) {
-                $matches = array_merge($matches, $regexMatches);
-            }
-        }
-
-        $search = array();
-        $replace = array();
-
-        // loop the matches
-        foreach ($matches as $match) {
-            // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
-
-            // only replace the import with the content if we can grab the
-            // content of the file
-            if ($this->canImportFile($importPath)) {
-                // check if current file was not imported previously in the same
-                // import chain.
-                if (in_array($importPath, $parents)) {
-                    throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
-                }
-
-                // grab referenced file & minify it (which may include importing
-                // yet other @import statements recursively)
-                $minifier = new static($importPath);
-                $importContent = $minifier->execute($source, $parents);
-
-                // check if this is only valid for certain media
-                if (!empty($match['media'])) {
-                    $importContent = '@media '.$match['media'].'{'.$importContent.'}';
-                }
-
-                // add to replacement array
-                $search[] = $match[0];
-                $replace[] = $importContent;
-            }
-        }
-
-        // replace the import statements
-        $content = str_replace($search, $replace, $content);
-
-        return $content;
-    }
-
-    /**
-     * Import files into the CSS, base64-ized.
-     *
-     * @url(image.jpg) images will be loaded and their content merged into the
-     * original file, to save HTTP requests.
-     *
-     * @param string $source  The file to import files for
-     * @param string $content The CSS content to import files for
-     *
-     * @return string
-     */
-    protected function importFiles($source, $content)
-    {
-        $extensions = array_keys($this->importExtensions);
-        $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
-        if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
-            $search = array();
-            $replace = array();
-
-            // loop the matches
-            foreach ($matches as $match) {
-                // get the path for the file that will be imported
-                $path = $match[2];
-                $path = dirname($source).'/'.$path;
-                $extension = $match[3];
-
-                // only replace the import with the content if we're able to get
-                // the content of the file, and it's relatively small
-                if ($this->canImportFile($path) && $this->canImportBySize($path)) {
-                    // grab content && base64-ize
-                    $importContent = $this->load($path);
-                    $importContent = base64_encode($importContent);
-
-                    // build replacement
-                    $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
-                }
-            }
-
-            // replace the import statements
-            $content = str_replace($search, $replace, $content);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify the data.
-     * Perform CSS optimizations.
-     *
-     * @param string[optional] $path    Path to write the data to
-     * @param string[]         $parents Parent paths, for circular reference checks
-     *
-     * @return string The minified data
-     */
-    public function execute($path = null, $parents = array())
-    {
-        $content = '';
-
-        // loop css data (raw data and files)
-        foreach ($this->data as $source => $css) {
-            /*
+		);
+
+		// find all relative imports in css
+		$matches = array();
+		foreach ($importRegexes as $importRegex) {
+			if (preg_match_all($importRegex, $content, $regexMatches, PREG_SET_ORDER)) {
+				$matches = array_merge($matches, $regexMatches);
+			}
+		}
+
+		$search = array();
+		$replace = array();
+
+		// loop the matches
+		foreach ($matches as $match) {
+			// get the path for the file that will be imported
+			$importPath = dirname($source).'/'.$match['path'];
+
+			// only replace the import with the content if we can grab the
+			// content of the file
+			if ($this->canImportFile($importPath)) {
+				// check if current file was not imported previously in the same
+				// import chain.
+				if (in_array($importPath, $parents)) {
+					throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+				}
+
+				// grab referenced file & minify it (which may include importing
+				// yet other @import statements recursively)
+				$minifier = new static($importPath);
+				$importContent = $minifier->execute($source, $parents);
+
+				// check if this is only valid for certain media
+				if (!empty($match['media'])) {
+					$importContent = '@media '.$match['media'].'{'.$importContent.'}';
+				}
+
+				// add to replacement array
+				$search[] = $match[0];
+				$replace[] = $importContent;
+			}
+		}
+
+		// replace the import statements
+		$content = str_replace($search, $replace, $content);
+
+		return $content;
+	}
+
+	/**
+	 * Import files into the CSS, base64-ized.
+	 *
+	 * @url(image.jpg) images will be loaded and their content merged into the
+	 * original file, to save HTTP requests.
+	 *
+	 * @param string $source  The file to import files for
+	 * @param string $content The CSS content to import files for
+	 *
+	 * @return string
+	 */
+	protected function importFiles($source, $content)
+	{
+		$extensions = array_keys($this->importExtensions);
+		$regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
+		if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
+			$search = array();
+			$replace = array();
+
+			// loop the matches
+			foreach ($matches as $match) {
+				// get the path for the file that will be imported
+				$path = $match[2];
+				$path = dirname($source).'/'.$path;
+				$extension = $match[3];
+
+				// only replace the import with the content if we're able to get
+				// the content of the file, and it's relatively small
+				if ($this->canImportFile($path) && $this->canImportBySize($path)) {
+					// grab content && base64-ize
+					$importContent = $this->load($path);
+					$importContent = base64_encode($importContent);
+
+					// build replacement
+					$search[] = $match[0];
+					$replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+				}
+			}
+
+			// replace the import statements
+			$content = str_replace($search, $replace, $content);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify the data.
+	 * Perform CSS optimizations.
+	 *
+	 * @param string[optional] $path    Path to write the data to
+	 * @param string[]         $parents Parent paths, for circular reference checks
+	 *
+	 * @return string The minified data
+	 */
+	public function execute($path = null, $parents = array())
+	{
+		$content = '';
+
+		// loop css data (raw data and files)
+		foreach ($this->data as $source => $css) {
+			/*
              * Let's first take out strings & comments, since we can't just remove
              * whitespace anywhere. If whitespace occurs inside a string, we should
              * leave it alone. E.g.:
              * p { content: "a   test" }
              */
-            $this->extractStrings();
-            $this->stripComments();
-            $css = $this->replace($css);
+			$this->extractStrings();
+			$this->stripComments();
+			$css = $this->replace($css);
 
-            $css = $this->stripWhitespace($css);
-            $css = $this->shortenHex($css);
-            $css = $this->shortenZeroes($css);
-            $css = $this->shortenFontWeights($css);
-            $css = $this->stripEmptyTags($css);
+			$css = $this->stripWhitespace($css);
+			$css = $this->shortenHex($css);
+			$css = $this->shortenZeroes($css);
+			$css = $this->shortenFontWeights($css);
+			$css = $this->stripEmptyTags($css);
 
-            // restore the string we've extracted earlier
-            $css = $this->restoreExtractedData($css);
+			// restore the string we've extracted earlier
+			$css = $this->restoreExtractedData($css);
 
-            $source = is_int($source) ? '' : $source;
-            $parents = $source ? array_merge($parents, array($source)) : $parents;
-            $css = $this->combineImports($source, $css, $parents);
-            $css = $this->importFiles($source, $css);
+			$source = is_int($source) ? '' : $source;
+			$parents = $source ? array_merge($parents, array($source)) : $parents;
+			$css = $this->combineImports($source, $css, $parents);
+			$css = $this->importFiles($source, $css);
 
-            /*
+			/*
              * If we'll save to a new path, we'll have to fix the relative paths
              * to be relative no longer to the source file, but to the new path.
              * If we don't write to a file, fall back to same path so no
              * conversion happens (because we still want it to go through most
              * of the move code...)
              */
-            $converter = new Converter($source, $path ?: $source);
-            $css = $this->move($converter, $css);
-
-            // combine css
-            $content .= $css;
-        }
-
-        $content = $this->moveImportsToTop($content);
-
-        return $content;
-    }
-
-    /**
-     * Moving a css file should update all relative urls.
-     * Relative references (e.g. ../images/image.gif) in a certain css file,
-     * will have to be updated when a file is being saved at another location
-     * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper).
-     *
-     * @param Converter $converter Relative path converter
-     * @param string    $content   The CSS content to update relative urls for
-     *
-     * @return string
-     */
-    protected function move(Converter $converter, $content)
-    {
-        /*
+			$converter = new Converter($source, $path ?: $source);
+			$css = $this->move($converter, $css);
+
+			// combine css
+			$content .= $css;
+		}
+
+		$content = $this->moveImportsToTop($content);
+
+		return $content;
+	}
+
+	/**
+	 * Moving a css file should update all relative urls.
+	 * Relative references (e.g. ../images/image.gif) in a certain css file,
+	 * will have to be updated when a file is being saved at another location
+	 * (e.g. ../../images/image.gif, if the new CSS file is 1 folder deeper).
+	 *
+	 * @param Converter $converter Relative path converter
+	 * @param string    $content   The CSS content to update relative urls for
+	 *
+	 * @return string
+	 */
+	protected function move(Converter $converter, $content)
+	{
+		/*
          * Relative path references will usually be enclosed by url(). @import
          * is an exception, where url() is not necessary around the path (but is
          * allowed).
@@ -368,9 +368,9 @@ 
          * recent PCRE version. That's why I'm doing 2 separate regular
          * expressions & combining the matches after executing of both.
          */
-        $relativeRegexes = array(
-            // url(xxx)
-            '/
+		$relativeRegexes = array(
+			// url(xxx)
+			'/
             # open url()
             url\(
 
@@ -402,8 +402,8 @@ 
 
             /ix',
 
-            // @import "xxx"
-            '/
+			// @import "xxx"
+			'/
             # import statement
             @import
 
@@ -432,243 +432,243 @@ 
                 (?P=quotes)
 
             /ix',
-        );
-
-        // find all relative urls in css
-        $matches = array();
-        foreach ($relativeRegexes as $relativeRegex) {
-            if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) {
-                $matches = array_merge($matches, $regexMatches);
-            }
-        }
-
-        $search = array();
-        $replace = array();
-
-        // loop all urls
-        foreach ($matches as $match) {
-            // determine if it's a url() or an @import match
-            $type = (strpos($match[0], '@import') === 0 ? 'import' : 'url');
-
-            // attempting to interpret GET-params makes no sense, so let's discard them for awhile
-            $params = strrchr($match['path'], '?');
-            $url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path'];
-
-            // fix relative url
-            $url = $converter->convert($url);
-
-            // now that the path has been converted, re-apply GET-params
-            $url .= $params;
-
-            // build replacement
-            $search[] = $match[0];
-            if ($type == 'url') {
-                $replace[] = 'url('.$url.')';
-            } elseif ($type == 'import') {
-                $replace[] = '@import "'.$url.'"';
-            }
-        }
-
-        // replace urls
-        $content = str_replace($search, $replace, $content);
-
-        return $content;
-    }
-
-    /**
-     * Shorthand hex color codes.
-     * #FF0000 -> #F00.
-     *
-     * @param string $content The CSS content to shorten the hex color codes for
-     *
-     * @return string
-     */
-    protected function shortenHex($content)
-    {
-        $content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?=[; }])/i', '#$1$2$3', $content);
-
-        // we can shorten some even more by replacing them with their color name
-        $colors = array(
-            '#F0FFFF' => 'azure',
-            '#F5F5DC' => 'beige',
-            '#A52A2A' => 'brown',
-            '#FF7F50' => 'coral',
-            '#FFD700' => 'gold',
-            '#808080' => 'gray',
-            '#008000' => 'green',
-            '#4B0082' => 'indigo',
-            '#FFFFF0' => 'ivory',
-            '#F0E68C' => 'khaki',
-            '#FAF0E6' => 'linen',
-            '#800000' => 'maroon',
-            '#000080' => 'navy',
-            '#808000' => 'olive',
-            '#CD853F' => 'peru',
-            '#FFC0CB' => 'pink',
-            '#DDA0DD' => 'plum',
-            '#800080' => 'purple',
-            '#F00' => 'red',
-            '#FA8072' => 'salmon',
-            '#A0522D' => 'sienna',
-            '#C0C0C0' => 'silver',
-            '#FFFAFA' => 'snow',
-            '#D2B48C' => 'tan',
-            '#FF6347' => 'tomato',
-            '#EE82EE' => 'violet',
-            '#F5DEB3' => 'wheat',
-        );
-
-        return preg_replace_callback(
-            '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i',
-            function ($match) use ($colors) {
-                return $colors[strtoupper($match[0])];
-            },
-            $content
-        );
-    }
-
-    /**
-     * Shorten CSS font weights.
-     *
-     * @param string $content The CSS content to shorten the font weights for
-     *
-     * @return string
-     */
-    protected function shortenFontWeights($content)
-    {
-        $weights = array(
-            'normal' => 400,
-            'bold' => 700,
-        );
-
-        $callback = function ($match) use ($weights) {
-            return $match[1].$weights[$match[2]];
-        };
-
-        return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content);
-    }
-
-    /**
-     * Shorthand 0 values to plain 0, instead of e.g. -0em.
-     *
-     * @param string $content The CSS content to shorten the zero values for
-     *
-     * @return string
-     */
-    protected function shortenZeroes($content)
-    {
-        // reusable bits of code throughout these regexes:
-        // before & after are used to make sure we don't match lose unintended
-        // 0-like values (e.g. in #000, or in http://url/1.0)
-        // units can be stripped from 0 values, or used to recognize non 0
-        // values (where wa may be able to strip a .0 suffix)
-        $before = '(?<=[:(, ])';
-        $after = '(?=[ ,);}])';
-        $units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)';
-
-        // strip units after zeroes (0px -> 0)
-        // NOTE: it should be safe to remove all units for a 0 value, but in
-        // practice, Webkit (especially Safari) seems to stumble over at least
-        // 0%, potentially other units as well. Only stripping 'px' for now.
-        // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
-
-        // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
-        // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
-        // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
-        // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
-
-        // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
-
-        // remove zeroes where they make no sense in calc: e.g. calc(100px - 0)
-        // the 0 doesn't have any effect, and this isn't even valid without unit
-        // strip all `+ 0` or `- 0` occurrences: calc(10% + 0) -> calc(10%)
-        // looped because there may be multiple 0s inside 1 group of parentheses
-        do {
-            $previous = $content;
-            $content = preg_replace('/\(([^\(\)]+)\s+[\+\-]\s+0(\s+[^\(\)]+)?\)/', '(\\1\\2)', $content);
-        } while ($content !== $previous);
-        // strip all `0 +` occurrences: calc(0 + 10%) -> calc(10%)
-        $content = preg_replace('/\(\s*0\s+\+\s+([^\(\)]+)\)/', '(\\1)', $content);
-        // strip all `0 -` occurrences: calc(0 - 10%) -> calc(-10%)
-        $content = preg_replace('/\(\s*0\s+\-\s+([^\(\)]+)\)/', '(-\\1)', $content);
-        // I'm not going to attempt to optimize away `x * 0` instances:
-        // it's dumb enough code already that it likely won't occur, and it's
-        // too complex to do right (order of operations would have to be
-        // respected etc)
-        // what I cared about most here was fixing incorrectly truncated units
-
-        return $content;
-    }
-
-    /**
-     * Strip comments from source code.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function stripEmptyTags($content)
-    {
-        return preg_replace('/(^|\}|;)[^\{\};]+\{\s*\}/', '\\1', $content);
-    }
-
-    /**
-     * Strip comments from source code.
-     */
-    protected function stripComments()
-    {
-        $this->registerPattern('/\/\*.*?\*\//s', '');
-    }
-
-    /**
-     * Strip whitespace.
-     *
-     * @param string $content The CSS content to strip the whitespace for
-     *
-     * @return string
-     */
-    protected function stripWhitespace($content)
-    {
-        // remove leading & trailing whitespace
-        $content = preg_replace('/^\s*/m', '', $content);
-        $content = preg_replace('/\s*$/m', '', $content);
-
-        // replace newlines with a single space
-        $content = preg_replace('/\s+/', ' ', $content);
-
-        // remove whitespace around meta characters
-        // inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex
-        $content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content);
-        $content = preg_replace('/([\[(:])\s+/', '$1', $content);
-        $content = preg_replace('/\s+([\]\)])/', '$1', $content);
-        $content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content);
-
-        // whitespace around + and - can only be stripped in selectors, like
-        // :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands
-        // like 3px -2px
-        $content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content);
-
-        // remove semicolon/whitespace followed by closing bracket
-        $content = str_replace(';}', '}', $content);
-
-        return trim($content);
-    }
-
-    /**
-     * Check if file is small enough to be imported.
-     *
-     * @param string $path The path to the file
-     *
-     * @return bool
-     */
-    protected function canImportBySize($path)
-    {
-        return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024;
-    }
+		);
+
+		// find all relative urls in css
+		$matches = array();
+		foreach ($relativeRegexes as $relativeRegex) {
+			if (preg_match_all($relativeRegex, $content, $regexMatches, PREG_SET_ORDER)) {
+				$matches = array_merge($matches, $regexMatches);
+			}
+		}
+
+		$search = array();
+		$replace = array();
+
+		// loop all urls
+		foreach ($matches as $match) {
+			// determine if it's a url() or an @import match
+			$type = (strpos($match[0], '@import') === 0 ? 'import' : 'url');
+
+			// attempting to interpret GET-params makes no sense, so let's discard them for awhile
+			$params = strrchr($match['path'], '?');
+			$url = $params ? substr($match['path'], 0, -strlen($params)) : $match['path'];
+
+			// fix relative url
+			$url = $converter->convert($url);
+
+			// now that the path has been converted, re-apply GET-params
+			$url .= $params;
+
+			// build replacement
+			$search[] = $match[0];
+			if ($type == 'url') {
+				$replace[] = 'url('.$url.')';
+			} elseif ($type == 'import') {
+				$replace[] = '@import "'.$url.'"';
+			}
+		}
+
+		// replace urls
+		$content = str_replace($search, $replace, $content);
+
+		return $content;
+	}
+
+	/**
+	 * Shorthand hex color codes.
+	 * #FF0000 -> #F00.
+	 *
+	 * @param string $content The CSS content to shorten the hex color codes for
+	 *
+	 * @return string
+	 */
+	protected function shortenHex($content)
+	{
+		$content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?=[; }])/i', '#$1$2$3', $content);
+
+		// we can shorten some even more by replacing them with their color name
+		$colors = array(
+			'#F0FFFF' => 'azure',
+			'#F5F5DC' => 'beige',
+			'#A52A2A' => 'brown',
+			'#FF7F50' => 'coral',
+			'#FFD700' => 'gold',
+			'#808080' => 'gray',
+			'#008000' => 'green',
+			'#4B0082' => 'indigo',
+			'#FFFFF0' => 'ivory',
+			'#F0E68C' => 'khaki',
+			'#FAF0E6' => 'linen',
+			'#800000' => 'maroon',
+			'#000080' => 'navy',
+			'#808000' => 'olive',
+			'#CD853F' => 'peru',
+			'#FFC0CB' => 'pink',
+			'#DDA0DD' => 'plum',
+			'#800080' => 'purple',
+			'#F00' => 'red',
+			'#FA8072' => 'salmon',
+			'#A0522D' => 'sienna',
+			'#C0C0C0' => 'silver',
+			'#FFFAFA' => 'snow',
+			'#D2B48C' => 'tan',
+			'#FF6347' => 'tomato',
+			'#EE82EE' => 'violet',
+			'#F5DEB3' => 'wheat',
+		);
+
+		return preg_replace_callback(
+			'/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i',
+			function ($match) use ($colors) {
+				return $colors[strtoupper($match[0])];
+			},
+			$content
+		);
+	}
+
+	/**
+	 * Shorten CSS font weights.
+	 *
+	 * @param string $content The CSS content to shorten the font weights for
+	 *
+	 * @return string
+	 */
+	protected function shortenFontWeights($content)
+	{
+		$weights = array(
+			'normal' => 400,
+			'bold' => 700,
+		);
+
+		$callback = function ($match) use ($weights) {
+			return $match[1].$weights[$match[2]];
+		};
+
+		return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content);
+	}
+
+	/**
+	 * Shorthand 0 values to plain 0, instead of e.g. -0em.
+	 *
+	 * @param string $content The CSS content to shorten the zero values for
+	 *
+	 * @return string
+	 */
+	protected function shortenZeroes($content)
+	{
+		// reusable bits of code throughout these regexes:
+		// before & after are used to make sure we don't match lose unintended
+		// 0-like values (e.g. in #000, or in http://url/1.0)
+		// units can be stripped from 0 values, or used to recognize non 0
+		// values (where wa may be able to strip a .0 suffix)
+		$before = '(?<=[:(, ])';
+		$after = '(?=[ ,);}])';
+		$units = '(em|ex|%|px|cm|mm|in|pt|pc|ch|rem|vh|vw|vmin|vmax|vm)';
+
+		// strip units after zeroes (0px -> 0)
+		// NOTE: it should be safe to remove all units for a 0 value, but in
+		// practice, Webkit (especially Safari) seems to stumble over at least
+		// 0%, potentially other units as well. Only stripping 'px' for now.
+		// @see https://github.com/matthiasmullie/minify/issues/60
+		$content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+
+		// strip 0-digits (.0 -> 0)
+		$content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+		// strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
+		$content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+		// strip trailing 0: 50.00 -> 50, 50.00px -> 50px
+		$content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+		// strip leading 0: 0.1 -> .1, 01.1 -> 1.1
+		$content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+
+		// strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
+		$content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+
+		// remove zeroes where they make no sense in calc: e.g. calc(100px - 0)
+		// the 0 doesn't have any effect, and this isn't even valid without unit
+		// strip all `+ 0` or `- 0` occurrences: calc(10% + 0) -> calc(10%)
+		// looped because there may be multiple 0s inside 1 group of parentheses
+		do {
+			$previous = $content;
+			$content = preg_replace('/\(([^\(\)]+)\s+[\+\-]\s+0(\s+[^\(\)]+)?\)/', '(\\1\\2)', $content);
+		} while ($content !== $previous);
+		// strip all `0 +` occurrences: calc(0 + 10%) -> calc(10%)
+		$content = preg_replace('/\(\s*0\s+\+\s+([^\(\)]+)\)/', '(\\1)', $content);
+		// strip all `0 -` occurrences: calc(0 - 10%) -> calc(-10%)
+		$content = preg_replace('/\(\s*0\s+\-\s+([^\(\)]+)\)/', '(-\\1)', $content);
+		// I'm not going to attempt to optimize away `x * 0` instances:
+		// it's dumb enough code already that it likely won't occur, and it's
+		// too complex to do right (order of operations would have to be
+		// respected etc)
+		// what I cared about most here was fixing incorrectly truncated units
+
+		return $content;
+	}
+
+	/**
+	 * Strip comments from source code.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function stripEmptyTags($content)
+	{
+		return preg_replace('/(^|\}|;)[^\{\};]+\{\s*\}/', '\\1', $content);
+	}
+
+	/**
+	 * Strip comments from source code.
+	 */
+	protected function stripComments()
+	{
+		$this->registerPattern('/\/\*.*?\*\//s', '');
+	}
+
+	/**
+	 * Strip whitespace.
+	 *
+	 * @param string $content The CSS content to strip the whitespace for
+	 *
+	 * @return string
+	 */
+	protected function stripWhitespace($content)
+	{
+		// remove leading & trailing whitespace
+		$content = preg_replace('/^\s*/m', '', $content);
+		$content = preg_replace('/\s*$/m', '', $content);
+
+		// replace newlines with a single space
+		$content = preg_replace('/\s+/', ' ', $content);
+
+		// remove whitespace around meta characters
+		// inspired by stackoverflow.com/questions/15195750/minify-compress-css-with-regex
+		$content = preg_replace('/\s*([\*$~^|]?+=|[{};,>~]|!important\b)\s*/', '$1', $content);
+		$content = preg_replace('/([\[(:])\s+/', '$1', $content);
+		$content = preg_replace('/\s+([\]\)])/', '$1', $content);
+		$content = preg_replace('/\s+(:)(?![^\}]*\{)/', '$1', $content);
+
+		// whitespace around + and - can only be stripped in selectors, like
+		// :nth-child(3+2n), not in things like calc(3px + 2px) or shorthands
+		// like 3px -2px
+		$content = preg_replace('/\s*([+-])\s*(?=[^}]*{)/', '$1', $content);
+
+		// remove semicolon/whitespace followed by closing bracket
+		$content = str_replace(';}', '}', $content);
+
+		return trim($content);
+	}
+
+	/**
+	 * Check if file is small enough to be imported.
+	 *
+	 * @param string $path The path to the file
+	 *
+	 * @return bool
+	 */
+	protected function canImportBySize($path)
+	{
+		return ($size = @filesize($path)) && $size <= $this->maxImportSize * 1024;
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -82,7 +82,7 @@ 
             }
 
             // add to top
-            $content = implode('', $matches[0]).$content;
+            $content = implode('', $matches[0]) . $content;
         }
 
         return $content;
@@ -207,7 +207,7 @@ 
         // loop the matches
         foreach ($matches as $match) {
             // get the path for the file that will be imported
-            $importPath = dirname($source).'/'.$match['path'];
+            $importPath = dirname($source) . '/' . $match['path'];
 
             // only replace the import with the content if we can grab the
             // content of the file
@@ -215,7 +215,7 @@ 
                 // check if current file was not imported previously in the same
                 // import chain.
                 if (in_array($importPath, $parents)) {
-                    throw new FileImportException('Failed to import file "'.$importPath.'": circular reference detected.');
+                    throw new FileImportException('Failed to import file "' . $importPath . '": circular reference detected.');
                 }
 
                 // grab referenced file & minify it (which may include importing
@@ -225,7 +225,7 @@ 
 
                 // check if this is only valid for certain media
                 if (!empty($match['media'])) {
-                    $importContent = '@media '.$match['media'].'{'.$importContent.'}';
+                    $importContent = '@media ' . $match['media'] . '{' . $importContent . '}';
                 }
 
                 // add to replacement array
@@ -254,7 +254,7 @@ 
     protected function importFiles($source, $content)
     {
         $extensions = array_keys($this->importExtensions);
-        $regex = '/url\((["\']?)((?!["\']?data:).*?\.('.implode('|', $extensions).'))\\1\)/i';
+        $regex = '/url\((["\']?)((?!["\']?data:).*?\.(' . implode('|', $extensions) . '))\\1\)/i';
         if ($extensions && preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
             $search = array();
             $replace = array();
@@ -263,7 +263,7 @@ 
             foreach ($matches as $match) {
                 // get the path for the file that will be imported
                 $path = $match[2];
-                $path = dirname($source).'/'.$path;
+                $path = dirname($source) . '/' . $path;
                 $extension = $match[3];
 
                 // only replace the import with the content if we're able to get
@@ -275,7 +275,7 @@ 
 
                     // build replacement
                     $search[] = $match[0];
-                    $replace[] = 'url('.$this->importExtensions[$extension].';base64,'.$importContent.')';
+                    $replace[] = 'url(' . $this->importExtensions[$extension] . ';base64,' . $importContent . ')';
                 }
             }
 
@@ -463,9 +463,9 @@ 
             // build replacement
             $search[] = $match[0];
             if ($type == 'url') {
-                $replace[] = 'url('.$url.')';
+                $replace[] = 'url(' . $url . ')';
             } elseif ($type == 'import') {
-                $replace[] = '@import "'.$url.'"';
+                $replace[] = '@import "' . $url . '"';
             }
         }
 
@@ -519,8 +519,8 @@ 
         );
 
         return preg_replace_callback(
-            '/(?<=[: ])('.implode(array_keys($colors), '|').')(?=[; }])/i',
-            function ($match) use ($colors) {
+            '/(?<=[: ])(' . implode(array_keys($colors), '|') . ')(?=[; }])/i',
+            function($match) use ($colors) {
                 return $colors[strtoupper($match[0])];
             },
             $content
@@ -541,11 +541,11 @@ 
             'bold' => 700,
         );
 
-        $callback = function ($match) use ($weights) {
-            return $match[1].$weights[$match[2]];
+        $callback = function($match) use ($weights) {
+            return $match[1] . $weights[$match[2]];
         };
 
-        return preg_replace_callback('/(font-weight\s*:\s*)('.implode('|', array_keys($weights)).')(?=[;}])/', $callback, $content);
+        return preg_replace_callback('/(font-weight\s*:\s*)(' . implode('|', array_keys($weights)) . ')(?=[;}])/', $callback, $content);
     }
 
     /**
@@ -571,19 +571,19 @@ 
         // practice, Webkit (especially Safari) seems to stumble over at least
         // 0%, potentially other units as well. Only stripping 'px' for now.
         // @see https://github.com/matthiasmullie/minify/issues/60
-        $content = preg_replace('/'.$before.'(-?0*(\.0+)?)(?<=0)px'.$after.'/', '\\1', $content);
+        $content = preg_replace('/' . $before . '(-?0*(\.0+)?)(?<=0)px' . $after . '/', '\\1', $content);
 
         // strip 0-digits (.0 -> 0)
-        $content = preg_replace('/'.$before.'\.0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '\.0+' . $units . '?' . $after . '/', '0\\1', $content);
         // strip trailing 0: 50.10 -> 50.1, 50.10px -> 50.1px
-        $content = preg_replace('/'.$before.'(-?[0-9]+\.[0-9]+)0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+\.[0-9]+)0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip trailing 0: 50.00 -> 50, 50.00px -> 50px
-        $content = preg_replace('/'.$before.'(-?[0-9]+)\.0+'.$units.'?'.$after.'/', '\\1\\2', $content);
+        $content = preg_replace('/' . $before . '(-?[0-9]+)\.0+' . $units . '?' . $after . '/', '\\1\\2', $content);
         // strip leading 0: 0.1 -> .1, 01.1 -> 1.1
-        $content = preg_replace('/'.$before.'(-?)0+([0-9]*\.[0-9]+)'.$units.'?'.$after.'/', '\\1\\2\\3', $content);
+        $content = preg_replace('/' . $before . '(-?)0+([0-9]*\.[0-9]+)' . $units . '?' . $after . '/', '\\1\\2\\3', $content);
 
         // strip negative zeroes (-0 -> 0) & truncate zeroes (00 -> 0)
-        $content = preg_replace('/'.$before.'-?0+'.$units.'?'.$after.'/', '0\\1', $content);
+        $content = preg_replace('/' . $before . '-?0+' . $units . '?' . $after . '/', '0\\1', $content);
 
         // remove zeroes where they make no sense in calc: e.g. calc(100px - 0)
         // the 0 doesn't have any effect, and this isn't even valid without unit

Sources/minify/src/JS.php

Indentation +415 added lines, -415 removed lines

@@ -14,134 +14,134 @@ 
  */
 class JS extends Minify
 {
-    /**
-     * Var-matching regex based on http://stackoverflow.com/a/9337047/802993.
-     *
-     * Note that regular expressions using that bit must have the PCRE_UTF8
-     * pattern modifier (/u) set.
-     *
-     * @var string
-     */
-    const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b';
-
-    /**
-     * Full list of JavaScript reserved words.
-     * Will be loaded from /data/js/keywords_reserved.txt.
-     *
-     * @see https://mathiasbynens.be/notes/reserved-keywords
-     *
-     * @var string[]
-     */
-    protected $keywordsReserved = array();
-
-    /**
-     * List of JavaScript reserved words that accept a <variable, value, ...>
-     * after them. Some end of lines are not the end of a statement, like with
-     * these keywords.
-     *
-     * E.g.: we shouldn't insert a ; after this else
-     * else
-     *     console.log('this is quite fine')
-     *
-     * Will be loaded from /data/js/keywords_before.txt
-     *
-     * @var string[]
-     */
-    protected $keywordsBefore = array();
-
-    /**
-     * List of JavaScript reserved words that accept a <variable, value, ...>
-     * before them. Some end of lines are not the end of a statement, like when
-     * continued by one of these keywords on the newline.
-     *
-     * E.g.: we shouldn't insert a ; before this instanceof
-     * variable
-     *     instanceof String
-     *
-     * Will be loaded from /data/js/keywords_after.txt
-     *
-     * @var string[]
-     */
-    protected $keywordsAfter = array();
-
-    /**
-     * List of all JavaScript operators.
-     *
-     * Will be loaded from /data/js/operators.txt
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
-     *
-     * @var string[]
-     */
-    protected $operators = array();
-
-    /**
-     * List of JavaScript operators that accept a <variable, value, ...> after
-     * them. Some end of lines are not the end of a statement, like with these
-     * operators.
-     *
-     * Note: Most operators are fine, we've only removed !, ++ and --.
-     * There can't be a newline separating ! and whatever it is negating.
-     * ++ & -- have to be joined with the value they're in-/decrementing.
-     *
-     * Will be loaded from /data/js/operators_before.txt
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
-     *
-     * @var string[]
-     */
-    protected $operatorsBefore = array();
-
-    /**
-     * List of JavaScript operators that accept a <variable, value, ...> before
-     * them. Some end of lines are not the end of a statement, like when
-     * continued by one of these operators on the newline.
-     *
-     * Note: Most operators are fine, we've only removed ), ], ++ and --.
-     * ++ & -- have to be joined with the value they're in-/decrementing.
-     * ) & ] are "special" in that they have lots or usecases. () for example
-     * is used for function calls, for grouping, in if () and for (), ...
-     *
-     * Will be loaded from /data/js/operators_after.txt
-     *
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
-     *
-     * @var string[]
-     */
-    protected $operatorsAfter = array();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct()
-    {
-        call_user_func_array(array('parent', '__construct'), func_get_args());
-
-        $dataDir = __DIR__.'/../data/js/';
-        $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operators = file($dataDir.'operators.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
-    }
-
-    /**
-     * Minify the data.
-     * Perform JS optimizations.
-     *
-     * @param string[optional] $path Path to write the data to
-     *
-     * @return string The minified data
-     */
-    public function execute($path = null)
-    {
-        $content = '';
-
-        // loop files
-        foreach ($this->data as $source => $js) {
-            /*
+	/**
+	 * Var-matching regex based on http://stackoverflow.com/a/9337047/802993.
+	 *
+	 * Note that regular expressions using that bit must have the PCRE_UTF8
+	 * pattern modifier (/u) set.
+	 *
+	 * @var string
+	 */
+	const REGEX_VARIABLE = '\b[$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}][$A-Z\_a-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\x{02c1}\x{02c6}-\x{02d1}\x{02e0}-\x{02e4}\x{02ec}\x{02ee}\x{0370}-\x{0374}\x{0376}\x{0377}\x{037a}-\x{037d}\x{0386}\x{0388}-\x{038a}\x{038c}\x{038e}-\x{03a1}\x{03a3}-\x{03f5}\x{03f7}-\x{0481}\x{048a}-\x{0527}\x{0531}-\x{0556}\x{0559}\x{0561}-\x{0587}\x{05d0}-\x{05ea}\x{05f0}-\x{05f2}\x{0620}-\x{064a}\x{066e}\x{066f}\x{0671}-\x{06d3}\x{06d5}\x{06e5}\x{06e6}\x{06ee}\x{06ef}\x{06fa}-\x{06fc}\x{06ff}\x{0710}\x{0712}-\x{072f}\x{074d}-\x{07a5}\x{07b1}\x{07ca}-\x{07ea}\x{07f4}\x{07f5}\x{07fa}\x{0800}-\x{0815}\x{081a}\x{0824}\x{0828}\x{0840}-\x{0858}\x{08a0}\x{08a2}-\x{08ac}\x{0904}-\x{0939}\x{093d}\x{0950}\x{0958}-\x{0961}\x{0971}-\x{0977}\x{0979}-\x{097f}\x{0985}-\x{098c}\x{098f}\x{0990}\x{0993}-\x{09a8}\x{09aa}-\x{09b0}\x{09b2}\x{09b6}-\x{09b9}\x{09bd}\x{09ce}\x{09dc}\x{09dd}\x{09df}-\x{09e1}\x{09f0}\x{09f1}\x{0a05}-\x{0a0a}\x{0a0f}\x{0a10}\x{0a13}-\x{0a28}\x{0a2a}-\x{0a30}\x{0a32}\x{0a33}\x{0a35}\x{0a36}\x{0a38}\x{0a39}\x{0a59}-\x{0a5c}\x{0a5e}\x{0a72}-\x{0a74}\x{0a85}-\x{0a8d}\x{0a8f}-\x{0a91}\x{0a93}-\x{0aa8}\x{0aaa}-\x{0ab0}\x{0ab2}\x{0ab3}\x{0ab5}-\x{0ab9}\x{0abd}\x{0ad0}\x{0ae0}\x{0ae1}\x{0b05}-\x{0b0c}\x{0b0f}\x{0b10}\x{0b13}-\x{0b28}\x{0b2a}-\x{0b30}\x{0b32}\x{0b33}\x{0b35}-\x{0b39}\x{0b3d}\x{0b5c}\x{0b5d}\x{0b5f}-\x{0b61}\x{0b71}\x{0b83}\x{0b85}-\x{0b8a}\x{0b8e}-\x{0b90}\x{0b92}-\x{0b95}\x{0b99}\x{0b9a}\x{0b9c}\x{0b9e}\x{0b9f}\x{0ba3}\x{0ba4}\x{0ba8}-\x{0baa}\x{0bae}-\x{0bb9}\x{0bd0}\x{0c05}-\x{0c0c}\x{0c0e}-\x{0c10}\x{0c12}-\x{0c28}\x{0c2a}-\x{0c33}\x{0c35}-\x{0c39}\x{0c3d}\x{0c58}\x{0c59}\x{0c60}\x{0c61}\x{0c85}-\x{0c8c}\x{0c8e}-\x{0c90}\x{0c92}-\x{0ca8}\x{0caa}-\x{0cb3}\x{0cb5}-\x{0cb9}\x{0cbd}\x{0cde}\x{0ce0}\x{0ce1}\x{0cf1}\x{0cf2}\x{0d05}-\x{0d0c}\x{0d0e}-\x{0d10}\x{0d12}-\x{0d3a}\x{0d3d}\x{0d4e}\x{0d60}\x{0d61}\x{0d7a}-\x{0d7f}\x{0d85}-\x{0d96}\x{0d9a}-\x{0db1}\x{0db3}-\x{0dbb}\x{0dbd}\x{0dc0}-\x{0dc6}\x{0e01}-\x{0e30}\x{0e32}\x{0e33}\x{0e40}-\x{0e46}\x{0e81}\x{0e82}\x{0e84}\x{0e87}\x{0e88}\x{0e8a}\x{0e8d}\x{0e94}-\x{0e97}\x{0e99}-\x{0e9f}\x{0ea1}-\x{0ea3}\x{0ea5}\x{0ea7}\x{0eaa}\x{0eab}\x{0ead}-\x{0eb0}\x{0eb2}\x{0eb3}\x{0ebd}\x{0ec0}-\x{0ec4}\x{0ec6}\x{0edc}-\x{0edf}\x{0f00}\x{0f40}-\x{0f47}\x{0f49}-\x{0f6c}\x{0f88}-\x{0f8c}\x{1000}-\x{102a}\x{103f}\x{1050}-\x{1055}\x{105a}-\x{105d}\x{1061}\x{1065}\x{1066}\x{106e}-\x{1070}\x{1075}-\x{1081}\x{108e}\x{10a0}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{10fa}\x{10fc}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1380}-\x{138f}\x{13a0}-\x{13f4}\x{1401}-\x{166c}\x{166f}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16ea}\x{16ee}-\x{16f0}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17d7}\x{17dc}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191c}\x{1950}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19c1}-\x{19c7}\x{1a00}-\x{1a16}\x{1a20}-\x{1a54}\x{1aa7}\x{1b05}-\x{1b33}\x{1b45}-\x{1b4b}\x{1b83}-\x{1ba0}\x{1bae}\x{1baf}\x{1bba}-\x{1be5}\x{1c00}-\x{1c23}\x{1c4d}-\x{1c4f}\x{1c5a}-\x{1c7d}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf1}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{2160}-\x{2188}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{2e2f}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{31a0}-\x{31ba}\x{31f0}-\x{31ff}\x{3400}-\x{4db5}\x{4e00}-\x{9fcc}\x{a000}-\x{a48c}\x{a4d0}-\x{a4fd}\x{a500}-\x{a60c}\x{a610}-\x{a61f}\x{a62a}\x{a62b}\x{a640}-\x{a66e}\x{a67f}-\x{a697}\x{a6a0}-\x{a6ef}\x{a717}-\x{a71f}\x{a722}-\x{a788}\x{a78b}-\x{a78e}\x{a790}-\x{a793}\x{a7a0}-\x{a7aa}\x{a7f8}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a822}\x{a840}-\x{a873}\x{a882}-\x{a8b3}\x{a8f2}-\x{a8f7}\x{a8fb}\x{a90a}-\x{a925}\x{a930}-\x{a946}\x{a960}-\x{a97c}\x{a984}-\x{a9b2}\x{a9cf}\x{aa00}-\x{aa28}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa60}-\x{aa76}\x{aa7a}\x{aa80}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aadd}\x{aae0}-\x{aaea}\x{aaf2}-\x{aaf4}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{abc0}-\x{abe2}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{f900}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb36}\x{fb38}-\x{fb3c}\x{fb3e}\x{fb40}\x{fb41}\x{fb43}\x{fb44}\x{fb46}-\x{fbb1}\x{fbd3}-\x{fd3d}\x{fd50}-\x{fd8f}\x{fd92}-\x{fdc7}\x{fdf0}-\x{fdfb}\x{fe70}-\x{fe74}\x{fe76}-\x{fefc}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}0-9\x{0300}-\x{036f}\x{0483}-\x{0487}\x{0591}-\x{05bd}\x{05bf}\x{05c1}\x{05c2}\x{05c4}\x{05c5}\x{05c7}\x{0610}-\x{061a}\x{064b}-\x{0669}\x{0670}\x{06d6}-\x{06dc}\x{06df}-\x{06e4}\x{06e7}\x{06e8}\x{06ea}-\x{06ed}\x{06f0}-\x{06f9}\x{0711}\x{0730}-\x{074a}\x{07a6}-\x{07b0}\x{07c0}-\x{07c9}\x{07eb}-\x{07f3}\x{0816}-\x{0819}\x{081b}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082d}\x{0859}-\x{085b}\x{08e4}-\x{08fe}\x{0900}-\x{0903}\x{093a}-\x{093c}\x{093e}-\x{094f}\x{0951}-\x{0957}\x{0962}\x{0963}\x{0966}-\x{096f}\x{0981}-\x{0983}\x{09bc}\x{09be}-\x{09c4}\x{09c7}\x{09c8}\x{09cb}-\x{09cd}\x{09d7}\x{09e2}\x{09e3}\x{09e6}-\x{09ef}\x{0a01}-\x{0a03}\x{0a3c}\x{0a3e}-\x{0a42}\x{0a47}\x{0a48}\x{0a4b}-\x{0a4d}\x{0a51}\x{0a66}-\x{0a71}\x{0a75}\x{0a81}-\x{0a83}\x{0abc}\x{0abe}-\x{0ac5}\x{0ac7}-\x{0ac9}\x{0acb}-\x{0acd}\x{0ae2}\x{0ae3}\x{0ae6}-\x{0aef}\x{0b01}-\x{0b03}\x{0b3c}\x{0b3e}-\x{0b44}\x{0b47}\x{0b48}\x{0b4b}-\x{0b4d}\x{0b56}\x{0b57}\x{0b62}\x{0b63}\x{0b66}-\x{0b6f}\x{0b82}\x{0bbe}-\x{0bc2}\x{0bc6}-\x{0bc8}\x{0bca}-\x{0bcd}\x{0bd7}\x{0be6}-\x{0bef}\x{0c01}-\x{0c03}\x{0c3e}-\x{0c44}\x{0c46}-\x{0c48}\x{0c4a}-\x{0c4d}\x{0c55}\x{0c56}\x{0c62}\x{0c63}\x{0c66}-\x{0c6f}\x{0c82}\x{0c83}\x{0cbc}\x{0cbe}-\x{0cc4}\x{0cc6}-\x{0cc8}\x{0cca}-\x{0ccd}\x{0cd5}\x{0cd6}\x{0ce2}\x{0ce3}\x{0ce6}-\x{0cef}\x{0d02}\x{0d03}\x{0d3e}-\x{0d44}\x{0d46}-\x{0d48}\x{0d4a}-\x{0d4d}\x{0d57}\x{0d62}\x{0d63}\x{0d66}-\x{0d6f}\x{0d82}\x{0d83}\x{0dca}\x{0dcf}-\x{0dd4}\x{0dd6}\x{0dd8}-\x{0ddf}\x{0df2}\x{0df3}\x{0e31}\x{0e34}-\x{0e3a}\x{0e47}-\x{0e4e}\x{0e50}-\x{0e59}\x{0eb1}\x{0eb4}-\x{0eb9}\x{0ebb}\x{0ebc}\x{0ec8}-\x{0ecd}\x{0ed0}-\x{0ed9}\x{0f18}\x{0f19}\x{0f20}-\x{0f29}\x{0f35}\x{0f37}\x{0f39}\x{0f3e}\x{0f3f}\x{0f71}-\x{0f84}\x{0f86}\x{0f87}\x{0f8d}-\x{0f97}\x{0f99}-\x{0fbc}\x{0fc6}\x{102b}-\x{103e}\x{1040}-\x{1049}\x{1056}-\x{1059}\x{105e}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106d}\x{1071}-\x{1074}\x{1082}-\x{108d}\x{108f}-\x{109d}\x{135d}-\x{135f}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}\x{1753}\x{1772}\x{1773}\x{17b4}-\x{17d3}\x{17dd}\x{17e0}-\x{17e9}\x{180b}-\x{180d}\x{1810}-\x{1819}\x{18a9}\x{1920}-\x{192b}\x{1930}-\x{193b}\x{1946}-\x{194f}\x{19b0}-\x{19c0}\x{19c8}\x{19c9}\x{19d0}-\x{19d9}\x{1a17}-\x{1a1b}\x{1a55}-\x{1a5e}\x{1a60}-\x{1a7c}\x{1a7f}-\x{1a89}\x{1a90}-\x{1a99}\x{1b00}-\x{1b04}\x{1b34}-\x{1b44}\x{1b50}-\x{1b59}\x{1b6b}-\x{1b73}\x{1b80}-\x{1b82}\x{1ba1}-\x{1bad}\x{1bb0}-\x{1bb9}\x{1be6}-\x{1bf3}\x{1c24}-\x{1c37}\x{1c40}-\x{1c49}\x{1c50}-\x{1c59}\x{1cd0}-\x{1cd2}\x{1cd4}-\x{1ce8}\x{1ced}\x{1cf2}-\x{1cf4}\x{1dc0}-\x{1de6}\x{1dfc}-\x{1dff}\x{200c}\x{200d}\x{203f}\x{2040}\x{2054}\x{20d0}-\x{20dc}\x{20e1}\x{20e5}-\x{20f0}\x{2cef}-\x{2cf1}\x{2d7f}\x{2de0}-\x{2dff}\x{302a}-\x{302f}\x{3099}\x{309a}\x{a620}-\x{a629}\x{a66f}\x{a674}-\x{a67d}\x{a69f}\x{a6f0}\x{a6f1}\x{a802}\x{a806}\x{a80b}\x{a823}-\x{a827}\x{a880}\x{a881}\x{a8b4}-\x{a8c4}\x{a8d0}-\x{a8d9}\x{a8e0}-\x{a8f1}\x{a900}-\x{a909}\x{a926}-\x{a92d}\x{a947}-\x{a953}\x{a980}-\x{a983}\x{a9b3}-\x{a9c0}\x{a9d0}-\x{a9d9}\x{aa29}-\x{aa36}\x{aa43}\x{aa4c}\x{aa4d}\x{aa50}-\x{aa59}\x{aa7b}\x{aab0}\x{aab2}-\x{aab4}\x{aab7}\x{aab8}\x{aabe}\x{aabf}\x{aac1}\x{aaeb}-\x{aaef}\x{aaf5}\x{aaf6}\x{abe3}-\x{abea}\x{abec}\x{abed}\x{abf0}-\x{abf9}\x{fb1e}\x{fe00}-\x{fe0f}\x{fe20}-\x{fe26}\x{fe33}\x{fe34}\x{fe4d}-\x{fe4f}\x{ff10}-\x{ff19}\x{ff3f}]*\b';
+
+	/**
+	 * Full list of JavaScript reserved words.
+	 * Will be loaded from /data/js/keywords_reserved.txt.
+	 *
+	 * @see https://mathiasbynens.be/notes/reserved-keywords
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsReserved = array();
+
+	/**
+	 * List of JavaScript reserved words that accept a <variable, value, ...>
+	 * after them. Some end of lines are not the end of a statement, like with
+	 * these keywords.
+	 *
+	 * E.g.: we shouldn't insert a ; after this else
+	 * else
+	 *     console.log('this is quite fine')
+	 *
+	 * Will be loaded from /data/js/keywords_before.txt
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsBefore = array();
+
+	/**
+	 * List of JavaScript reserved words that accept a <variable, value, ...>
+	 * before them. Some end of lines are not the end of a statement, like when
+	 * continued by one of these keywords on the newline.
+	 *
+	 * E.g.: we shouldn't insert a ; before this instanceof
+	 * variable
+	 *     instanceof String
+	 *
+	 * Will be loaded from /data/js/keywords_after.txt
+	 *
+	 * @var string[]
+	 */
+	protected $keywordsAfter = array();
+
+	/**
+	 * List of all JavaScript operators.
+	 *
+	 * Will be loaded from /data/js/operators.txt
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
+	 *
+	 * @var string[]
+	 */
+	protected $operators = array();
+
+	/**
+	 * List of JavaScript operators that accept a <variable, value, ...> after
+	 * them. Some end of lines are not the end of a statement, like with these
+	 * operators.
+	 *
+	 * Note: Most operators are fine, we've only removed !, ++ and --.
+	 * There can't be a newline separating ! and whatever it is negating.
+	 * ++ & -- have to be joined with the value they're in-/decrementing.
+	 *
+	 * Will be loaded from /data/js/operators_before.txt
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
+	 *
+	 * @var string[]
+	 */
+	protected $operatorsBefore = array();
+
+	/**
+	 * List of JavaScript operators that accept a <variable, value, ...> before
+	 * them. Some end of lines are not the end of a statement, like when
+	 * continued by one of these operators on the newline.
+	 *
+	 * Note: Most operators are fine, we've only removed ), ], ++ and --.
+	 * ++ & -- have to be joined with the value they're in-/decrementing.
+	 * ) & ] are "special" in that they have lots or usecases. () for example
+	 * is used for function calls, for grouping, in if () and for (), ...
+	 *
+	 * Will be loaded from /data/js/operators_after.txt
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators
+	 *
+	 * @var string[]
+	 */
+	protected $operatorsAfter = array();
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct()
+	{
+		call_user_func_array(array('parent', '__construct'), func_get_args());
+
+		$dataDir = __DIR__.'/../data/js/';
+		$options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
+		$this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
+		$this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
+		$this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
+		$this->operators = file($dataDir.'operators.txt', $options);
+		$this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
+		$this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+	}
+
+	/**
+	 * Minify the data.
+	 * Perform JS optimizations.
+	 *
+	 * @param string[optional] $path Path to write the data to
+	 *
+	 * @return string The minified data
+	 */
+	public function execute($path = null)
+	{
+		$content = '';
+
+		// loop files
+		foreach ($this->data as $source => $js) {
+			/*
              * Combine js: separating the scripts by a ;
              * I'm also adding a newline: it will be eaten when whitespace is
              * stripped, but we need to make sure we're not just appending
@@ -149,10 +149,10 @@ 
              * singe-line comment on the last line (in which case it would also
              * be seen as part of that comment)
              */
-            $content .= $js."\n;";
-        }
+			$content .= $js."\n;";
+		}
 
-        /*
+		/*
          * Let's first take out strings, comments and regular expressions.
          * All of these can contain JS code-like characters, and we should make
          * sure any further magic ignores anything inside of these.
@@ -163,164 +163,164 @@ 
          * Comments will be removed altogether, strings and regular expressions
          * will be replaced by placeholder text, which we'll restore later.
          */
-        $this->extractStrings('\'"`');
-        $this->stripComments();
-        $this->extractRegex();
-        $content = $this->replace($content);
+		$this->extractStrings('\'"`');
+		$this->stripComments();
+		$this->extractRegex();
+		$content = $this->replace($content);
 
-        $content = $this->propertyNotation($content);
-        $content = $this->shortenBools($content);
-        $content = $this->stripWhitespace($content);
+		$content = $this->propertyNotation($content);
+		$content = $this->shortenBools($content);
+		$content = $this->stripWhitespace($content);
 
-        /*
+		/*
          * Earlier, we extracted strings & regular expressions and replaced them
          * with placeholder text. This will restore them.
          */
-        $content = $this->restoreExtractedData($content);
-
-        return $content;
-    }
-
-    /**
-     * Strip comments from source code.
-     */
-    protected function stripComments()
-    {
-        // single-line comments
-        $this->registerPattern('/\/\/.*$/m', '');
-
-        // multi-line comments
-        $this->registerPattern('/\/\*.*?\*\//s', '');
-    }
-
-    /**
-     * JS can have /-delimited regular expressions, like: /ab+c/.match(string).
-     *
-     * The content inside the regex can contain characters that may be confused
-     * for JS code: e.g. it could contain whitespace it needs to match & we
-     * don't want to strip whitespace in there.
-     *
-     * The regex can be pretty simple: we don't have to care about comments,
-     * (which also use slashes) because stripComments() will have stripped those
-     * already.
-     *
-     * This method will replace all string content with simple REGEX#
-     * placeholder text, so we've rid all regular expressions from characters
-     * that may be misinterpreted. Original regex content will be saved in
-     * $this->extracted and after doing all other minifying, we can restore the
-     * original content via restoreRegex()
-     */
-    protected function extractRegex()
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            $count = count($minifier->extracted);
-            $placeholder = '/'.$count.'/';
-            $minifier->extracted[$placeholder] = $match[0];
-
-            return $placeholder;
-        };
-
-        $pattern = '\/.+?(?<!\\\\)(\\\\\\\\)*\/[gimy]*(?![0-9a-zA-Z\/])';
-
-        // a regular expression can only be followed by a few operators or some
-        // of the RegExp methods (a `\` followed by a variable or value is
-        // likely part of a division, not a regex)
-        $after = '[\.,;\)\}]';
-        $methods = '\.(exec|test|match|search|replace|split)\(';
-        $this->registerPattern('/'.$pattern.'(?=\s*('.$after.'|'.$methods.'))/', $callback);
-
-        // 1 more edge case: a regex can be followed by a lot more operators or
-        // keywords if there's a newline (ASI) in between, where the operator
-        // actually starts a new statement
-        // (https://github.com/matthiasmullie/minify/issues/56)
-        $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
-        $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/'.$pattern.'\s*\n(?=\s*('.implode('|', $operators).'))/', $callback);
-    }
-
-    /**
-     * Strip whitespace.
-     *
-     * We won't strip *all* whitespace, but as much as possible. The thing that
-     * we'll preserve are newlines we're unsure about.
-     * JavaScript doesn't require statements to be terminated with a semicolon.
-     * It will automatically fix missing semicolons with ASI (automatic semi-
-     * colon insertion) at the end of line causing errors (without semicolon.)
-     *
-     * Because it's sometimes hard to tell if a newline is part of a statement
-     * that should be terminated or not, we'll just leave some of them alone.
-     *
-     * @param string $content The content to strip the whitespace for
-     *
-     * @return string
-     */
-    protected function stripWhitespace($content)
-    {
-        // uniform line endings, make them all line feed
-        $content = str_replace(array("\r\n", "\r"), "\n", $content);
-
-        // collapse all non-line feed whitespace into a single space
-        $content = preg_replace('/[^\S\n]+/', ' ', $content);
-
-        // strip leading & trailing whitespace
-        $content = str_replace(array(" \n", "\n "), "\n", $content);
-
-        // collapse consecutive line feeds into just 1
-        $content = preg_replace('/\n+/', "\n", $content);
-
-        $operatorsBefore = $this->getOperatorsForRegex($this->operatorsBefore, '/');
-        $operatorsAfter = $this->getOperatorsForRegex($this->operatorsAfter, '/');
-        $operators = $this->getOperatorsForRegex($this->operators, '/');
-        $keywordsBefore = $this->getKeywordsForRegex($this->keywordsBefore, '/');
-        $keywordsAfter = $this->getKeywordsForRegex($this->keywordsAfter, '/');
-
-        // strip whitespace that ends in (or next line begin with) an operator
-        // that allows statements to be broken up over multiple lines
-        unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']);
-        $content = preg_replace(
-            array(
-                '/('.implode('|', $operatorsBefore).')\s+/',
-                '/\s+('.implode('|', $operatorsAfter).')/',
-            ), '\\1', $content
-        );
-
-        // make sure + and - can't be mistaken for, or joined into ++ and --
-        $content = preg_replace(
-            array(
-                '/(?<![\+\-])\s*([\+\-])(?![\+\-])/',
-                '/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
-            ), '\\1', $content
-        );
-
-        // collapse whitespace around reserved words into single space
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $keywordsBefore).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $keywordsAfter).')(?=([;\{\s]|$))/', ' \\1', $content);
-
-        /*
+		$content = $this->restoreExtractedData($content);
+
+		return $content;
+	}
+
+	/**
+	 * Strip comments from source code.
+	 */
+	protected function stripComments()
+	{
+		// single-line comments
+		$this->registerPattern('/\/\/.*$/m', '');
+
+		// multi-line comments
+		$this->registerPattern('/\/\*.*?\*\//s', '');
+	}
+
+	/**
+	 * JS can have /-delimited regular expressions, like: /ab+c/.match(string).
+	 *
+	 * The content inside the regex can contain characters that may be confused
+	 * for JS code: e.g. it could contain whitespace it needs to match & we
+	 * don't want to strip whitespace in there.
+	 *
+	 * The regex can be pretty simple: we don't have to care about comments,
+	 * (which also use slashes) because stripComments() will have stripped those
+	 * already.
+	 *
+	 * This method will replace all string content with simple REGEX#
+	 * placeholder text, so we've rid all regular expressions from characters
+	 * that may be misinterpreted. Original regex content will be saved in
+	 * $this->extracted and after doing all other minifying, we can restore the
+	 * original content via restoreRegex()
+	 */
+	protected function extractRegex()
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$callback = function ($match) use ($minifier) {
+			$count = count($minifier->extracted);
+			$placeholder = '/'.$count.'/';
+			$minifier->extracted[$placeholder] = $match[0];
+
+			return $placeholder;
+		};
+
+		$pattern = '\/.+?(?<!\\\\)(\\\\\\\\)*\/[gimy]*(?![0-9a-zA-Z\/])';
+
+		// a regular expression can only be followed by a few operators or some
+		// of the RegExp methods (a `\` followed by a variable or value is
+		// likely part of a division, not a regex)
+		$after = '[\.,;\)\}]';
+		$methods = '\.(exec|test|match|search|replace|split)\(';
+		$this->registerPattern('/'.$pattern.'(?=\s*('.$after.'|'.$methods.'))/', $callback);
+
+		// 1 more edge case: a regex can be followed by a lot more operators or
+		// keywords if there's a newline (ASI) in between, where the operator
+		// actually starts a new statement
+		// (https://github.com/matthiasmullie/minify/issues/56)
+		$operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
+		$operators += $this->getOperatorsForRegex($this->keywordsReserved, '/');
+		$this->registerPattern('/'.$pattern.'\s*\n(?=\s*('.implode('|', $operators).'))/', $callback);
+	}
+
+	/**
+	 * Strip whitespace.
+	 *
+	 * We won't strip *all* whitespace, but as much as possible. The thing that
+	 * we'll preserve are newlines we're unsure about.
+	 * JavaScript doesn't require statements to be terminated with a semicolon.
+	 * It will automatically fix missing semicolons with ASI (automatic semi-
+	 * colon insertion) at the end of line causing errors (without semicolon.)
+	 *
+	 * Because it's sometimes hard to tell if a newline is part of a statement
+	 * that should be terminated or not, we'll just leave some of them alone.
+	 *
+	 * @param string $content The content to strip the whitespace for
+	 *
+	 * @return string
+	 */
+	protected function stripWhitespace($content)
+	{
+		// uniform line endings, make them all line feed
+		$content = str_replace(array("\r\n", "\r"), "\n", $content);
+
+		// collapse all non-line feed whitespace into a single space
+		$content = preg_replace('/[^\S\n]+/', ' ', $content);
+
+		// strip leading & trailing whitespace
+		$content = str_replace(array(" \n", "\n "), "\n", $content);
+
+		// collapse consecutive line feeds into just 1
+		$content = preg_replace('/\n+/', "\n", $content);
+
+		$operatorsBefore = $this->getOperatorsForRegex($this->operatorsBefore, '/');
+		$operatorsAfter = $this->getOperatorsForRegex($this->operatorsAfter, '/');
+		$operators = $this->getOperatorsForRegex($this->operators, '/');
+		$keywordsBefore = $this->getKeywordsForRegex($this->keywordsBefore, '/');
+		$keywordsAfter = $this->getKeywordsForRegex($this->keywordsAfter, '/');
+
+		// strip whitespace that ends in (or next line begin with) an operator
+		// that allows statements to be broken up over multiple lines
+		unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']);
+		$content = preg_replace(
+			array(
+				'/('.implode('|', $operatorsBefore).')\s+/',
+				'/\s+('.implode('|', $operatorsAfter).')/',
+			), '\\1', $content
+		);
+
+		// make sure + and - can't be mistaken for, or joined into ++ and --
+		$content = preg_replace(
+			array(
+				'/(?<![\+\-])\s*([\+\-])(?![\+\-])/',
+				'/(?<![\+\-])([\+\-])\s*(?![\+\-])/',
+			), '\\1', $content
+		);
+
+		// collapse whitespace around reserved words into single space
+		$content = preg_replace('/(^|[;\}\s])\K('.implode('|', $keywordsBefore).')\s+/', '\\2 ', $content);
+		$content = preg_replace('/\s+('.implode('|', $keywordsAfter).')(?=([;\{\s]|$))/', ' \\1', $content);
+
+		/*
          * We didn't strip whitespace after a couple of operators because they
          * could be used in different contexts and we can't be sure it's ok to
          * strip the newlines. However, we can safely strip any non-line feed
          * whitespace that follows them.
          */
-        $operatorsDiffBefore = array_diff($operators, $operatorsBefore);
-        $operatorsDiffAfter = array_diff($operators, $operatorsAfter);
-        $content = preg_replace('/('.implode('|', $operatorsDiffBefore).')[^\S\n]+/', '\\1', $content);
-        $content = preg_replace('/[^\S\n]+('.implode('|', $operatorsDiffAfter).')/', '\\1', $content);
+		$operatorsDiffBefore = array_diff($operators, $operatorsBefore);
+		$operatorsDiffAfter = array_diff($operators, $operatorsAfter);
+		$content = preg_replace('/('.implode('|', $operatorsDiffBefore).')[^\S\n]+/', '\\1', $content);
+		$content = preg_replace('/[^\S\n]+('.implode('|', $operatorsDiffAfter).')/', '\\1', $content);
 
-        /*
+		/*
          * Get rid of double semicolons, except where they can be used like:
          * "for(v=1,_=b;;)", "for(v=1;;v++)" or "for(;;ja||(ja=true))".
          * I'll safeguard these double semicolons inside for-loops by
          * temporarily replacing them with an invalid condition: they won't have
          * a double semicolon and will be easy to spot to restore afterwards.
          */
-        $content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content);
-        $content = preg_replace('/;+/', ';', $content);
-        $content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content);
+		$content = preg_replace('/\bfor\(([^;]*);;([^;]*)\)/', 'for(\\1;-;\\2)', $content);
+		$content = preg_replace('/;+/', ';', $content);
+		$content = preg_replace('/\bfor\(([^;]*);-;([^;]*)\)/', 'for(\\1;;\\2)', $content);
 
-        /*
+		/*
          * Next, we'll be removing all semicolons where ASI kicks in.
          * for-loops however, can have an empty body (ending in only a
          * semicolon), like: `for(i=1;i<3;i++);`
@@ -330,9 +330,9 @@ 
          * I'm going to double that semicolon (if any) so after the next line,
          * which strips semicolons here & there, we're still left with this one.
          */
-        $content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content);
+		$content = preg_replace('/(for\([^;]*;[^;]*;[^;\{]*\));(\}|$)/s', '\\1;;\\2', $content);
 
-        /*
+		/*
          * We also can't strip empty else-statements. Even though they're
          * useless and probably shouldn't be in the code in the first place, we
          * shouldn't be stripping the `;` that follows it as it breaks the code.
@@ -340,114 +340,114 @@ 
          *
          * @see https://github.com/matthiasmullie/minify/issues/91
          */
-        $content = preg_replace('/else;/s', '', $content);
+		$content = preg_replace('/else;/s', '', $content);
 
-        /*
+		/*
          * We also don't really want to terminate statements followed by closing
          * curly braces (which we've ignored completely up until now) or end-of-
          * script: ASI will kick in here & we're all about minifying.
          * Semicolons at beginning of the file don't make any sense either.
          */
-        $content = preg_replace('/;(\}|$)/s', '\\1', $content);
-        $content = ltrim($content, ';');
-
-        // get rid of remaining whitespace af beginning/end
-        return trim($content);
-    }
-
-    /**
-     * We'll strip whitespace around certain operators with regular expressions.
-     * This will prepare the given array by escaping all characters.
-     *
-     * @param string[] $operators
-     * @param string   $delimiter
-     *
-     * @return string[]
-     */
-    protected function getOperatorsForRegex(array $operators, $delimiter = '/')
-    {
-        // escape operators for use in regex
-        $delimiter = array_fill(0, count($operators), $delimiter);
-        $escaped = array_map('preg_quote', $operators, $delimiter);
-
-        $operators = array_combine($operators, $escaped);
-
-        // ignore + & - for now, they'll get special treatment
-        unset($operators['+'], $operators['-']);
-
-        // dot can not just immediately follow a number; it can be confused for
-        // decimal point, or calling a method on it, e.g. 42 .toString()
-        $operators['.'] = '(?<![0-9]\s)\.';
-
-        // don't confuse = with other assignment shortcuts (e.g. +=)
-        $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
-
-        return $operators;
-    }
-
-    /**
-     * We'll strip whitespace around certain keywords with regular expressions.
-     * This will prepare the given array by escaping all characters.
-     *
-     * @param string[] $keywords
-     * @param string   $delimiter
-     *
-     * @return string[]
-     */
-    protected function getKeywordsForRegex(array $keywords, $delimiter = '/')
-    {
-        // escape keywords for use in regex
-        $delimiter = array_fill(0, count($keywords), $delimiter);
-        $escaped = array_map('preg_quote', $keywords, $delimiter);
-
-        // add word boundaries
-        array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
-        });
-
-        $keywords = array_combine($keywords, $escaped);
-
-        return $keywords;
-    }
-
-    /**
-     * Replaces all occurrences of array['key'] by array.key.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function propertyNotation($content)
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $keywords = $this->keywordsReserved;
-        $callback = function ($match) use ($minifier, $keywords) {
-            $property = trim($minifier->extracted[$match[1]], '\'"');
-
-            /*
+		$content = preg_replace('/;(\}|$)/s', '\\1', $content);
+		$content = ltrim($content, ';');
+
+		// get rid of remaining whitespace af beginning/end
+		return trim($content);
+	}
+
+	/**
+	 * We'll strip whitespace around certain operators with regular expressions.
+	 * This will prepare the given array by escaping all characters.
+	 *
+	 * @param string[] $operators
+	 * @param string   $delimiter
+	 *
+	 * @return string[]
+	 */
+	protected function getOperatorsForRegex(array $operators, $delimiter = '/')
+	{
+		// escape operators for use in regex
+		$delimiter = array_fill(0, count($operators), $delimiter);
+		$escaped = array_map('preg_quote', $operators, $delimiter);
+
+		$operators = array_combine($operators, $escaped);
+
+		// ignore + & - for now, they'll get special treatment
+		unset($operators['+'], $operators['-']);
+
+		// dot can not just immediately follow a number; it can be confused for
+		// decimal point, or calling a method on it, e.g. 42 .toString()
+		$operators['.'] = '(?<![0-9]\s)\.';
+
+		// don't confuse = with other assignment shortcuts (e.g. +=)
+		$chars = preg_quote('+-*\=<>%&|');
+		$operators['='] = '(?<!['.$chars.'])\=';
+
+		return $operators;
+	}
+
+	/**
+	 * We'll strip whitespace around certain keywords with regular expressions.
+	 * This will prepare the given array by escaping all characters.
+	 *
+	 * @param string[] $keywords
+	 * @param string   $delimiter
+	 *
+	 * @return string[]
+	 */
+	protected function getKeywordsForRegex(array $keywords, $delimiter = '/')
+	{
+		// escape keywords for use in regex
+		$delimiter = array_fill(0, count($keywords), $delimiter);
+		$escaped = array_map('preg_quote', $keywords, $delimiter);
+
+		// add word boundaries
+		array_walk($keywords, function ($value) {
+			return '\b'.$value.'\b';
+		});
+
+		$keywords = array_combine($keywords, $escaped);
+
+		return $keywords;
+	}
+
+	/**
+	 * Replaces all occurrences of array['key'] by array.key.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function propertyNotation($content)
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$keywords = $this->keywordsReserved;
+		$callback = function ($match) use ($minifier, $keywords) {
+			$property = trim($minifier->extracted[$match[1]], '\'"');
+
+			/*
              * Check if the property is a reserved keyword. In this context (as
              * property of an object literal/array) it shouldn't matter, but IE8
              * freaks out with "Expected identifier".
              */
-            if (in_array($property, $keywords)) {
-                return $match[0];
-            }
+			if (in_array($property, $keywords)) {
+				return $match[0];
+			}
 
-            /*
+			/*
              * See if the property is in a variable-like format (e.g.
              * array['key-here'] can't be replaced by array.key-here since '-'
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
-                return $match[0];
-            }
+			if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+				return $match[0];
+			}
 
-            return '.'.$property;
-        };
+			return '.'.$property;
+		};
 
-        /*
+		/*
          * Figure out if previous character is a variable name (of the array
          * we want to use property notation on) - this is to make sure
          * standalone ['value'] arrays aren't confused for keys-of-an-array.
@@ -455,61 +455,61 @@ 
          * regex implementation doesn't allow unfixed-length look-behind
          * assertions.
          */
-        preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar);
-        $previousChar = $previousChar[1];
+		preg_match('/(\[[^\]]+\])[^\]]*$/', static::REGEX_VARIABLE, $previousChar);
+		$previousChar = $previousChar[1];
 
-        /*
+		/*
          * Make sure word preceding the ['value'] is not a keyword, e.g.
          * return['x']. Because -again- PHP's regex implementation doesn't allow
          * unfixed-length look-behind assertions, I'm just going to do a lot of
          * separate look-behind assertions, one for each keyword.
          */
-        $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
-
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
-    }
-
-    /**
-     * Replaces true & false by !0 and !1.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function shortenBools($content)
-    {
-        $content = preg_replace('/\btrue\b(?!:)/', '!0', $content);
-        $content = preg_replace('/\bfalse\b(?!:)/', '!1', $content);
-
-        // for(;;) is exactly the same as while(true)
-        $content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content);
-
-        // now make sure we didn't turn any do ... while(true) into do ... for(;;)
-        preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-
-        // go backward to make sure positional offsets aren't altered when $content changes
-        $dos = array_reverse($dos);
-        foreach ($dos as $do) {
-            $offsetDo = $do[0][1];
-
-            // find all `while` (now `for`) following `do`: one of those must be
-            // associated with the `do` and be turned back into `while`
-            preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo);
-            foreach ($whiles as $while) {
-                $offsetWhile = $while[0][1];
-
-                $open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo);
-                $close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo);
-                if ($open === $close) {
-                    // only restore `while` if amount of `{` and `}` are the same;
-                    // otherwise, that `for` isn't associated with this `do`
-                    $content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
-                    break;
-                }
-            }
-        }
-
-        return $content;
-    }
+		$keywords = $this->getKeywordsForRegex($keywords);
+		$keywords = '(?<!'.implode(')(?<!', $keywords).')';
+
+		return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
+	}
+
+	/**
+	 * Replaces true & false by !0 and !1.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function shortenBools($content)
+	{
+		$content = preg_replace('/\btrue\b(?!:)/', '!0', $content);
+		$content = preg_replace('/\bfalse\b(?!:)/', '!1', $content);
+
+		// for(;;) is exactly the same as while(true)
+		$content = preg_replace('/\bwhile\(!0\){/', 'for(;;){', $content);
+
+		// now make sure we didn't turn any do ... while(true) into do ... for(;;)
+		preg_match_all('/\bdo\b/', $content, $dos, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+
+		// go backward to make sure positional offsets aren't altered when $content changes
+		$dos = array_reverse($dos);
+		foreach ($dos as $do) {
+			$offsetDo = $do[0][1];
+
+			// find all `while` (now `for`) following `do`: one of those must be
+			// associated with the `do` and be turned back into `while`
+			preg_match_all('/\bfor\(;;\)/', $content, $whiles, PREG_OFFSET_CAPTURE | PREG_SET_ORDER, $offsetDo);
+			foreach ($whiles as $while) {
+				$offsetWhile = $while[0][1];
+
+				$open = substr_count($content, '{', $offsetDo, $offsetWhile - $offsetDo);
+				$close = substr_count($content, '}', $offsetDo, $offsetWhile - $offsetDo);
+				if ($open === $close) {
+					// only restore `while` if amount of `{` and `}` are the same;
+					// otherwise, that `for` isn't associated with this `do`
+					$content = substr_replace($content, 'while(!0)', $offsetWhile, strlen('for(;;)'));
+					break;
+				}
+			}
+		}
+
+		return $content;
+	}
 }

Spacing +26 added lines, -26 removed lines

@@ -117,14 +117,14 @@ 
     {
         call_user_func_array(array('parent', '__construct'), func_get_args());
 
-        $dataDir = __DIR__.'/../data/js/';
+        $dataDir = __DIR__ . '/../data/js/';
         $options = FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES;
-        $this->keywordsReserved = file($dataDir.'keywords_reserved.txt', $options);
-        $this->keywordsBefore = file($dataDir.'keywords_before.txt', $options);
-        $this->keywordsAfter = file($dataDir.'keywords_after.txt', $options);
-        $this->operators = file($dataDir.'operators.txt', $options);
-        $this->operatorsBefore = file($dataDir.'operators_before.txt', $options);
-        $this->operatorsAfter = file($dataDir.'operators_after.txt', $options);
+        $this->keywordsReserved = file($dataDir . 'keywords_reserved.txt', $options);
+        $this->keywordsBefore = file($dataDir . 'keywords_before.txt', $options);
+        $this->keywordsAfter = file($dataDir . 'keywords_after.txt', $options);
+        $this->operators = file($dataDir . 'operators.txt', $options);
+        $this->operatorsBefore = file($dataDir . 'operators_before.txt', $options);
+        $this->operatorsAfter = file($dataDir . 'operators_after.txt', $options);
     }
 
     /**
@@ -149,7 +149,7 @@ 
              * singe-line comment on the last line (in which case it would also
              * be seen as part of that comment)
              */
-            $content .= $js."\n;";
+            $content .= $js . "\n;";
         }
 
         /*
@@ -214,9 +214,9 @@ 
     {
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
-        $callback = function ($match) use ($minifier) {
+        $callback = function($match) use ($minifier) {
             $count = count($minifier->extracted);
-            $placeholder = '/'.$count.'/';
+            $placeholder = '/' . $count . '/';
             $minifier->extracted[$placeholder] = $match[0];
 
             return $placeholder;
@@ -229,7 +229,7 @@ 
         // likely part of a division, not a regex)
         $after = '[\.,;\)\}]';
         $methods = '\.(exec|test|match|search|replace|split)\(';
-        $this->registerPattern('/'.$pattern.'(?=\s*('.$after.'|'.$methods.'))/', $callback);
+        $this->registerPattern('/' . $pattern . '(?=\s*(' . $after . '|' . $methods . '))/', $callback);
 
         // 1 more edge case: a regex can be followed by a lot more operators or
         // keywords if there's a newline (ASI) in between, where the operator
@@ -237,7 +237,7 @@ 
         // (https://github.com/matthiasmullie/minify/issues/56)
         $operators = $this->getOperatorsForRegex($this->operatorsBefore, '/');
         $operators += $this->getOperatorsForRegex($this->keywordsReserved, '/');
-        $this->registerPattern('/'.$pattern.'\s*\n(?=\s*('.implode('|', $operators).'))/', $callback);
+        $this->registerPattern('/' . $pattern . '\s*\n(?=\s*(' . implode('|', $operators) . '))/', $callback);
     }
 
     /**
@@ -281,8 +281,8 @@ 
         unset($operatorsBefore['+'], $operatorsBefore['-'], $operatorsAfter['+'], $operatorsAfter['-']);
         $content = preg_replace(
             array(
-                '/('.implode('|', $operatorsBefore).')\s+/',
-                '/\s+('.implode('|', $operatorsAfter).')/',
+                '/(' . implode('|', $operatorsBefore) . ')\s+/',
+                '/\s+(' . implode('|', $operatorsAfter) . ')/',
             ), '\\1', $content
         );
 
@@ -295,8 +295,8 @@ 
         );
 
         // collapse whitespace around reserved words into single space
-        $content = preg_replace('/(^|[;\}\s])\K('.implode('|', $keywordsBefore).')\s+/', '\\2 ', $content);
-        $content = preg_replace('/\s+('.implode('|', $keywordsAfter).')(?=([;\{\s]|$))/', ' \\1', $content);
+        $content = preg_replace('/(^|[;\}\s])\K(' . implode('|', $keywordsBefore) . ')\s+/', '\\2 ', $content);
+        $content = preg_replace('/\s+(' . implode('|', $keywordsAfter) . ')(?=([;\{\s]|$))/', ' \\1', $content);
 
         /*
          * We didn't strip whitespace after a couple of operators because they
@@ -306,8 +306,8 @@ 
          */
         $operatorsDiffBefore = array_diff($operators, $operatorsBefore);
         $operatorsDiffAfter = array_diff($operators, $operatorsAfter);
-        $content = preg_replace('/('.implode('|', $operatorsDiffBefore).')[^\S\n]+/', '\\1', $content);
-        $content = preg_replace('/[^\S\n]+('.implode('|', $operatorsDiffAfter).')/', '\\1', $content);
+        $content = preg_replace('/(' . implode('|', $operatorsDiffBefore) . ')[^\S\n]+/', '\\1', $content);
+        $content = preg_replace('/[^\S\n]+(' . implode('|', $operatorsDiffAfter) . ')/', '\\1', $content);
 
         /*
          * Get rid of double semicolons, except where they can be used like:
@@ -381,7 +381,7 @@ 
 
         // don't confuse = with other assignment shortcuts (e.g. +=)
         $chars = preg_quote('+-*\=<>%&|');
-        $operators['='] = '(?<!['.$chars.'])\=';
+        $operators['='] = '(?<![' . $chars . '])\=';
 
         return $operators;
     }
@@ -402,8 +402,8 @@ 
         $escaped = array_map('preg_quote', $keywords, $delimiter);
 
         // add word boundaries
-        array_walk($keywords, function ($value) {
-            return '\b'.$value.'\b';
+        array_walk($keywords, function($value) {
+            return '\b' . $value . '\b';
         });
 
         $keywords = array_combine($keywords, $escaped);
@@ -423,7 +423,7 @@ 
         // PHP only supports $this inside anonymous functions since 5.4
         $minifier = $this;
         $keywords = $this->keywordsReserved;
-        $callback = function ($match) use ($minifier, $keywords) {
+        $callback = function($match) use ($minifier, $keywords) {
             $property = trim($minifier->extracted[$match[1]], '\'"');
 
             /*
@@ -440,11 +440,11 @@ 
              * array['key-here'] can't be replaced by array.key-here since '-'
              * is not a valid character there.
              */
-            if (!preg_match('/^'.$minifier::REGEX_VARIABLE.'$/u', $property)) {
+            if (!preg_match('/^' . $minifier::REGEX_VARIABLE . '$/u', $property)) {
                 return $match[0];
             }
 
-            return '.'.$property;
+            return '.' . $property;
         };
 
         /*
@@ -465,9 +465,9 @@ 
          * separate look-behind assertions, one for each keyword.
          */
         $keywords = $this->getKeywordsForRegex($keywords);
-        $keywords = '(?<!'.implode(')(?<!', $keywords).')';
+        $keywords = '(?<!' . implode(')(?<!', $keywords) . ')';
 
-        return preg_replace_callback('/(?<='.$previousChar.'|\])'.$keywords.'\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
+        return preg_replace_callback('/(?<=' . $previousChar . '|\])' . $keywords . '\[\s*(([\'"])[0-9]+\\2)\s*\]/u', $callback, $content);
     }
 
     /**

Sources/minify/src/Minify.php

Indentation +392 added lines, -392 removed lines

@@ -16,335 +16,335 @@ 
  */
 abstract class Minify
 {
-    /**
-     * The data to be minified.
-     *
-     * @var string[]
-     */
-    protected $data = array();
-
-    /**
-     * Array of patterns to match.
-     *
-     * @var string[]
-     */
-    protected $patterns = array();
-
-    /**
-     * This array will hold content of strings and regular expressions that have
-     * been extracted from the JS source code, so we can reliably match "code",
-     * without having to worry about potential "code-like" characters inside.
-     *
-     * @var string[]
-     */
-    public $extracted = array();
-
-    /**
-     * Init the minify class - optionally, code may be passed along already.
-     */
-    public function __construct(/* $data = null, ... */)
-    {
-        // it's possible to add the source through the constructor as well ;)
-        if (func_num_args()) {
-            call_user_func_array(array($this, 'add'), func_get_args());
-        }
-    }
-
-    /**
-     * Add a file or straight-up code to be minified.
-     *
-     * @param string|string[] $data
-     */
-    public function add($data /* $data = null, ... */)
-    {
-        // bogus "usage" of parameter $data: scrutinizer warns this variable is
-        // not used (we're using func_get_args instead to support overloading),
-        // but it still needs to be defined because it makes no sense to have
-        // this function without argument :)
-        $args = array($data) + func_get_args();
-
-        // this method can be overloaded
-        foreach ($args as $data) {
-            if (is_array($data)) {
-                call_user_func_array(array($this, 'add'), $data);
-                continue;
-            }
-
-            // redefine var
-            $data = (string) $data;
-
-            // load data
-            $value = $this->load($data);
-            $key = ($data != $value) ? $data : count($this->data);
-
-            // replace CR linefeeds etc.
-            // @see https://github.com/matthiasmullie/minify/pull/139
-            $value = str_replace(array("\r\n", "\r"), "\n", $value);
-
-            // store data
-            $this->data[$key] = $value;
-        }
-    }
-
-    /**
-     * Minify the data & (optionally) saves it to a file.
-     *
-     * @param string[optional] $path Path to write the data to
-     *
-     * @return string The minified data
-     */
-    public function minify($path = null)
-    {
-        $content = $this->execute($path);
-
-        // save to path
-        if ($path !== null) {
-            $this->save($content, $path);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify & gzip the data & (optionally) saves it to a file.
-     *
-     * @param string[optional] $path  Path to write the data to
-     * @param int[optional]    $level Compression level, from 0 to 9
-     *
-     * @return string The minified & gzipped data
-     */
-    public function gzip($path = null, $level = 9)
-    {
-        $content = $this->execute($path);
-        $content = gzencode($content, $level, FORCE_GZIP);
-
-        // save to path
-        if ($path !== null) {
-            $this->save($content, $path);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Minify the data & write it to a CacheItemInterface object.
-     *
-     * @param CacheItemInterface $item Cache item to write the data to
-     *
-     * @return CacheItemInterface Cache item with the minifier data
-     */
-    public function cache(CacheItemInterface $item)
-    {
-        $content = $this->execute();
-        $item->set($content);
-
-        return $item;
-    }
-
-    /**
-     * Minify the data.
-     *
-     * @param string[optional] $path Path to write the data to
-     *
-     * @return string The minified data
-     */
-    abstract public function execute($path = null);
-
-    /**
-     * Load data.
-     *
-     * @param string $data Either a path to a file or the content itself
-     *
-     * @return string
-     */
-    protected function load($data)
-    {
-        // check if the data is a file
-        if ($this->canImportFile($data)) {
-            $data = file_get_contents($data);
-
-            // strip BOM, if any
-            if (substr($data, 0, 3) == "\xef\xbb\xbf") {
-                $data = substr($data, 3);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Save to file.
-     *
-     * @param string $content The minified data
-     * @param string $path    The path to save the minified data to
-     *
-     * @throws IOException
-     */
-    protected function save($content, $path)
-    {
-        $handler = $this->openFileForWriting($path);
-
-        $this->writeToFile($handler, $content);
-
-        @fclose($handler);
-    }
-
-    /**
-     * Register a pattern to execute against the source content.
-     *
-     * @param string          $pattern     PCRE pattern
-     * @param string|callable $replacement Replacement value for matched pattern
-     */
-    protected function registerPattern($pattern, $replacement = '')
-    {
-        // study the pattern, we'll execute it more than once
-        $pattern .= 'S';
-
-        $this->patterns[] = array($pattern, $replacement);
-    }
-
-    /**
-     * We can't "just" run some regular expressions against JavaScript: it's a
-     * complex language. E.g. having an occurrence of // xyz would be a comment,
-     * unless it's used within a string. Of you could have something that looks
-     * like a 'string', but inside a comment.
-     * The only way to accurately replace these pieces is to traverse the JS one
-     * character at a time and try to find whatever starts first.
-     *
-     * @param string $content The content to replace patterns in
-     *
-     * @return string The (manipulated) content
-     */
-    protected function replace($content)
-    {
-        $processed = '';
-        $positions = array_fill(0, count($this->patterns), -1);
-        $matches = array();
-
-        while ($content) {
-            // find first match for all patterns
-            foreach ($this->patterns as $i => $pattern) {
-                list($pattern, $replacement) = $pattern;
-
-                // no need to re-run matches that are still in the part of the
-                // content that hasn't been processed
-                if ($positions[$i] >= 0) {
-                    continue;
-                }
-
-                $match = null;
-                if (preg_match($pattern, $content, $match)) {
-                    $matches[$i] = $match;
-
-                    // we'll store the match position as well; that way, we
-                    // don't have to redo all preg_matches after changing only
-                    // the first (we'll still know where those others are)
-                    $positions[$i] = strpos($content, $match[0]);
-                } else {
-                    // if the pattern couldn't be matched, there's no point in
-                    // executing it again in later runs on this same content;
-                    // ignore this one until we reach end of content
-                    unset($matches[$i]);
-                    $positions[$i] = strlen($content);
-                }
-            }
-
-            // no more matches to find: everything's been processed, break out
-            if (!$matches) {
-                $processed .= $content;
-                break;
-            }
-
-            // see which of the patterns actually found the first thing (we'll
-            // only want to execute that one, since we're unsure if what the
-            // other found was not inside what the first found)
-            $discardLength = min($positions);
-            $firstPattern = array_search($discardLength, $positions);
-            $match = $matches[$firstPattern][0];
-
-            // execute the pattern that matches earliest in the content string
-            list($pattern, $replacement) = $this->patterns[$firstPattern];
-            $replacement = $this->replacePattern($pattern, $replacement, $content);
-
-            // figure out which part of the string was unmatched; that's the
-            // part we'll execute the patterns on again next
-            $content = substr($content, $discardLength);
-            $unmatched = (string) substr($content, strpos($content, $match) + strlen($match));
-
-            // move the replaced part to $processed and prepare $content to
-            // again match batch of patterns against
-            $processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched));
-            $content = $unmatched;
-
-            // first match has been replaced & that content is to be left alone,
-            // the next matches will start after this replacement, so we should
-            // fix their offsets
-            foreach ($positions as $i => $position) {
-                $positions[$i] -= $discardLength + strlen($match);
-            }
-        }
-
-        return $processed;
-    }
-
-    /**
-     * This is where a pattern is matched against $content and the matches
-     * are replaced by their respective value.
-     * This function will be called plenty of times, where $content will always
-     * move up 1 character.
-     *
-     * @param string          $pattern     Pattern to match
-     * @param string|callable $replacement Replacement value
-     * @param string          $content     Content to match pattern against
-     *
-     * @return string
-     */
-    protected function replacePattern($pattern, $replacement, $content)
-    {
-        if (is_callable($replacement)) {
-            return preg_replace_callback($pattern, $replacement, $content, 1, $count);
-        } else {
-            return preg_replace($pattern, $replacement, $content, 1, $count);
-        }
-    }
-
-    /**
-     * Strings are a pattern we need to match, in order to ignore potential
-     * code-like content inside them, but we just want all of the string
-     * content to remain untouched.
-     *
-     * This method will replace all string content with simple STRING#
-     * placeholder text, so we've rid all strings from characters that may be
-     * misinterpreted. Original string content will be saved in $this->extracted
-     * and after doing all other minifying, we can restore the original content
-     * via restoreStrings().
-     *
-     * @param string[optional] $chars
-     */
-    protected function extractStrings($chars = '\'"')
-    {
-        // PHP only supports $this inside anonymous functions since 5.4
-        $minifier = $this;
-        $callback = function ($match) use ($minifier) {
-            // check the second index here, because the first always contains a quote
-            if ($match[2] === '') {
-                /*
+	/**
+	 * The data to be minified.
+	 *
+	 * @var string[]
+	 */
+	protected $data = array();
+
+	/**
+	 * Array of patterns to match.
+	 *
+	 * @var string[]
+	 */
+	protected $patterns = array();
+
+	/**
+	 * This array will hold content of strings and regular expressions that have
+	 * been extracted from the JS source code, so we can reliably match "code",
+	 * without having to worry about potential "code-like" characters inside.
+	 *
+	 * @var string[]
+	 */
+	public $extracted = array();
+
+	/**
+	 * Init the minify class - optionally, code may be passed along already.
+	 */
+	public function __construct(/* $data = null, ... */)
+	{
+		// it's possible to add the source through the constructor as well ;)
+		if (func_num_args()) {
+			call_user_func_array(array($this, 'add'), func_get_args());
+		}
+	}
+
+	/**
+	 * Add a file or straight-up code to be minified.
+	 *
+	 * @param string|string[] $data
+	 */
+	public function add($data /* $data = null, ... */)
+	{
+		// bogus "usage" of parameter $data: scrutinizer warns this variable is
+		// not used (we're using func_get_args instead to support overloading),
+		// but it still needs to be defined because it makes no sense to have
+		// this function without argument :)
+		$args = array($data) + func_get_args();
+
+		// this method can be overloaded
+		foreach ($args as $data) {
+			if (is_array($data)) {
+				call_user_func_array(array($this, 'add'), $data);
+				continue;
+			}
+
+			// redefine var
+			$data = (string) $data;
+
+			// load data
+			$value = $this->load($data);
+			$key = ($data != $value) ? $data : count($this->data);
+
+			// replace CR linefeeds etc.
+			// @see https://github.com/matthiasmullie/minify/pull/139
+			$value = str_replace(array("\r\n", "\r"), "\n", $value);
+
+			// store data
+			$this->data[$key] = $value;
+		}
+	}
+
+	/**
+	 * Minify the data & (optionally) saves it to a file.
+	 *
+	 * @param string[optional] $path Path to write the data to
+	 *
+	 * @return string The minified data
+	 */
+	public function minify($path = null)
+	{
+		$content = $this->execute($path);
+
+		// save to path
+		if ($path !== null) {
+			$this->save($content, $path);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify & gzip the data & (optionally) saves it to a file.
+	 *
+	 * @param string[optional] $path  Path to write the data to
+	 * @param int[optional]    $level Compression level, from 0 to 9
+	 *
+	 * @return string The minified & gzipped data
+	 */
+	public function gzip($path = null, $level = 9)
+	{
+		$content = $this->execute($path);
+		$content = gzencode($content, $level, FORCE_GZIP);
+
+		// save to path
+		if ($path !== null) {
+			$this->save($content, $path);
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Minify the data & write it to a CacheItemInterface object.
+	 *
+	 * @param CacheItemInterface $item Cache item to write the data to
+	 *
+	 * @return CacheItemInterface Cache item with the minifier data
+	 */
+	public function cache(CacheItemInterface $item)
+	{
+		$content = $this->execute();
+		$item->set($content);
+
+		return $item;
+	}
+
+	/**
+	 * Minify the data.
+	 *
+	 * @param string[optional] $path Path to write the data to
+	 *
+	 * @return string The minified data
+	 */
+	abstract public function execute($path = null);
+
+	/**
+	 * Load data.
+	 *
+	 * @param string $data Either a path to a file or the content itself
+	 *
+	 * @return string
+	 */
+	protected function load($data)
+	{
+		// check if the data is a file
+		if ($this->canImportFile($data)) {
+			$data = file_get_contents($data);
+
+			// strip BOM, if any
+			if (substr($data, 0, 3) == "\xef\xbb\xbf") {
+				$data = substr($data, 3);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Save to file.
+	 *
+	 * @param string $content The minified data
+	 * @param string $path    The path to save the minified data to
+	 *
+	 * @throws IOException
+	 */
+	protected function save($content, $path)
+	{
+		$handler = $this->openFileForWriting($path);
+
+		$this->writeToFile($handler, $content);
+
+		@fclose($handler);
+	}
+
+	/**
+	 * Register a pattern to execute against the source content.
+	 *
+	 * @param string          $pattern     PCRE pattern
+	 * @param string|callable $replacement Replacement value for matched pattern
+	 */
+	protected function registerPattern($pattern, $replacement = '')
+	{
+		// study the pattern, we'll execute it more than once
+		$pattern .= 'S';
+
+		$this->patterns[] = array($pattern, $replacement);
+	}
+
+	/**
+	 * We can't "just" run some regular expressions against JavaScript: it's a
+	 * complex language. E.g. having an occurrence of // xyz would be a comment,
+	 * unless it's used within a string. Of you could have something that looks
+	 * like a 'string', but inside a comment.
+	 * The only way to accurately replace these pieces is to traverse the JS one
+	 * character at a time and try to find whatever starts first.
+	 *
+	 * @param string $content The content to replace patterns in
+	 *
+	 * @return string The (manipulated) content
+	 */
+	protected function replace($content)
+	{
+		$processed = '';
+		$positions = array_fill(0, count($this->patterns), -1);
+		$matches = array();
+
+		while ($content) {
+			// find first match for all patterns
+			foreach ($this->patterns as $i => $pattern) {
+				list($pattern, $replacement) = $pattern;
+
+				// no need to re-run matches that are still in the part of the
+				// content that hasn't been processed
+				if ($positions[$i] >= 0) {
+					continue;
+				}
+
+				$match = null;
+				if (preg_match($pattern, $content, $match)) {
+					$matches[$i] = $match;
+
+					// we'll store the match position as well; that way, we
+					// don't have to redo all preg_matches after changing only
+					// the first (we'll still know where those others are)
+					$positions[$i] = strpos($content, $match[0]);
+				} else {
+					// if the pattern couldn't be matched, there's no point in
+					// executing it again in later runs on this same content;
+					// ignore this one until we reach end of content
+					unset($matches[$i]);
+					$positions[$i] = strlen($content);
+				}
+			}
+
+			// no more matches to find: everything's been processed, break out
+			if (!$matches) {
+				$processed .= $content;
+				break;
+			}
+
+			// see which of the patterns actually found the first thing (we'll
+			// only want to execute that one, since we're unsure if what the
+			// other found was not inside what the first found)
+			$discardLength = min($positions);
+			$firstPattern = array_search($discardLength, $positions);
+			$match = $matches[$firstPattern][0];
+
+			// execute the pattern that matches earliest in the content string
+			list($pattern, $replacement) = $this->patterns[$firstPattern];
+			$replacement = $this->replacePattern($pattern, $replacement, $content);
+
+			// figure out which part of the string was unmatched; that's the
+			// part we'll execute the patterns on again next
+			$content = substr($content, $discardLength);
+			$unmatched = (string) substr($content, strpos($content, $match) + strlen($match));
+
+			// move the replaced part to $processed and prepare $content to
+			// again match batch of patterns against
+			$processed .= substr($replacement, 0, strlen($replacement) - strlen($unmatched));
+			$content = $unmatched;
+
+			// first match has been replaced & that content is to be left alone,
+			// the next matches will start after this replacement, so we should
+			// fix their offsets
+			foreach ($positions as $i => $position) {
+				$positions[$i] -= $discardLength + strlen($match);
+			}
+		}
+
+		return $processed;
+	}
+
+	/**
+	 * This is where a pattern is matched against $content and the matches
+	 * are replaced by their respective value.
+	 * This function will be called plenty of times, where $content will always
+	 * move up 1 character.
+	 *
+	 * @param string          $pattern     Pattern to match
+	 * @param string|callable $replacement Replacement value
+	 * @param string          $content     Content to match pattern against
+	 *
+	 * @return string
+	 */
+	protected function replacePattern($pattern, $replacement, $content)
+	{
+		if (is_callable($replacement)) {
+			return preg_replace_callback($pattern, $replacement, $content, 1, $count);
+		} else {
+			return preg_replace($pattern, $replacement, $content, 1, $count);
+		}
+	}
+
+	/**
+	 * Strings are a pattern we need to match, in order to ignore potential
+	 * code-like content inside them, but we just want all of the string
+	 * content to remain untouched.
+	 *
+	 * This method will replace all string content with simple STRING#
+	 * placeholder text, so we've rid all strings from characters that may be
+	 * misinterpreted. Original string content will be saved in $this->extracted
+	 * and after doing all other minifying, we can restore the original content
+	 * via restoreStrings().
+	 *
+	 * @param string[optional] $chars
+	 */
+	protected function extractStrings($chars = '\'"')
+	{
+		// PHP only supports $this inside anonymous functions since 5.4
+		$minifier = $this;
+		$callback = function ($match) use ($minifier) {
+			// check the second index here, because the first always contains a quote
+			if ($match[2] === '') {
+				/*
                  * Empty strings need no placeholder; they can't be confused for
                  * anything else anyway.
                  * But we still needed to match them, for the extraction routine
                  * to skip over this particular string.
                  */
-                return $match[0];
-            }
+				return $match[0];
+			}
 
-            $count = count($minifier->extracted);
-            $placeholder = $match[1].$count.$match[1];
-            $minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
+			$count = count($minifier->extracted);
+			$placeholder = $match[1].$count.$match[1];
+			$minifier->extracted[$placeholder] = $match[1].$match[2].$match[1];
 
-            return $placeholder;
-        };
+			return $placeholder;
+		};
 
-        /*
+		/*
          * The \\ messiness explained:
          * * Don't count ' or " as end-of-string if it's escaped (has backslash
          * in front of it)
@@ -356,75 +356,75 @@ 
          * considered as escape-char (times 2) and to get it in the regex,
          * escaped (times 2)
          */
-        $this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
-    }
-
-    /**
-     * This method will restore all extracted data (strings, regexes) that were
-     * replaced with placeholder text in extract*(). The original content was
-     * saved in $this->extracted.
-     *
-     * @param string $content
-     *
-     * @return string
-     */
-    protected function restoreExtractedData($content)
-    {
-        if (!$this->extracted) {
-            // nothing was extracted, nothing to restore
-            return $content;
-        }
-
-        $content = strtr($content, $this->extracted);
-
-        $this->extracted = array();
-
-        return $content;
-    }
-
-    /**
-     * Check if the path is a regular file and can be read.
-     *
-     * @param string $path
-     *
-     * @return bool
-     */
-    protected function canImportFile($path)
-    {
-        return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path);
-    }
-
-    /**
-     * Attempts to open file specified by $path for writing.
-     *
-     * @param string $path The path to the file
-     *
-     * @return resource Specifier for the target file
-     *
-     * @throws IOException
-     */
-    protected function openFileForWriting($path)
-    {
-        if (($handler = @fopen($path, 'w')) === false) {
-            throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
-        }
-
-        return $handler;
-    }
-
-    /**
-     * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions.
-     *
-     * @param resource $handler The resource to write to
-     * @param string   $content The content to write
-     * @param string   $path    The path to the file (for exception printing only)
-     *
-     * @throws IOException
-     */
-    protected function writeToFile($handler, $content, $path = '')
-    {
-        if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
-            throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
-        }
-    }
+		$this->registerPattern('/(['.$chars.'])(.*?(?<!\\\\)(\\\\\\\\)*+)\\1/s', $callback);
+	}
+
+	/**
+	 * This method will restore all extracted data (strings, regexes) that were
+	 * replaced with placeholder text in extract*(). The original content was
+	 * saved in $this->extracted.
+	 *
+	 * @param string $content
+	 *
+	 * @return string
+	 */
+	protected function restoreExtractedData($content)
+	{
+		if (!$this->extracted) {
+			// nothing was extracted, nothing to restore
+			return $content;
+		}
+
+		$content = strtr($content, $this->extracted);
+
+		$this->extracted = array();
+
+		return $content;
+	}
+
+	/**
+	 * Check if the path is a regular file and can be read.
+	 *
+	 * @param string $path
+	 *
+	 * @return bool
+	 */
+	protected function canImportFile($path)
+	{
+		return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path);
+	}
+
+	/**
+	 * Attempts to open file specified by $path for writing.
+	 *
+	 * @param string $path The path to the file
+	 *
+	 * @return resource Specifier for the target file
+	 *
+	 * @throws IOException
+	 */
+	protected function openFileForWriting($path)
+	{
+		if (($handler = @fopen($path, 'w')) === false) {
+			throw new IOException('The file "'.$path.'" could not be opened for writing. Check if PHP has enough permissions.');
+		}
+
+		return $handler;
+	}
+
+	/**
+	 * Attempts to write $content to the file specified by $handler. $path is used for printing exceptions.
+	 *
+	 * @param resource $handler The resource to write to
+	 * @param string   $content The content to write
+	 * @param string   $path    The path to the file (for exception printing only)
+	 *
+	 * @throws IOException
+	 */
+	protected function writeToFile($handler, $content, $path = '')
+	{
+		if (($result = @fwrite($handler, $content)) === false || ($result < strlen($content))) {
+			throw new IOException('The file "'.$path.'" could not be written to. Check your disk space and file permissions.');
+		}
+	}
 }

Sources/Subs.php

Spacing +116 added lines, -116 removed lines

@@ -1097,7 +1097,7 @@ 
 					'height' => array('optional' => true, 'match' => '(\d+)'),
 				),
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
+				'validate' => function(&$tag, &$data, $disabled, $params) use ($modSettings, $context, $sourcedir, $txt)
 				{
 					$returnContext = '';
 
@@ -1132,7 +1132,7 @@ 
 						}
 
 						if ($currentAttachment['thumbnail']['has_thumb'] && empty($params['{width}']) && empty($params['{height}']))
-							$returnContext .= '<a href="'. $currentAttachment['href']. ';image" id="link_'. $currentAttachment['id']. '" onclick="'. $currentAttachment['thumbnail']['javascript']. '"><img src="'. $currentAttachment['thumbnail']['href']. '"' . $alt . $title . ' id="thumb_'. $currentAttachment['id']. '"></a>';
+							$returnContext .= '<a href="' . $currentAttachment['href'] . ';image" id="link_' . $currentAttachment['id'] . '" onclick="' . $currentAttachment['thumbnail']['javascript'] . '"><img src="' . $currentAttachment['thumbnail']['href'] . '"' . $alt . $title . ' id="thumb_' . $currentAttachment['id'] . '"></a>';
 						else
 							$returnContext .= '<img src="' . $currentAttachment['href'] . ';image"' . $alt . $title . $width . $height . '/>';
 					}
@@ -1161,7 +1161,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1198,7 +1198,7 @@ 
 				'type' => 'unparsed_equals_content',
 				'content' => '<div class="codeheader"><span class="code floatleft">' . $txt['code'] . '</span> ($2) <a class="codeoperation smf_select_text">' . $txt['code_select'] . '</a></div><code class="bbc_code">$1</code>',
 				// @todo Maybe this can be simplified?
-				'validate' => isset($disabled['code']) ? null : function (&$tag, &$data, $disabled) use ($context)
+				'validate' => isset($disabled['code']) ? null : function(&$tag, &$data, $disabled) use ($context)
 				{
 					if (!isset($disabled['code']))
 					{
@@ -1242,7 +1242,7 @@ 
 				'type' => 'unparsed_content',
 				'content' => '<a href="mailto:$1" class="bbc_email">$1</a>',
 				// @todo Should this respect guest_hideContacts?
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 				},
@@ -1261,7 +1261,7 @@ 
 				'type' => 'unparsed_commas_content',
 				'test' => '\d+,\d+\]',
 				'content' => '<embed type="application/x-shockwave-flash" src="$1" width="$2" height="$3" play="true" loop="true" quality="high" AllowScriptAccess="never">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (isset($disabled['url']))
 						$tag['content'] = '$1';
@@ -1306,7 +1306,7 @@ 
 					'height' => array('optional' => true, 'value' => ' height="$1"', 'match' => '(\d+)'),
 				),
 				'content' => '<img src="$1" alt="{alt}" title="{title}"{width}{height} class="bbc_img resized">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
@@ -1329,7 +1329,7 @@ 
 				'tag' => 'img',
 				'type' => 'unparsed_content',
 				'content' => '<img src="$1" alt="" class="bbc_img">',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
@@ -1352,7 +1352,7 @@ 
 				'tag' => 'iurl',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1366,7 +1366,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (substr($data, 0, 1) == '#')
 						$data = '#post_' . substr($data, 1);
@@ -1446,7 +1446,7 @@ 
 				'tag' => 'php',
 				'type' => 'unparsed_content',
 				'content' => '<span class="phpcode">$1</span>',
-				'validate' => isset($disabled['php']) ? null : function (&$tag, &$data, $disabled)
+				'validate' => isset($disabled['php']) ? null : function(&$tag, &$data, $disabled)
 				{
 					if (!isset($disabled['php']))
 					{
@@ -1544,7 +1544,7 @@ 
 				'test' => '[1-7]\]',
 				'before' => '<span style="font-size: $1;" class="bbc_size">',
 				'after' => '</span>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$sizes = array(1 => 0.7, 2 => 1.0, 3 => 1.35, 4 => 1.45, 5 => 2.0, 6 => 2.65, 7 => 3.95);
 					$data = $sizes[$data] . 'em';
@@ -1582,7 +1582,7 @@ 
 				'tag' => 'time',
 				'type' => 'unparsed_content',
 				'content' => '$1',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					if (is_numeric($data))
 						$data = timeformat($data);
@@ -1610,7 +1610,7 @@ 
 				'tag' => 'url',
 				'type' => 'unparsed_content',
 				'content' => '<a href="$1" class="bbc_link" target="_blank">$1</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$data = strtr($data, array('<br>' => ''));
 					$scheme = parse_url($data, PHP_URL_SCHEME);
@@ -1624,7 +1624,7 @@ 
 				'quoted' => 'optional',
 				'before' => '<a href="$1" class="bbc_link" target="_blank">',
 				'after' => '</a>',
-				'validate' => function (&$tag, &$data, $disabled)
+				'validate' => function(&$tag, &$data, $disabled)
 				{
 					$scheme = parse_url($data, PHP_URL_SCHEME);
 					if (empty($scheme))
@@ -1650,7 +1650,7 @@ 
 		{
 			if (isset($temp_bbc))
 				$bbc_codes = $temp_bbc;
-			usort($codes, function ($a, $b) {
+			usort($codes, function($a, $b) {
 				return strcmp($a['tag'], $b['tag']);
 			});
 			return $codes;
@@ -1888,7 +1888,7 @@ 
 										# a run of Unicode domain name characters and a dot
 										[\p{L}\p{M}\p{N}\-.:@]+\.
 										# and then a TLD valid in the DNS or the reserved "local" TLD
-										(?:'. $modSettings['tld_regex'] .'|local)
+										(?:'. $modSettings['tld_regex'] . '|local)
 									)
 									# followed by a non-domain character or end of line
 									(?=[^\p{L}\p{N}\-.]|$)
@@ -1956,7 +1956,7 @@ 
 						)?
 						';
 
-						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function ($matches) {
+						$data = preg_replace_callback('~' . $url_regex . '~xi' . ($context['utf8'] ? 'u' : ''), function($matches) {
 							$url = array_shift($matches);
 
 							$scheme = parse_url($url, PHP_URL_SCHEME);
@@ -2685,7 +2685,7 @@ 
 		for ($i = 0, $n = count($smileysfrom); $i < $n; $i++)
 		{
 			$specialChars = $smcFunc['htmlspecialchars']($smileysfrom[$i], ENT_QUOTES);
-			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')). '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
+			$smileyCode = '<img src="' . $smileys_path . $smileysto[$i] . '" alt="' . strtr($specialChars, array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" title="' . strtr($smcFunc['htmlspecialchars']($smileysdescs[$i]), array(':' => '&#58;', '(' => '&#40;', ')' => '&#41;', '$' => '&#36;', '[' => '&#091;')) . '" class="smiley">';
 
 			$smileyPregReplacements[$smileysfrom[$i]] = $smileyCode;
 
@@ -2702,7 +2702,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch,
-		function ($matches) use ($smileyPregReplacements)
+		function($matches) use ($smileyPregReplacements)
 		{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
@@ -2768,13 +2768,13 @@ 
 	{
 		if (defined('SID') && SID != '')
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
-					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID. (isset($m[2]) ? "$m[2]" : "");
+					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html?' . SID . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
 		else
 			$setLocation = preg_replace_callback('~^' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?$~',
-				function ($m) use ($scripturl)
+				function($m) use ($scripturl)
 				{
 					return $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? "$m[2]" : "");
 				}, $setLocation);
@@ -3097,7 +3097,7 @@ 
 
 	// Add a generic "Are you sure?" confirmation message.
 	addInlineJavaScript('
-	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) .';');
+	var smf_you_sure =' . JavaScriptEscape($txt['quickmod_confirm']) . ';');
 
 	// Now add the capping code for avatars.
 	if (!empty($modSettings['avatar_max_width_external']) && !empty($modSettings['avatar_max_height_external']) && !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_css_resize')
@@ -3458,7 +3458,7 @@ 
 
 		else
 			echo '
-	<script src="', $settings['theme_url'] ,'/scripts/minified', ($do_deferred ? '_deferred' : '') ,'.js', $minSeed ,'"></script>';
+	<script src="', $settings['theme_url'], '/scripts/minified', ($do_deferred ? '_deferred' : ''), '.js', $minSeed, '"></script>';
 	}
 
 	// Inline JavaScript - Actually useful some times!
@@ -3536,14 +3536,14 @@ 
 
 		else
 			echo '
-	<link rel="stylesheet" href="', $settings['theme_url'] ,'/css/minified.css', $minSeed ,'">';
+	<link rel="stylesheet" href="', $settings['theme_url'], '/css/minified.css', $minSeed, '">';
 	}
 
 	// Print the rest after the minified files.
 	if (!empty($normal))
 		foreach ($normal as $nf)
 			echo '
-	<link rel="stylesheet" href="', $nf ,'">';
+	<link rel="stylesheet" href="', $nf, '">';
 
 	if ($db_show_debug === true)
 	{
@@ -3559,7 +3559,7 @@ 
 	<style>';
 
 		foreach ($context['css_header'] as $css)
-			echo $css .'
+			echo $css . '
 	';
 
 		echo'
@@ -3588,27 +3588,27 @@ 
 		return false;
 
 	// Did we already did this?
-	$toCache = cache_get_data('minimized_'. $settings['theme_id'] .'_'. $type, 86400);
+	$toCache = cache_get_data('minimized_' . $settings['theme_id'] . '_' . $type, 86400);
 
 	// Already done?
 	if (!empty($toCache))
 		return true;
 
 	// No namespaces, sorry!
-	$classType = 'MatthiasMullie\\Minify\\'. strtoupper($type);
+	$classType = 'MatthiasMullie\\Minify\\' . strtoupper($type);
 
 	// Temp path.
-	$cTempPath = $settings['theme_dir'] .'/'. ($type == 'css' ? 'css' : 'scripts') .'/';
+	$cTempPath = $settings['theme_dir'] . '/' . ($type == 'css' ? 'css' : 'scripts') . '/';
 
 	// What kind of file are we going to create?
-	$toCreate = $cTempPath .'minified'. ($do_deferred ? '_deferred' : '') .'.'. $type;
+	$toCreate = $cTempPath . 'minified' . ($do_deferred ? '_deferred' : '') . '.' . $type;
 
 	// File has to exists, if it isn't try to create it.
 	if ((!file_exists($toCreate) && @fopen($toCreate, 'w') === false) || !smf_chmod($toCreate))
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
@@ -3643,14 +3643,14 @@ 
 	{
 		loadLanguage('Errors');
 		log_error(sprintf($txt['file_not_created'], $toCreate), 'general');
-		cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, null);
+		cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, null);
 
 		// The process failed so roll back to print each individual file.
 		return $data;
 	}
 
 	// And create a long lived cache entry.
-	cache_put_data('minimized_'. $settings['theme_id'] .'_'. $type, $toCreate, 86400);
+	cache_put_data('minimized_' . $settings['theme_id'] . '_' . $type, $toCreate, 86400);
 
 	return true;
 }
@@ -3707,7 +3707,7 @@ 
 	else
 		$path = $modSettings['attachmentUploadDir'];
 
-	return $path . '/' . $attachment_id . '_' . $file_hash .'.dat';
+	return $path . '/' . $attachment_id . '_' . $file_hash . '.dat';
 }
 
 /**
@@ -3751,10 +3751,10 @@ 
 		$valid_low = isValidIP($ip_parts[0]);
 		$valid_high = isValidIP($ip_parts[1]);
 		$count = 0;
-		$mode = (preg_match('/:/',$ip_parts[0]) > 0 ? ':' : '.');
+		$mode = (preg_match('/:/', $ip_parts[0]) > 0 ? ':' : '.');
 		$max = ($mode == ':' ? 'ffff' : '255');
 		$min = 0;
-		if(!$valid_low)
+		if (!$valid_low)
 		{
 			$ip_parts[0] = preg_replace('/\*/', '0', $ip_parts[0]);
 			$valid_low = isValidIP($ip_parts[0]);
@@ -3768,7 +3768,7 @@ 
 		}
 
 		$count = 0;
-		if(!$valid_high)
+		if (!$valid_high)
 		{
 			$ip_parts[1] = preg_replace('/\*/', $max, $ip_parts[1]);
 			$valid_high = isValidIP($ip_parts[1]);
@@ -3781,7 +3781,7 @@ 
 			}
 		}
 
-		if($valid_high && $valid_low)
+		if ($valid_high && $valid_low)
 		{
 			$ip_array['low'] = $ip_parts[0];
 			$ip_array['high'] = $ip_parts[1];
@@ -3963,7 +3963,7 @@ 
 		addInlineJavaScript('
 	var user_menus = new smc_PopupMenu();
 	user_menus.add("profile", "' . $scripturl . '?action=profile;area=popup");
-	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u='. $context['user']['id'] .'");', true);
+	user_menus.add("alerts", "' . $scripturl . '?action=profile;area=alerts_popup;u=' . $context['user']['id'] . '");', true);
 		if ($context['allow_pm'])
 			addInlineJavaScript('
 	user_menus.add("pm", "' . $scripturl . '?action=pm;sa=popup");', true);
@@ -4588,7 +4588,7 @@ 
 		// No? try a fallback to $sourcedir
 		else
 		{
-			$absPath = $sourcedir .'/'. $file;
+			$absPath = $sourcedir . '/' . $file;
 
 			if (file_exists($absPath))
 				require_once($absPath);
@@ -4669,15 +4669,15 @@ 
 
 	// UTF-8 occurences of MS special characters
 	$findchars_utf8 = array(
-		"\xe2\80\x9a",	// single low-9 quotation mark
-		"\xe2\80\x9e",	// double low-9 quotation mark
-		"\xe2\80\xa6",	// horizontal ellipsis
-		"\xe2\x80\x98",	// left single curly quote
-		"\xe2\x80\x99",	// right single curly quote
-		"\xe2\x80\x9c",	// left double curly quote
-		"\xe2\x80\x9d",	// right double curly quote
-		"\xe2\x80\x93",	// en dash
-		"\xe2\x80\x94",	// em dash
+		"\xe2\80\x9a", // single low-9 quotation mark
+		"\xe2\80\x9e", // double low-9 quotation mark
+		"\xe2\80\xa6", // horizontal ellipsis
+		"\xe2\x80\x98", // left single curly quote
+		"\xe2\x80\x99", // right single curly quote
+		"\xe2\x80\x9c", // left double curly quote
+		"\xe2\x80\x9d", // right double curly quote
+		"\xe2\x80\x93", // en dash
+		"\xe2\x80\x94", // em dash
 	);
 
 	// windows 1252 / iso equivalents
@@ -4695,15 +4695,15 @@ 
 
 	// safe replacements
 	$replacechars = array(
-		',',	// &sbquo;
-		',,',	// &bdquo;
-		'...',	// &hellip;
-		"'",	// &lsquo;
-		"'",	// &rsquo;
-		'"',	// &ldquo;
-		'"',	// &rdquo;
-		'-',	// &ndash;
-		'--',	// &mdash;
+		',', // &sbquo;
+		',,', // &bdquo;
+		'...', // &hellip;
+		"'", // &lsquo;
+		"'", // &rsquo;
+		'"', // &ldquo;
+		'"', // &rdquo;
+		'-', // &ndash;
+		'--', // &mdash;
 	);
 
 	if ($context['utf8'])
@@ -5066,7 +5066,7 @@ 
  */
 function inet_dtop($bin)
 {
-	if(empty($bin))
+	if (empty($bin))
 		return '';
 
 	global $db_type;
@@ -5097,28 +5097,28 @@ 
  */
 function _safe_serialize($value)
 {
-	if(is_null($value))
+	if (is_null($value))
 		return 'N;';
 
-	if(is_bool($value))
-		return 'b:'. (int) $value .';';
+	if (is_bool($value))
+		return 'b:' . (int) $value . ';';
 
-	if(is_int($value))
-		return 'i:'. $value .';';
+	if (is_int($value))
+		return 'i:' . $value . ';';
 
-	if(is_float($value))
-		return 'd:'. str_replace(',', '.', $value) .';';
+	if (is_float($value))
+		return 'd:' . str_replace(',', '.', $value) . ';';
 
-	if(is_string($value))
-		return 's:'. strlen($value) .':"'. $value .'";';
+	if (is_string($value))
+		return 's:' . strlen($value) . ':"' . $value . '";';
 
-	if(is_array($value))
+	if (is_array($value))
 	{
 		$out = '';
-		foreach($value as $k => $v)
+		foreach ($value as $k => $v)
 			$out .= _safe_serialize($k) . _safe_serialize($v);
 
-		return 'a:'. count($value) .':{'. $out .'}';
+		return 'a:' . count($value) . ':{' . $out . '}';
 	}
 
 	// safe_serialize cannot serialize resources or objects.
@@ -5160,7 +5160,7 @@ 
 function _safe_unserialize($str)
 {
 	// Input  is not a string.
-	if(empty($str) || !is_string($str))
+	if (empty($str) || !is_string($str))
 		return false;
 
 	$stack = array();
@@ -5174,40 +5174,40 @@ 
 	 *   3 - in array, expecting value or another array
 	 */
 	$state = 0;
-	while($state != 1)
+	while ($state != 1)
 	{
 		$type = isset($str[0]) ? $str[0] : '';
-		if($type == '}')
+		if ($type == '}')
 			$str = substr($str, 1);
 
-		else if($type == 'N' && $str[1] == ';')
+		else if ($type == 'N' && $str[1] == ';')
 		{
 			$value = null;
 			$str = substr($str, 2);
 		}
-		else if($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
+		else if ($type == 'b' && preg_match('/^b:([01]);/', $str, $matches))
 		{
 			$value = $matches[1] == '1' ? true : false;
 			$str = substr($str, 4);
 		}
-		else if($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
+		else if ($type == 'i' && preg_match('/^i:(-?[0-9]+);(.*)/s', $str, $matches))
 		{
-			$value = (int)$matches[1];
+			$value = (int) $matches[1];
 			$str = $matches[2];
 		}
-		else if($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
+		else if ($type == 'd' && preg_match('/^d:(-?[0-9]+\.?[0-9]*(E[+-][0-9]+)?);(.*)/s', $str, $matches))
 		{
-			$value = (float)$matches[1];
+			$value = (float) $matches[1];
 			$str = $matches[3];
 		}
-		else if($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int)$matches[1], 2) == '";')
+		else if ($type == 's' && preg_match('/^s:([0-9]+):"(.*)/s', $str, $matches) && substr($matches[2], (int) $matches[1], 2) == '";')
 		{
-			$value = substr($matches[2], 0, (int)$matches[1]);
-			$str = substr($matches[2], (int)$matches[1] + 2);
+			$value = substr($matches[2], 0, (int) $matches[1]);
+			$str = substr($matches[2], (int) $matches[1] + 2);
 		}
-		else if($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
+		else if ($type == 'a' && preg_match('/^a:([0-9]+):{(.*)/s', $str, $matches))
 		{
-			$expectedLength = (int)$matches[1];
+			$expectedLength = (int) $matches[1];
 			$str = $matches[2];
 		}
 
@@ -5215,10 +5215,10 @@ 
 		else
 			return false;
 
-		switch($state)
+		switch ($state)
 		{
 			case 3: // In array, expecting value or another array.
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$stack[] = &$list;
 					$list[$key] = array();
@@ -5227,7 +5227,7 @@ 
 					$state = 2;
 					break;
 				}
-				if($type != '}')
+				if ($type != '}')
 				{
 					$list[$key] = $value;
 					$state = 2;
@@ -5238,29 +5238,29 @@ 
 				return false;
 
 			case 2: // in array, expecting end of array or a key
-				if($type == '}')
+				if ($type == '}')
 				{
 					// Array size is less than expected.
-					if(count($list) < end($expected))
+					if (count($list) < end($expected))
 						return false;
 
 					unset($list);
-					$list = &$stack[count($stack)-1];
+					$list = &$stack[count($stack) - 1];
 					array_pop($stack);
 
 					// Go to terminal state if we're at the end of the root array.
 					array_pop($expected);
 
-					if(count($expected) == 0)
+					if (count($expected) == 0)
 						$state = 1;
 
 					break;
 				}
 
-				if($type == 'i' || $type == 's')
+				if ($type == 'i' || $type == 's')
 				{
 					// Array size exceeds expected length.
-					if(count($list) >= end($expected))
+					if (count($list) >= end($expected))
 						return false;
 
 					$key = $value;
@@ -5273,7 +5273,7 @@ 
 
 			// Expecting array or value.
 			case 0:
-				if($type == 'a')
+				if ($type == 'a')
 				{
 					$data = array();
 					$list = &$data;
@@ -5282,7 +5282,7 @@ 
 					break;
 				}
 
-				if($type != '}')
+				if ($type != '}')
 				{
 					$data = $value;
 					$state = 1;
@@ -5295,7 +5295,7 @@ 
 	}
 
 	// Trailing data in input.
-	if(!empty($str))
+	if (!empty($str))
 		return false;
 
 	return $data;
@@ -5349,7 +5349,7 @@ 
 	// Set different modes.
 	$chmodValues = $isDir ? array(0750, 0755, 0775, 0777) : array(0644, 0664, 0666);
 
-	foreach($chmodValues as $val)
+	foreach ($chmodValues as $val)
 	{
 		// If it's writable, break out of the loop.
 		if (is_writable($file))
@@ -5384,13 +5384,13 @@ 
 	$returnArray = @json_decode($json, $returnAsArray);
 
 	// PHP 5.3 so no json_last_error_msg()
-	switch(json_last_error())
+	switch (json_last_error())
 	{
 		case JSON_ERROR_NONE:
 			$jsonError = false;
 			break;
 		case JSON_ERROR_DEPTH:
-			$jsonError =  'JSON_ERROR_DEPTH';
+			$jsonError = 'JSON_ERROR_DEPTH';
 			break;
 		case JSON_ERROR_STATE_MISMATCH:
 			$jsonError = 'JSON_ERROR_STATE_MISMATCH';
@@ -5418,10 +5418,10 @@ 
 		loadLanguage('Errors');
 
 		if (!empty($jsonDebug))
-			log_error($txt['json_'. $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
+			log_error($txt['json_' . $jsonError], 'critical', $jsonDebug['file'], $jsonDebug['line']);
 
 		else
-			log_error($txt['json_'. $jsonError], 'critical');
+			log_error($txt['json_' . $jsonError], 'critical');
 
 		// Everyone expects an array.
 		return array();
@@ -5525,7 +5525,7 @@ 
 		});
 
 		// Convert Punycode to Unicode
-		$tlds = array_map(function ($input) {
+		$tlds = array_map(function($input) {
 			$prefix = 'xn--';
 			$safe_char = 0xFFFC;
 			$base = 36;
@@ -5541,7 +5541,7 @@ 
 
 			foreach ($enco_parts as $encoded)
 			{
-				if (strpos($encoded,$prefix) !== 0 || strlen(trim(str_replace($prefix,'',$encoded))) == 0)
+				if (strpos($encoded, $prefix) !== 0 || strlen(trim(str_replace($prefix, '', $encoded))) == 0)
 				{
 					$output_parts[] = $encoded;
 					continue;
@@ -5552,7 +5552,7 @@ 
 				$idx = 0;
 				$char = 0x80;
 				$decoded = array();
-				$output='';
+				$output = '';
 				$delim_pos = strrpos($encoded, '-');
 
 				if ($delim_pos > strlen($prefix))
@@ -5568,7 +5568,7 @@ 
 
 				for ($enco_idx = $delim_pos ? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len)
 				{
-					for ($old_idx = $idx, $w = 1, $k = $base; 1 ; $k += $base)
+					for ($old_idx = $idx, $w = 1, $k = $base; 1; $k += $base)
 					{
 						$cp = ord($encoded{$enco_idx++});
 						$digit = ($cp - 48 < 10) ? $cp - 22 : (($cp - 65 < 26) ? $cp - 65 : (($cp - 97 < 26) ? $cp - 97 : $base));
@@ -5609,15 +5609,15 @@ 
 
 					// 2 bytes
 					elseif ($v < (1 << 11))
-						$output .= chr(192+($v >> 6)) . chr(128+($v & 63));
+						$output .= chr(192 + ($v >> 6)) . chr(128 + ($v & 63));
 
 					// 3 bytes
 					elseif ($v < (1 << 16))
-						$output .= chr(224+($v >> 12)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(224 + ($v >> 12)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					// 4 bytes
 					elseif ($v < (1 << 21))
-						$output .= chr(240+($v >> 18)) . chr(128+(($v >> 12) & 63)) . chr(128+(($v >> 6) & 63)) . chr(128+($v & 63));
+						$output .= chr(240 + ($v >> 18)) . chr(128 + (($v >> 12) & 63)) . chr(128 + (($v >> 6) & 63)) . chr(128 + ($v & 63));
 
 					//  'Conversion from UCS-4 to UTF-8 failed: malformed input at byte '.$k
 					else
@@ -5724,7 +5724,7 @@ 
 	}
 
 	// This recursive function creates the index array from the strings
-	$add_string_to_index = function ($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
+	$add_string_to_index = function($string, $index) use (&$strlen, &$substr, &$add_string_to_index)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5751,7 +5751,7 @@ 
 	};
 
 	// This recursive function turns the index array into a regular expression
-	$index_to_regex = function (&$index, $delim) use (&$strlen, &$index_to_regex)
+	$index_to_regex = function(&$index, $delim) use (&$strlen, &$index_to_regex)
 	{
 		static $depth = 0;
 		$depth++;
@@ -5775,11 +5775,11 @@ 
 
 				if (count(array_keys($value)) == 1)
 				{
-					$new_key_array = explode('(?'.'>', $sub_regex);
+					$new_key_array = explode('(?' . '>', $sub_regex);
 					$new_key .= $new_key_array[0];
 				}
 				else
-					$sub_regex = '(?'.'>' . $sub_regex . ')';
+					$sub_regex = '(?' . '>' . $sub_regex . ')';
 			}
 
 			if ($depth > 1)
@@ -5819,7 +5819,7 @@ 
 		$index = $add_string_to_index($string, $index);
 
 	while (!empty($index))
-		$regexes[] = '(?'.'>' . $index_to_regex($index, $delim) . ')';
+		$regexes[] = '(?' . '>' . $index_to_regex($index, $delim) . ')';
 
 	// Restore PHP's internal character encoding to whatever it was originally
 	if (!empty($current_encoding))