Skip to content

Commit

Permalink
Merge pull request #126 from owncloud/minify-js-css-master
Browse files Browse the repository at this point in the history 
adding cssmin and jssmin(minify)
  • Loading branch information
@LukasReschke
LukasReschke committed Oct 17, 2014
2 parents 5db359c + 635aaf8 commit f6d7a51
Show file tree
Hide file tree
Showing 57 changed files with 17,423 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +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
2 changes: 1 addition & 1 deletion autoload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer' . '/autoload_real.php';

return ComposerAutoloaderInit96654a5746889b254811c7316da366d7::getLoader();
return ComposerAutoloaderInit3669affcbbaeb5ccc4a88f42b228548d::getLoader();
4 changes: 3 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"rackspace/php-opencloud": "v1.9.2",
"james-heinrich/getid3": "dev-master",
"ircmaxell/random-lib": "v1.0.0",
"bantu/ini-get-wrapper": "v1.0.1"
"bantu/ini-get-wrapper": "v1.0.1",
"natxet/CssMin": "dev-master",
"mrclay/minify": "dev-master"
}
}
95 changes: 92 additions & 3 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

119 changes: 119 additions & 0 deletions composer/autoload_classmap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,128 @@
$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',
'CssAtFontFaceEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtFontFaceParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtFontFaceStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtImportParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtImportToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesRulesetDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesRulesetEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesRulesetStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtKeyframesStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtMediaEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtMediaParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtMediaStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtPageDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtPageEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtPageParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtPageStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtVariablesDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtVariablesEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtVariablesParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssAtVariablesStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssCommentParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssCommentToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssCompressColorValuesMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssCompressExpressionValuesMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssCompressUnitValuesMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertFontWeightMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertHslColorsMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertLevel3AtKeyframesMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertLevel3PropertiesMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertNamedColorsMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssConvertRgbColorsMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssError' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssExpressionParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssImportImportsMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssMin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssMinifier' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssNullToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssOtbsFormatter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssParser' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRemoveCommentsMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRemoveEmptyAtBlocksMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRemoveEmptyRulesetsMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRemoveLastDelarationSemiColonMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRulesetDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRulesetEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRulesetParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssRulesetStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssSortRulesetPropertiesMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssStringParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'CssUrlParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'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',
'PHPMailer' => $vendorDir . '/phpmailer/phpmailer/class.phpmailer.php',
'POP3' => $vendorDir . '/phpmailer/phpmailer/class.pop3.php',
'SMTP' => $vendorDir . '/phpmailer/phpmailer/class.smtp.php',
'aCssAtBlockEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssAtBlockStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssDeclarationToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssFormatter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssMinifierFilter' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssMinifierPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssParserPlugin' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssRulesetEndToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssRulesetStartToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'aCssToken' => $vendorDir . '/natxet/CssMin/src/CssMin.php',
'getID3' => $vendorDir . '/james-heinrich/getid3/getid3/getid3.php',
'getid3_exception' => $vendorDir . '/james-heinrich/getid3/getid3/getid3.php',
'getid3_handler' => $vendorDir . '/james-heinrich/getid3/getid3/getid3.php',
Expand Down
10 changes: 5 additions & 5 deletions composer/autoload_real.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit96654a5746889b254811c7316da366d7
class ComposerAutoloaderInit3669affcbbaeb5ccc4a88f42b228548d
{
private static $loader;

Expand All @@ -19,9 +19,9 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit96654a5746889b254811c7316da366d7', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3669affcbbaeb5ccc4a88f42b228548d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit96654a5746889b254811c7316da366d7', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3669affcbbaeb5ccc4a88f42b228548d', 'loadClassLoader'));

$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
Expand All @@ -46,14 +46,14 @@ public static function getLoader()

$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
composerRequire96654a5746889b254811c7316da366d7($file);
composerRequire3669affcbbaeb5ccc4a88f42b228548d($file);
}

return $loader;
}
}

function composerRequire96654a5746889b254811c7316da366d7($file)
function composerRequire3669affcbbaeb5ccc4a88f42b228548d($file)
{
require $file;
}

0 comments on commit f6d7a51

Please sign in to comment.