Merge pull request #199 from owncloud/use-jsqueeze

User JSqueeze for minification
owncloud-archive · Sep 29, 2015 · e2a142c · e2a142c
2 parents 5ce8de1 + 618691d
commit e2a142c
Show file tree

Hide file tree

Showing 271 changed files with 2,868 additions and 19,668 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,6 @@ bin
 # ignore demo files
 james-heinrich/getid3/demos
 james-heinrich/getid3/helperapps
-mrclay/minify/min_unit_tests
-mrclay/minify/min_extras
-mrclay/minify/min/builder
 
 doctrine/annotations/tests
 doctrine/annotations/.travis.yml
@@ -153,3 +150,6 @@ deepdiver1975/tarstreamer/.travis.yml
 deepdiver1975/tarstreamer/.scrutinizer.yml
 deepdiver1975/tarstreamer/composer.json
 deepdiver1975/tarstreamer/tests
+
+patchwork/jsqueeze/tests
+patchwork/jsqueeze/phpunit.xml.dist
diff --git a/composer.json b/composer.json
@@ -9,15 +9,13 @@
 		"sabre/dav" : "2.1.6",
 		"doctrine/dbal": "2.5.1",
 		"mcnetic/zipstreamer": "v0.7",
-		"kriswallsmith/assetic": "1.2.*@dev",
 		"phpseclib/phpseclib": "~2.0@dev",
 		"rackspace/php-opencloud": "v1.9.2",
 		"james-heinrich/getid3": "dev-master",
 		"jeremeamia/superclosure": "2.0.0",
 		"ircmaxell/random-lib": "~1.1",
 		"bantu/ini-get-wrapper": "v1.0.1",
 		"natxet/CssMin": "dev-master",
-		"mrclay/minify": "dev-master",
 		"punic/punic": "1.1.0",
 		"pear/archive_tar": "~1.4",
 		"patchwork/utf8": "~1.1",
@@ -34,6 +32,8 @@
 		"league/flysystem": "1.0.4",
 		"pear/pear-core-minimal": "v1.10.0alpha2",
 		"interfasys/lognormalizer": "dev-master@dev",
-		"deepdiver1975/TarStreamer": "v0.1-beta3"
+		"deepdiver1975/TarStreamer": "v0.1-beta3",
+		"patchwork/jsqueeze": "^2.0",
+		"kriswallsmith/assetic": "^1.3"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -351,7 +351,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -361,7 +361,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -380,7 +380,7 @@ private function findFileWithExtension($class, $ext)
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -390,7 +390,7 @@ private function findFileWithExtension($class, $ext)
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
                 return $file;
             }
         }

diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
@@ -6,7 +6,6 @@
 $baseDir = $vendorDir;
 
 return array(
-    'CSSmin' => $vendorDir . '/mrclay/minify/min/lib/CSSmin.php',
     'CssAtCharsetParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'CssAtCharsetToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'CssAtFontFaceDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
@@ -65,56 +64,6 @@
     'CssVariablesMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'CssVariablesMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'CssWhitesmithsFormatter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
-    'DooDigestAuth' => $vendorDir . '/mrclay/minify/min/lib/DooDigestAuth.php',
-    'FirePHP' => $vendorDir . '/mrclay/minify/min/lib/FirePHP.php',
-    'HTTP_ConditionalGet' => $vendorDir . '/mrclay/minify/min/lib/HTTP/ConditionalGet.php',
-    'HTTP_Encoder' => $vendorDir . '/mrclay/minify/min/lib/HTTP/Encoder.php',
-    'JSCompilerContext' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'JSMin' => $vendorDir . '/mrclay/minify/min/lib/JSMin.php',
-    'JSMinPlus' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'JSMin_UnterminatedCommentException' => $vendorDir . '/mrclay/minify/min/lib/JSMin.php',
-    'JSMin_UnterminatedRegExpException' => $vendorDir . '/mrclay/minify/min/lib/JSMin.php',
-    'JSMin_UnterminatedStringException' => $vendorDir . '/mrclay/minify/min/lib/JSMin.php',
-    'JSNode' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'JSParser' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'JSToken' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'JSTokenizer' => $vendorDir . '/mrclay/minify/min/lib/JSMinPlus.php',
-    'Minify' => $vendorDir . '/mrclay/minify/min/lib/Minify.php',
-    'Minify_Build' => $vendorDir . '/mrclay/minify/min/lib/Minify/Build.php',
-    'Minify_CSS' => $vendorDir . '/mrclay/minify/min/lib/Minify/CSS.php',
-    'Minify_CSS_Compressor' => $vendorDir . '/mrclay/minify/min/lib/Minify/CSS/Compressor.php',
-    'Minify_CSS_UriRewriter' => $vendorDir . '/mrclay/minify/min/lib/Minify/CSS/UriRewriter.php',
-    'Minify_CSSmin' => $vendorDir . '/mrclay/minify/min/lib/Minify/CSSmin.php',
-    'Minify_Cache_APC' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/APC.php',
-    'Minify_Cache_File' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/File.php',
-    'Minify_Cache_Memcache' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/Memcache.php',
-    'Minify_Cache_WinCache' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/WinCache.php',
-    'Minify_Cache_XCache' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/XCache.php',
-    'Minify_Cache_ZendPlatform' => $vendorDir . '/mrclay/minify/min/lib/Minify/Cache/ZendPlatform.php',
-    'Minify_ClosureCompiler' => $vendorDir . '/mrclay/minify/min/lib/Minify/ClosureCompiler.php',
-    'Minify_ClosureCompiler_Exception' => $vendorDir . '/mrclay/minify/min/lib/Minify/ClosureCompiler.php',
-    'Minify_CommentPreserver' => $vendorDir . '/mrclay/minify/min/lib/Minify/CommentPreserver.php',
-    'Minify_Controller_Base' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/Base.php',
-    'Minify_Controller_Files' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/Files.php',
-    'Minify_Controller_Groups' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/Groups.php',
-    'Minify_Controller_MinApp' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/MinApp.php',
-    'Minify_Controller_Page' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/Page.php',
-    'Minify_Controller_Version1' => $vendorDir . '/mrclay/minify/min/lib/Minify/Controller/Version1.php',
-    'Minify_DebugDetector' => $vendorDir . '/mrclay/minify/min/lib/Minify/DebugDetector.php',
-    'Minify_HTML' => $vendorDir . '/mrclay/minify/min/lib/Minify/HTML.php',
-    'Minify_HTML_Helper' => $vendorDir . '/mrclay/minify/min/lib/Minify/HTML/Helper.php',
-    'Minify_ImportProcessor' => $vendorDir . '/mrclay/minify/min/lib/Minify/ImportProcessor.php',
-    'Minify_JS_ClosureCompiler' => $vendorDir . '/mrclay/minify/min/lib/Minify/JS/ClosureCompiler.php',
-    'Minify_JS_ClosureCompiler_Exception' => $vendorDir . '/mrclay/minify/min/lib/Minify/JS/ClosureCompiler.php',
-    'Minify_Lines' => $vendorDir . '/mrclay/minify/min/lib/Minify/Lines.php',
-    'Minify_Loader' => $vendorDir . '/mrclay/minify/min/lib/Minify/Loader.php',
-    'Minify_Logger' => $vendorDir . '/mrclay/minify/min/lib/Minify/Logger.php',
-    'Minify_Packer' => $vendorDir . '/mrclay/minify/min/lib/Minify/Packer.php',
-    'Minify_Source' => $vendorDir . '/mrclay/minify/min/lib/Minify/Source.php',
-    'Minify_YUICompressor' => $vendorDir . '/mrclay/minify/min/lib/Minify/YUICompressor.php',
-    'Minify_YUI_CssCompressor' => $vendorDir . '/mrclay/minify/min/lib/Minify/YUI/CssCompressor.php',
-    'MrClay\\Cli' => $vendorDir . '/mrclay/minify/min/lib/MrClay/Cli.php',
-    'MrClay\\Cli\\Arg' => $vendorDir . '/mrclay/minify/min/lib/MrClay/Cli/Arg.php',
     'aCssAtBlockEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'aCssAtBlockStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
     'aCssDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',

diff --git a/composer/autoload_files.php b/composer/autoload_files.php
@@ -8,7 +8,7 @@
 return array(
     $vendorDir . '/react/promise/src/functions_include.php',
     $vendorDir . '/nikic/php-parser/lib/bootstrap.php',
-    $vendorDir . '/kriswallsmith/assetic/src/functions.php',
     $vendorDir . '/ircmaxell/password-compat/lib/password.php',
     $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
+    $vendorDir . '/kriswallsmith/assetic/src/functions.php',
 );
diff --git a/composer/autoload_psr4.php b/composer/autoload_psr4.php
@@ -20,6 +20,7 @@
     'Sabre\\CalDAV\\' => array($vendorDir . '/sabre/dav/lib/CalDAV'),
     'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
     'Punic\\' => array($vendorDir . '/punic/punic/code'),
+    'Patchwork\\' => array($vendorDir . '/patchwork/jsqueeze/src'),
     'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
     'InterfaSys\\LogNormalizer\\' => array($vendorDir . '/interfasys/lognormalizer/src'),
     'Icewind\\Streams\\Tests\\' => array($vendorDir . '/icewind/streams/tests'),