diff --git a/composer.json b/composer.json
index d247aa06e..519273fd1 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"tracy/tracy": "~2.2",
"gregwar/image": "~2.0",
"ircmaxell/password-compat": "1.0.*",
- "mrclay/minify": "~2.2",
+ "mrclay/minify": "dev-master",
"donatj/phpuseragentparser": "dev-master",
"pimple/pimple": "~3.0"
},
@@ -28,5 +28,11 @@
},
"archive": {
"exclude": ["VERSION"]
- }
+ },
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/rhukster/minify"
+ }
+ ]
}
diff --git a/user/config/system.yaml b/user/config/system.yaml
index bb0d73c73..9feefb105 100644
--- a/user/config/system.yaml
+++ b/user/config/system.yaml
@@ -22,7 +22,7 @@ twig:
autoescape: false
assets:
- css_pipeline: false
+ css_pipeline: true
css_minify: true
css_rewrite: true
js_pipeline: false
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 1e7de2708..a4ce51c1c 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809::getLoader();
+return ComposerAutoloaderInit836e000af2692cba78dada56c083fe42::getLoader();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index da84d25ba..3c0e85148 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -44,6 +44,7 @@ return array(
'Grav\\Common\\Filesystem\\File\\Markdown' => $baseDir . '/system/src/Grav/Common/Filesystem/File/Markdown.php',
'Grav\\Common\\Filesystem\\File\\Yaml' => $baseDir . '/system/src/Grav/Common/Filesystem/File/Yaml.php',
'Grav\\Common\\Filesystem\\Folder' => $baseDir . '/system/src/Grav/Common/Filesystem/Folder.php',
+ 'Grav\\Common\\Filesystem\\GravRecursiveFilterIterator' => $baseDir . '/system/src/Grav/Common/Filesystem/Folder.php',
'Grav\\Common\\Getters' => $baseDir . '/system/src/Grav/Common/Getters.php',
'Grav\\Common\\Grav' => $baseDir . '/system/src/Grav/Common/Grav.php',
'Grav\\Common\\GravTrait' => $baseDir . '/system/src/Grav/Common/GravTrait.php',
@@ -131,6 +132,7 @@ return array(
'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',
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 0060574d8..b808f53c6 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809
+class ComposerAutoloaderInit836e000af2692cba78dada56c083fe42
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit836e000af2692cba78dada56c083fe42', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit836e000af2692cba78dada56c083fe42', 'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInit063cb81ce05ae9832bbd593f72977809
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequire063cb81ce05ae9832bbd593f72977809($file);
+ composerRequire836e000af2692cba78dada56c083fe42($file);
}
return $loader;
}
}
-function composerRequire063cb81ce05ae9832bbd593f72977809($file)
+function composerRequire836e000af2692cba78dada56c083fe42($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0b97cbfa4..f11d29f8d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -116,48 +116,6 @@
"caching"
]
},
- {
- "name": "mrclay/minify",
- "version": "2.2.0",
- "version_normalized": "2.2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/mrclay/minify.git",
- "reference": "d245bca4987dec197d1e6d7dc117614b60ff7494"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/mrclay/minify/zipball/d245bca4987dec197d1e6d7dc117614b60ff7494",
- "reference": "d245bca4987dec197d1e6d7dc117614b60ff7494",
- "shasum": ""
- },
- "require": {
- "ext-pcre": "*",
- "php": ">=5.2.1"
- },
- "time": "2014-03-12 12:54:23",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "min/lib/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Steve Clay",
- "email": "steve@mrclay.org",
- "homepage": "http://www.mrclay.org/",
- "role": "Developer"
- }
- ],
- "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
- "homepage": "http://code.google.com/p/minify/"
- },
{
"name": "pimple/pimple",
"version": "v3.0.0",
@@ -711,5 +669,51 @@
"parsedown",
"parser"
]
+ },
+ {
+ "name": "mrclay/minify",
+ "version": "dev-master",
+ "version_normalized": "9999999-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/rhukster/minify.git",
+ "reference": "fdf68abf30ccd86a65f66fa6eb98434eb29bef74"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/rhukster/minify/zipball/fdf68abf30ccd86a65f66fa6eb98434eb29bef74",
+ "reference": "fdf68abf30ccd86a65f66fa6eb98434eb29bef74",
+ "shasum": ""
+ },
+ "require": {
+ "ext-pcre": "*",
+ "php": ">=5.2.1"
+ },
+ "time": "2014-08-29 23:07:55",
+ "type": "library",
+ "installation-source": "source",
+ "autoload": {
+ "classmap": [
+ "min/lib/"
+ ]
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Stephen Clay",
+ "email": "steve@mrclay.org",
+ "role": "Developer"
+ }
+ ],
+ "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers",
+ "homepage": "http://code.google.com/p/minify/",
+ "support": {
+ "email": "minify@googlegroups.com",
+ "issues": "http://code.google.com/p/minify/issues/list",
+ "wiki": "http://code.google.com/p/minify/w/list",
+ "source": "https://github.com/rhukster/minify/tree/master"
+ }
}
]
diff --git a/vendor/erusev/parsedown-extra/composer.json b/vendor/erusev/parsedown-extra/composer.json
deleted file mode 100644
index d9e9d461d..000000000
--- a/vendor/erusev/parsedown-extra/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "erusev/parsedown-extra",
- "description": "An extension of Parsedown that adds support for Markdown Extra.",
- "keywords": ["markdown", "markdown extra", "parser", "parsedown"],
- "homepage": "https://github.com/erusev/parsedown-extra",
- "type": "library",
- "license": "MIT",
- "authors": [
- {
- "name": "Emanuil Rusev",
- "email": "hello@erusev.com",
- "homepage": "http://erusev.com"
- }
- ],
- "require": {
- "erusev/parsedown": "~1.0"
- },
- "autoload": {
- "psr-0": {"ParsedownExtra": ""}
- }
-}
\ No newline at end of file
diff --git a/vendor/mrclay/minify/HISTORY.txt b/vendor/mrclay/minify/HISTORY.txt
index aaba5acfe..9c44d164c 100644
--- a/vendor/mrclay/minify/HISTORY.txt
+++ b/vendor/mrclay/minify/HISTORY.txt
@@ -1,5 +1,8 @@
Minify Release History
+(master)
+ * Builder styled with Bootstrap (thanks to help from acidvertigo)
+
Version 2.2.0
* Fix handling of RegEx in certain situations in JSMin
* Thanks to Vovan-VE for reporting this
diff --git a/vendor/mrclay/minify/min/lib/CSSmin.php b/vendor/mrclay/minify/min/lib/CSSmin.php
index e85f23eb5..409a2ef7a 100644
--- a/vendor/mrclay/minify/min/lib/CSSmin.php
+++ b/vendor/mrclay/minify/min/lib/CSSmin.php
@@ -325,6 +325,10 @@ class CSSmin
// @media screen and (-webkit-min-device-pixel-ratio:0){
$css = preg_replace('/\band\(/i', 'and (', $css);
+ // Put the space back in for @support tag
+ // @supports (display: flex) and @supports not (display: flex)
+ $css = preg_replace('/\b(supports|not)\(/i', '$1 (', $css);
+
// Remove the spaces after the things that should not have spaces after them.
$css = preg_replace('/([\!\{\}\:;\>\+\(\[\~\=,])\s+/S', '$1', $css);
@@ -772,4 +776,4 @@ class CSSmin
return (int) $size;
}
-}
\ No newline at end of file
+}
diff --git a/vendor/mrclay/minify/min/lib/Minify/CSS/UriRewriter.php b/vendor/mrclay/minify/min/lib/Minify/CSS/UriRewriter.php
index 50360ce7e..43cc2548b 100644
--- a/vendor/mrclay/minify/min/lib/Minify/CSS/UriRewriter.php
+++ b/vendor/mrclay/minify/min/lib/Minify/CSS/UriRewriter.php
@@ -70,7 +70,7 @@ class Minify_CSS_UriRewriter {
// rewrite
$css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
,array(self::$className, '_processUriCB'), $css);
- $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+ $css = preg_replace_callback('/url\\(\\s*([\'"](.*?)[\'"]|[^\\)\\s]+)\\s*\\)/'
,array(self::$className, '_processUriCB'), $css);
return $css;
@@ -94,7 +94,7 @@ class Minify_CSS_UriRewriter {
// append
$css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
,array(self::$className, '_processUriCB'), $css);
- $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
+ $css = preg_replace_callback('/url\\(\\s*([\'"](.*?)[\'"]|[^\\)\\s]+)\\s*\\)/'
,array(self::$className, '_processUriCB'), $css);
self::$_prependPath = null;
diff --git a/vendor/mrclay/minify/min/lib/Minify/Cache/File.php b/vendor/mrclay/minify/min/lib/Minify/Cache/File.php
index 27b424a6a..c228eb2b2 100644
--- a/vendor/mrclay/minify/min/lib/Minify/Cache/File.php
+++ b/vendor/mrclay/minify/min/lib/Minify/Cache/File.php
@@ -98,6 +98,9 @@ class Minify_Cache_File {
{
if ($this->_locking) {
$fp = fopen($this->_path . '/' . $id, 'rb');
+ if (!$fp) {
+ return false;
+ }
flock($fp, LOCK_SH);
$ret = stream_get_contents($fp);
flock($fp, LOCK_UN);
diff --git a/vendor/mrclay/minify/min/lib/Minify/ClosureCompiler.php b/vendor/mrclay/minify/min/lib/Minify/ClosureCompiler.php
index bdcdc7ee9..53983a52a 100644
--- a/vendor/mrclay/minify/min/lib/Minify/ClosureCompiler.php
+++ b/vendor/mrclay/minify/min/lib/Minify/ClosureCompiler.php
@@ -33,6 +33,11 @@
*/
class Minify_ClosureCompiler {
+ const OPTION_CHARSET = 'charset';
+ const OPTION_COMPILATION_LEVEL = 'compilation_level';
+
+ public static $isDebug = false;
+
/**
* Filepath of the Closure Compiler jar file. This must be set before
* calling minifyJs().
@@ -65,18 +70,28 @@ class Minify_ClosureCompiler {
* @see https://code.google.com/p/closure-compiler/source/browse/trunk/README
*
* @return string
+ *
+ * @throws Minify_ClosureCompiler_Exception
*/
public static function minify($js, $options = array())
{
self::_prepare();
if (! ($tmpFile = tempnam(self::$tempDir, 'cc_'))) {
- throw new Exception('Minify_ClosureCompiler : could not create temp file in "'.self::$tempDir.'".');
+ throw new Minify_ClosureCompiler_Exception('Minify_ClosureCompiler : could not create temp file in "'.self::$tempDir.'".');
}
file_put_contents($tmpFile, $js);
- exec(self::_getCmd($options, $tmpFile), $output, $result_code);
+ $cmd = self::_getCmd($options, $tmpFile);
+ exec($cmd, $output, $result_code);
unlink($tmpFile);
if ($result_code != 0) {
- throw new Exception('Minify_ClosureCompiler : Closure Compiler execution failed.');
+ $message = 'Minify_ClosureCompiler : Closure Compiler execution failed.';
+ if (self::$isDebug) {
+ exec($cmd . ' 2>&1', $error);
+ if ($error) {
+ $message .= "\nReason:\n" . join("\n", $error);
+ }
+ }
+ throw new Minify_ClosureCompiler_Exception($message);
}
return implode("\n", $output);
}
@@ -85,17 +100,18 @@ class Minify_ClosureCompiler {
{
$o = array_merge(
array(
- 'charset' => 'utf-8',
- 'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
+ self::OPTION_CHARSET => 'utf-8',
+ self::OPTION_COMPILATION_LEVEL => 'SIMPLE_OPTIMIZATIONS',
),
$userOptions
);
+ $charsetOption = $o[self::OPTION_CHARSET];
$cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile)
- . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
- ? " --charset {$o['charset']}"
+ . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $charsetOption)
+ ? " --charset {$charsetOption}"
: '');
- foreach (array('compilation_level') as $opt) {
+ foreach (array(self::OPTION_COMPILATION_LEVEL) as $opt) {
if ($o[$opt]) {
$cmd .= " --{$opt} ". escapeshellarg($o[$opt]);
}
@@ -106,18 +122,18 @@ class Minify_ClosureCompiler {
private static function _prepare()
{
if (! is_file(self::$jarFile)) {
- throw new Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not a valid file.');
+ throw new Minify_ClosureCompiler_Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not a valid file.');
}
if (! is_readable(self::$jarFile)) {
- throw new Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not readable.');
+ throw new Minify_ClosureCompiler_Exception('Minify_ClosureCompiler : $jarFile('.self::$jarFile.') is not readable.');
}
if (! is_dir(self::$tempDir)) {
- throw new Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not a valid direcotry.');
+ throw new Minify_ClosureCompiler_Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not a valid direcotry.');
}
if (! is_writable(self::$tempDir)) {
- throw new Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not writable.');
+ throw new Minify_ClosureCompiler_Exception('Minify_ClosureCompiler : $tempDir('.self::$tempDir.') is not writable.');
}
}
}
-/* vim:ts=4:sw=4:et */
+class Minify_ClosureCompiler_Exception extends Exception {}
diff --git a/vendor/tracy/tracy/composer.json b/vendor/tracy/tracy/composer.json
deleted file mode 100644
index a0e1fe71f..000000000
--- a/vendor/tracy/tracy/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "tracy/tracy",
- "description": "Tracy: useful PHP debugger",
- "keywords": ["debug", "debugger", "nette"],
- "homepage": "http://tracy.nette.org",
- "license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
- "authors": [
- {
- "name": "David Grudl",
- "homepage": "http://davidgrudl.com"
- },
- {
- "name": "Nette Community",
- "homepage": "http://nette.org/contributors"
- }
- ],
- "require": {
- "php": ">=5.3.1"
- },
- "require-dev": {
- "nette/tester": "~1.0"
- },
- "autoload": {
- "classmap": ["src/Tracy"],
- "files": ["src/shortcuts.php"]
- }
-}
diff --git a/vendor/tracy/tracy/examples/Firebug-dump.php b/vendor/tracy/tracy/examples/Firebug-dump.php
deleted file mode 100644
index 46ca8160d..000000000
--- a/vendor/tracy/tracy/examples/Firebug-dump.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-FireLogger demo
-
-Requires Firefox, Firebug and FireLogger.
-
- 'val1', 'key2' => TRUE));
-
-// will show in FireLogger tab in Firebug
-Debugger::fireLog('Hello World');
-Debugger::fireLog($arr);
-
-
-function first($arg1, $arg2)
-{
- second(TRUE, FALSE);
-}
-
-
-
-function second($arg1, $arg2)
-{
- third(array(1, 2, 3));
-}
-
-
-function third($arg1)
-{
- throw new Exception('The my exception', 123);
-}
-
-try {
- first(10, 'any string');
-} catch (Exception $e) {
- Debugger::fireLog($e);
-}
diff --git a/vendor/tracy/tracy/examples/assets/arrow.png b/vendor/tracy/tracy/examples/assets/arrow.png
deleted file mode 100644
index 7c4a55f69..000000000
Binary files a/vendor/tracy/tracy/examples/assets/arrow.png and /dev/null differ
diff --git a/vendor/tracy/tracy/examples/assets/style.css b/vendor/tracy/tracy/examples/assets/style.css
deleted file mode 100644
index 0c2412383..000000000
--- a/vendor/tracy/tracy/examples/assets/style.css
+++ /dev/null
@@ -1,23 +0,0 @@
-body {
- font: 15px/1.5 Tahoma, sans-serif;
- color: #333;
- background: #fff;
- margin: 1.6em;
- padding: 0;
-}
-
-h1 {
- font-size: 210%;
- font-weight: normal;
- color: #036;
-}
-
-pre.tracy-dump {
- border: 1px solid silver;
- padding: 1em;
- margin: 1em 0;
-}
-
-a {
- color: #000080;
-}
diff --git a/vendor/tracy/tracy/examples/barDump.php b/vendor/tracy/tracy/examples/barDump.php
deleted file mode 100644
index 4491d1ef5..000000000
--- a/vendor/tracy/tracy/examples/barDump.php
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-Tracy Debug Bar demo
-
-You can dump variables to bar in rightmost bottom egde.
-
-test', 'String');
diff --git a/vendor/tracy/tracy/examples/dump.php b/vendor/tracy/tracy/examples/dump.php
deleted file mode 100644
index 3ff89e202..000000000
--- a/vendor/tracy/tracy/examples/dump.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-Tracy Dumper demo
-
-test');
-
-dump($arr);
-
-dump($obj);
-
-
-echo "With location
\n";
-
-Debugger::$showLocation = TRUE;
-
-dump($arr);
diff --git a/vendor/tracy/tracy/examples/exception.php b/vendor/tracy/tracy/examples/exception.php
deleted file mode 100644
index 7135015db..000000000
--- a/vendor/tracy/tracy/examples/exception.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-Tracy Exception demo
-
-
-
-Tracy Fatal Error demo
-
-