Update minify libs and add script for updating

Author: westonruter

minify/JS/ClosureCompiler.php

@@ -14,7 +14,10 @@
  * @todo can use a stream wrapper to unit test this?
  */
 class Minify_JS_ClosureCompiler {
-    const URL = 'http://closure-compiler.appspot.com/compile';
+    /**
+     * @var $url URL to compiler server. defaults to google server
+     */
+    protected $url = 'http://closure-compiler.appspot.com/compile';
 
     /**
      * Minify Javascript code via HTTP request to the Closure Compiler API
@@ -34,12 +37,17 @@ public static function minify($js, array $options = array())
      * @param array $options
      *
      * fallbackFunc : default array($this, 'fallback');
+     * compilerUrl : URL to closure compiler server
      */
     public function __construct(array $options = array())
     {
         $this->_fallbackFunc = isset($options['fallbackMinifier'])
             ? $options['fallbackMinifier']
             : array($this, '_fallback');
+
+        if (isset($options['compilerUrl'])) {
+            $this->url = $options['compilerUrl'];
+        }
     }
 
     public function min($js)
@@ -76,7 +84,7 @@ protected function _getResponse($postBody)
     {
         $allowUrlFopen = preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
         if ($allowUrlFopen) {
-            $contents = file_get_contents(self::URL, false, stream_context_create(array(
+            $contents = file_get_contents($this->url, false, stream_context_create(array(
                 'http' => array(
                     'method' => 'POST',
                     'header' => "Content-type: application/x-www-form-urlencoded\r\nConnection: close\r\n",
@@ -86,7 +94,7 @@ protected function _getResponse($postBody)
                 )
             )));
         } elseif (defined('CURLOPT_POST')) {
-            $ch = curl_init(self::URL);
+            $ch = curl_init($this->url);
             curl_setopt($ch, CURLOPT_POST, true);
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-type: application/x-www-form-urlencoded'));

minify/JS/JSMin.php

@@ -200,8 +200,9 @@ protected function action($command)
                             break;
                         }
                         if ($this->isEOF($this->a)) {
+                            $byte = $this->inputIndex - 1;
                             throw new JSMin_UnterminatedStringException(
-                                "JSMin: Unterminated String at byte {$this->inputIndex}: {$str}");
+                                "JSMin: Unterminated String at byte {$byte}: {$str}");
                         }
                         $str .= $this->a;
                         if ($this->a === '\\') {
@@ -251,8 +252,9 @@ protected function action($command)
                             $this->a = $this->get();
                             $pattern .= $this->a;
                         } elseif ($this->isEOF($this->a)) {
+                            $byte = $this->inputIndex - 1;
                             throw new JSMin_UnterminatedRegExpException(
-                                "JSMin: Unterminated RegExp at byte {$this->inputIndex}: {$pattern}");
+                                "JSMin: Unterminated RegExp at byte {$byte}: {$pattern}");
                         }
                         $this->output .= $this->a;
                         $this->lastByteOut = $this->a;
@@ -272,23 +274,33 @@ protected function isRegexpLiteral()
             // we obviously aren't dividing
             return true;
         }
-        if ($this->a === ' ' || $this->a === "\n") {
-            $length = strlen($this->output);
-            if ($length < 2) { // weird edge case
-                return true;
+
+		// we have to check for a preceding keyword, and we don't need to pattern
+		// match over the whole output.
+		$recentOutput = substr($this->output, -10);
+
+		// check if return/typeof directly precede a pattern without a space
+		foreach (array('return', 'typeof') as $keyword) {
+            if ($this->a !== substr($keyword, -1)) {
+                // certainly wasn't keyword
+                continue;
             }
-            // you can't divide a keyword
-            if (preg_match('/(?:case|else|in|return|typeof)$/', $this->output, $m)) {
-                if ($this->output === $m[0]) { // odd but could happen
-                    return true;
-                }
-                // make sure it's a keyword, not end of an identifier
-                $charBeforeKeyword = substr($this->output, $length - strlen($m[0]) - 1, 1);
-                if (! $this->isAlphaNum($charBeforeKeyword)) {
+            if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
+                if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
                     return true;
                 }
             }
         }
+
+		// check all keywords
+		if ($this->a === ' ' || $this->a === "\n") {
+			if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
+				if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
+					return true;
+				}
+			}
+        }
+
         return false;
     }
 

minify/update

@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+<?php
+
+if ( php_sapi_name() !== 'cli' ) {
+	print "Error: Only executable in CLI mode.\n";
+	exit( 1 );
+}
+
+chdir( __DIR__ . '/../minify' );
+
+$sources = array(
+	"JS/ClosureCompiler.php" => "https://raw.github.com/mrclay/minify/master/min/lib/Minify/JS/ClosureCompiler.php",
+	"JS/JSMin.php" => "https://raw.github.com/mrclay/minify/master/min/lib/JSMin.php",
+	"JS/JSMinPlus.php" => "https://raw.github.com/mrclay/minify/master/min/lib/JSMinPlus.php",
+	"CSS/Compressor.php" => "https://raw.github.com/mrclay/minify/master/min/lib/Minify/CSS/Compressor.php",
+	"CSS/UriRewriter.php" => "https://raw.github.com/mrclay/minify/master/min/lib/Minify/CSS/UriRewriter.php",
+	"CommentPreserver.php" => "https://raw.github.com/mrclay/minify/master/min/lib/Minify/CommentPreserver.php",
+);
+
+foreach( $sources as $path => $url ) {
+	echo "$path => $url\n";
+	$contents = file_get_contents( $url );
+	file_put_contents( $path, $contents ) || exit( 1 );
+	system( sprintf( 'git add %s', escapeshellarg( $path ) ) );
+}