Uh Oh. Minify was unable to serve Javascript for this app. To troubleshoot this, @@ -209,8 +209,8 @@ $content = ob_get_clean(); $controller = new Minify_Controller_Page($app->env, $app->sourceFactory); $minify = $app->minify->serve($controller, array( - 'content' => $content, - 'id' => __FILE__, + 'content' => $content, + 'id' => __FILE__, 'lastModifiedTime' => max( // regenerate cache if any of these change filemtime(__FILE__), diff --git a/builder/ocCheck.php b/builder/ocCheck.php index 9f8475c..4757e41 100644 --- a/builder/ocCheck.php +++ b/builder/ocCheck.php @@ -1,15 +1,12 @@ config->enableBuilder) { header('Location: /'); @@ -18,20 +15,19 @@ if (!$app->config->enableBuilder) { if ($app->env->get('hello')) { // echo 'World!' - + // try to prevent double encoding (may not have an effect) ini_set('zlib.output_compression', '0'); - - HTTP_Encoder::$encodeToIe6 = true; // just in case + + HTTP_Encoder::$encodeToIe6 = true; // just in case $he = new HTTP_Encoder(array( 'content' => str_repeat('0123456789', 500), - 'method' => 'deflate', + 'method' => 'deflate', )); $he->encode(); $he->sendAll(); - } else { // echo status "0" or "1" header('Content-Type: text/plain'); - echo (int)$_oc; + echo (int) $_oc; } diff --git a/builder/test.php b/builder/test.php index 88e8da0..c139ec6 100644 --- a/builder/test.php +++ b/builder/test.php @@ -37,7 +37,7 @@ if (isset($_GET['oc'])) { echo "
\$_SERVER['SUBDOMAIN_DOCUMENT_ROOT'] is set. " . "You may need to set \$min_documentRoot to this in config.php
"; } - + } -//*/ \ No newline at end of file +//*/ diff --git a/config-test.php b/config-test.php index 7524a3d..a6eb00a 100644 --- a/config-test.php +++ b/config-test.php @@ -4,7 +4,4 @@ * * To test config options, place them in this file and add "&test" to your Minify URL. * Note that if this is on a public server, anyone can execute your test. - * - * @package Minify */ - diff --git a/config.php b/config.php index 02f01ca..8cbe6e1 100644 --- a/config.php +++ b/config.php @@ -2,43 +2,35 @@ /** * Configuration for "min", the default application built with the Minify * library - * - * @package Minify */ - /** * Enable the static serving feature */ $min_enableStatic = false; - /** * Allow use of the Minify URI Builder app. Only set this to true while you need it. */ $min_enableBuilder = false; - /** * Concatenate but do not minify the files. This can be used for testing. */ $min_concatOnly = false; - /** * If non-empty, the Builder will be protected with HTTP Digest auth. * The username is "admin". */ $min_builderPassword = 'admin'; - /** * Set to true to log messages to FirePHP (Firefox Firebug addon) and PHP's error_log * Set to false for no error logging (Minify may be slightly faster). */ $min_errorLogger = false; - /** * To allow debug mode output, you must set this option to true. * @@ -47,13 +39,12 @@ $min_errorLogger = false; * /min/f=file1.js send the cookie minDebug=file1.js * You can manually enable debugging by appending "&debug" to a URI. * E.g. /min/?f=script1.js,script2.js&debug - * + * * In 'debug' mode, Minify combines files with no minification and adds comments * to indicate line #s of the original files. */ $min_allowDebugFlag = false; - /** * For best performance, specify your temp directory here. Otherwise Minify * will have to load extra code to guess. Some examples below: @@ -62,22 +53,20 @@ $min_allowDebugFlag = false; //$min_cachePath = '/tmp'; //$min_cachePath = preg_replace('/^\\d+;/', '', session_save_path()); - /** * To use APC/Memcache/ZendPlatform for cache storage, require the class and * set $min_cachePath to an instance. Example below: */ //$min_cachePath = new Minify_Cache_APC(); - /** * Leave an empty string to use PHP's $_SERVER['DOCUMENT_ROOT']. * - * On some servers, this value may be misconfigured or missing. If so, set this + * On some servers, this value may be misconfigured or missing. If so, set this * to your full document root path with no trailing slash. * E.g. '/home/accountname/public_html' or 'c:\\xampp\\htdocs' * - * If /min/ is directly inside your document root, just uncomment the + * If /min/ is directly inside your document root, just uncomment the * second line. The third line might work on some Apache servers. */ $min_documentRoot = ''; @@ -85,25 +74,22 @@ $min_documentRoot = ''; //$min_documentRoot = substr(__FILE__, 0, -15); //$min_documentRoot = $_SERVER['SUBDOMAIN_DOCUMENT_ROOT']; - /** - * Cache file locking. Set to false if filesystem is NFS. On at least one + * Cache file locking. Set to false if filesystem is NFS. On at least one * NFS system flock-ing attempts stalled PHP for 30 seconds! */ $min_cacheFileLocking = true; - /** * Combining multiple CSS files can place @import declarations after rules, which * is invalid. Minify will attempt to detect when this happens and place a - * warning comment at the top of the CSS output. To resolve this you can either - * move the @imports within your CSS files, or enable this option, which will - * move all @imports to the top of the output. Note that moving @imports could + * warning comment at the top of the CSS output. To resolve this you can either + * move the @imports within your CSS files, or enable this option, which will + * move all @imports to the top of the output. Note that moving @imports could * affect CSS values (which is why this option is disabled by default). */ $min_serveOptions['bubbleCssImports'] = false; - /** * Cache-Control: max-age value sent to browser (in seconds). After this period, * the browser will send another conditional GET. Use a longer period for lower @@ -115,27 +101,24 @@ $min_serveOptions['bubbleCssImports'] = false; */ $min_serveOptions['maxAge'] = 1800; - /** * To use the CSS compressor that shipped with 2.x, uncomment the following line: */ //$min_serveOptions['minifiers'][Minify::TYPE_CSS] = array('Minify_CSS', 'minify'); - /** * To use Google's Closure Compiler API to minify Javascript (falling back to JSMin * on failure), uncomment the following line: */ //$min_serveOptions['minifiers']['application/x-javascript'] = array('Minify_JS_ClosureCompiler', 'minify'); - /** * If you'd like to restrict the "f" option to files within/below * particular directories below DOCUMENT_ROOT, set this here. * You will still need to include the directory in the * f or b GET parameters. - * - * // = shortcut for DOCUMENT_ROOT + * + * // = shortcut for DOCUMENT_ROOT */ //$min_serveOptions['minApp']['allowDirs'] = array('//js', '//css'); @@ -145,23 +128,21 @@ $min_serveOptions['maxAge'] = 1800; */ $min_serveOptions['minApp']['groupsOnly'] = false; - /** * By default, Minify will not minify files with names containing .min or -min * before the extension. E.g. myFile.min.js will not be processed by JSMin - * + * * To minify all files, set this option to null. You could also specify your * own pattern that is matched against the filename. */ //$min_serveOptions['minApp']['noMinPattern'] = '@[-\\.]min\\.(?:js|css)$@i'; - /** * If you minify CSS files stored in symlink-ed directories, the URI rewriting * algorithm can fail. To prevent this, provide an array of link paths to * target paths, where the link paths are within the document root. - * - * Because paths need to be normalized for this to work, use "//" to substitute + * + * Because paths need to be normalized for this to work, use "//" to substitute * the doc root in the link paths (the array keys). E.g.: *
* array('//symlink' => '/real/target/path') // unix
@@ -170,26 +151,25 @@ $min_serveOptions['minApp']['groupsOnly'] = false;
*/
$min_symlinks = array();
-
/**
* If you upload files from Windows to a non-Windows server, Windows may report
- * incorrect mtimes for the files. This may cause Minify to keep serving stale
+ * incorrect mtimes for the files. This may cause Minify to keep serving stale
* cache files when source file changes are made too frequently (e.g. more than
* once an hour).
- *
- * Immediately after modifying and uploading a file, use the touch command to
+ *
+ * Immediately after modifying and uploading a file, use the touch command to
* update the mtime on the server. If the mtime jumps ahead by a number of hours,
- * set this variable to that number. If the mtime moves back, this should not be
+ * set this variable to that number. If the mtime moves back, this should not be
* needed.
*
- * In the Windows SFTP client WinSCP, there's an option that may fix this
- * issue without changing the variable below. Under login > environment,
+ * In the Windows SFTP client WinSCP, there's an option that may fix this
+ * issue without changing the variable below. Under login > environment,
* select the option "Adjust remote timestamp with DST".
- * @link http://winscp.net/eng/docs/ui_login_environment#daylight_saving_time
+ *
+ * @see http://winscp.net/eng/docs/ui_login_environment#daylight_saving_time
*/
$min_uploaderHoursBehind = 0;
-
/**
* Advanced: you can replace some of the PHP classes Minify uses to serve requests.
* To do this, assign a callable to one of the elements of the $min_factories array.
@@ -198,4 +178,3 @@ $min_uploaderHoursBehind = 0;
*/
//$min_factories['minify'] = ... a callable accepting a Minify\App object
//$min_factories['controller'] = ... a callable accepting a Minify\App object
-
diff --git a/groupsConfig.php b/groupsConfig.php
index cc80538..ee686dc 100644
--- a/groupsConfig.php
+++ b/groupsConfig.php
@@ -1,7 +1,6 @@
array('//minify/quick-test.js'),
-// 'testCss' => array('//minify/quick-test.css'),
-// 'js' => array('//js/file1.js', '//js/file2.js'),
-// 'css' => array('//css/file1.css', '//css/file2.css'),
+ // 'testJs' => array('//minify/quick-test.js'),
+ // 'testCss' => array('//minify/quick-test.css'),
+ // 'js' => array('//js/file1.js', '//js/file2.js'),
+ // 'css' => array('//css/file1.css', '//css/file2.css'),
);
diff --git a/index.php b/index.php
index 7b58bcc..66d5421 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,9 @@
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay
*/
class HTTP_ConditionalGet
{
-
/**
* Does the client have a valid copy of the requested resource?
*
@@ -71,7 +65,7 @@ class HTTP_ConditionalGet
*
* @var bool
*/
- public $cacheIsValid = null;
+ public $cacheIsValid;
/**
* @param array $spec options
@@ -116,7 +110,7 @@ class HTTP_ConditionalGet
// backwards compatibility (can be removed later)
if (isset($spec['setExpires'])
&& is_numeric($spec['setExpires'])
- && ! isset($spec['maxAge'])) {
+ && !isset($spec['maxAge'])) {
$spec['maxAge'] = $spec['setExpires'] - $_SERVER['REQUEST_TIME'];
}
if (isset($spec['maxAge'])) {
@@ -128,9 +122,9 @@ class HTTP_ConditionalGet
$etagAppend = '';
if (isset($spec['encoding'])) {
$this->_stripEtag = true;
- if ('' !== $spec['encoding']) {
+ if ($spec['encoding'] !== '') {
$this->_headers['Vary'] = 'Accept-Encoding';
- if (0 === strpos($spec['encoding'], 'x-')) {
+ if (strpos($spec['encoding'], 'x-') === 0) {
$spec['encoding'] = substr($spec['encoding'], 2);
}
$etagAppend = ';' . substr($spec['encoding'], 0, 2);
@@ -227,19 +221,17 @@ class HTTP_ConditionalGet
*
* @param int $lastModifiedTime if given, both ETag AND Last-Modified headers
* will be sent with content. This is recommended.
- *
* @param bool $isPublic (default false) if true, the Cache-Control header
* will contain "public", allowing proxies to cache the content. Otherwise
* "private" will be sent, allowing only browser caching.
- *
* @param array $options (default empty) additional options for constructor
*/
public static function check($lastModifiedTime = null, $isPublic = false, $options = array())
{
- if (null !== $lastModifiedTime) {
- $options['lastModifiedTime'] = (int)$lastModifiedTime;
+ if ($lastModifiedTime !== null) {
+ $options['lastModifiedTime'] = (int) $lastModifiedTime;
}
- $options['isPublic'] = (bool)$isPublic;
+ $options['isPublic'] = (bool) $isPublic;
$cg = new HTTP_ConditionalGet($options);
$cg->sendHeaders();
if ($cg->cacheIsValid) {
@@ -264,13 +256,15 @@ class HTTP_ConditionalGet
}
protected $_headers = array();
- protected $_lmTime = null;
- protected $_etag = null;
+
+ protected $_lmTime;
+
+ protected $_etag;
+
protected $_stripEtag = false;
/**
* @param string $hash
- *
* @param string $scope
*/
protected function _setEtag($hash, $scope)
@@ -284,7 +278,7 @@ class HTTP_ConditionalGet
*/
protected function _setLastModified($time)
{
- $this->_lmTime = (int)$time;
+ $this->_lmTime = (int) $time;
$this->_headers['Last-Modified'] = self::gmtDate($time);
}
@@ -295,7 +289,7 @@ class HTTP_ConditionalGet
*/
protected function _isCacheValid()
{
- if (null === $this->_etag) {
+ if ($this->_etag === null) {
// lmTime is copied to ETag, so this condition implies that the
// server sent neither ETag nor Last-Modified, so the client can't
// possibly has a valid cache.
diff --git a/lib/HTTP/Encoder.php b/lib/HTTP/Encoder.php
index 3bd788c..d023764 100644
--- a/lib/HTTP/Encoder.php
+++ b/lib/HTTP/Encoder.php
@@ -1,8 +1,6 @@
*/
class HTTP_Encoder
{
-
/**
* Should the encoder allow HTTP encoding to IE6?
*
@@ -89,11 +82,11 @@ class HTTP_Encoder
{
$this->_useMbStrlen = (function_exists('mb_strlen')
&& (ini_get('mbstring.func_overload') !== '')
- && ((int)ini_get('mbstring.func_overload') & 2));
+ && ((int) ini_get('mbstring.func_overload') & 2));
$this->_content = $spec['content'];
$this->_headers['Content-Length'] = $this->_useMbStrlen
- ? (string)mb_strlen($this->_content, '8bit')
- : (string)strlen($this->_content);
+ ? (string) mb_strlen($this->_content, '8bit')
+ : (string) strlen($this->_content);
if (isset($spec['type'])) {
$this->_headers['Content-Type'] = $spec['type'];
}
@@ -180,7 +173,6 @@ class HTTP_Encoder
* rarely sent by servers, so client support could be buggier.
*
* @param bool $allowCompress allow the older compress encoding
- *
* @param bool $allowDeflate allow the more recent deflate encoding
*
* @return array two values, 1st is the actual encoding method, 2nd is the
@@ -191,40 +183,44 @@ class HTTP_Encoder
{
// @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
- if (! isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+ if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])
|| self::isBuggyIe()) {
return array('', '');
}
$ae = $_SERVER['HTTP_ACCEPT_ENCODING'];
// gzip checks (quick)
- if (0 === strpos($ae, 'gzip,') // most browsers
- || 0 === strpos($ae, 'deflate, gzip,') // opera
+ if (strpos($ae, 'gzip,') === 0 // most browsers
+ || strpos($ae, 'deflate, gzip,') === 0 // opera
) {
return array('gzip', 'gzip');
}
// gzip checks (slow)
if (preg_match(
- '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
- ,$ae
- ,$m)) {
+ '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@',
+ $ae,
+ $m
+ )) {
return array('gzip', $m[1]);
}
if ($allowDeflate) {
// deflate checks
$aeRev = strrev($ae);
- if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit
- || 0 === strpos($aeRev, 'etalfed,') // gecko
- || 0 === strpos($ae, 'deflate,') // opera
+ if (strpos($aeRev, 'etalfed ,') === 0 // ie, webkit
+ || strpos($aeRev, 'etalfed,') === 0 // gecko
+ || strpos($ae, 'deflate,') === 0 // opera
// slow parsing
|| preg_match(
- '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) {
+ '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@',
+ $ae
+ )) {
return array('deflate', 'deflate');
}
}
if ($allowCompress && preg_match(
- '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
- ,$ae
- ,$m)) {
+ '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@',
+ $ae,
+ $m
+ )) {
return array('compress', $m[1]);
}
@@ -250,13 +246,13 @@ class HTTP_Encoder
*/
public function encode($compressionLevel = null)
{
- if (! self::isBuggyIe()) {
+ if (!self::isBuggyIe()) {
$this->_headers['Vary'] = 'Accept-Encoding';
}
- if (null === $compressionLevel) {
+ if ($compressionLevel === null) {
$compressionLevel = self::$compressionLevel;
}
- if ('' === $this->_encodeMethod[0]
+ if ($this->_encodeMethod[0] === ''
|| ($compressionLevel == 0)
|| !extension_loaded('zlib')) {
return false;
@@ -268,12 +264,12 @@ class HTTP_Encoder
} else {
$encoded = gzcompress($this->_content, $compressionLevel);
}
- if (false === $encoded) {
+ if ($encoded === false) {
return false;
}
$this->_headers['Content-Length'] = $this->_useMbStrlen
- ? (string)mb_strlen($encoded, '8bit')
- : (string)strlen($encoded);
+ ? (string) mb_strlen($encoded, '8bit')
+ : (string) strlen($encoded);
$this->_headers['Content-Encoding'] = $this->_encodeMethod[1];
$this->_content = $encoded;
@@ -286,7 +282,6 @@ class HTTP_Encoder
* This is a convenience method for common use of the class
*
* @param string $content
- *
* @param int $compressionLevel given to zlib functions. If not given, the
* class default will be used.
*
@@ -294,7 +289,7 @@ class HTTP_Encoder
*/
public static function output($content, $compressionLevel = null)
{
- if (null === $compressionLevel) {
+ if ($compressionLevel === null) {
$compressionLevel = self::$compressionLevel;
}
$he = new HTTP_Encoder(array('content' => $content));
@@ -316,20 +311,23 @@ class HTTP_Encoder
}
$ua = $_SERVER['HTTP_USER_AGENT'];
// quick escape for non-IEs
- if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ')
- || false !== strpos($ua, 'Opera')) {
+ if (strpos($ua, 'Mozilla/4.0 (compatible; MSIE ') !== 0
+ || strpos($ua, 'Opera') !== false) {
return false;
}
// no regex = faaast
- $version = (float)substr($ua, 30);
+ $version = (float) substr($ua, 30);
return self::$encodeToIe6
- ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1')))
+ ? ($version < 6 || ($version == 6 && strpos($ua, 'SV1') === false))
: ($version < 7);
}
protected $_content = '';
+
protected $_headers = array();
+
protected $_encodeMethod = array('', '');
+
protected $_useMbStrlen = false;
}
diff --git a/lib/Minify.php b/lib/Minify.php
index c41871d..b3c1cf7 100644
--- a/lib/Minify.php
+++ b/lib/Minify.php
@@ -1,9 +1,7 @@
- * @author Stephen Clay
* @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
* @license http://opensource.org/licenses/bsd-license.php New BSD License
- * @link https://github.com/mrclay/minify
+ *
+ * @see https://github.com/mrclay/minify
*/
class Minify
{
-
/**
* API version
*
@@ -34,10 +29,13 @@ class Minify
const VERSION = 3;
const TYPE_CSS = 'text/css';
+
const TYPE_HTML = 'text/html';
+
// there is some debate over the ideal JS Content-Type, but this is the
// Apache default and what Yahoo! uses..
const TYPE_JS = 'application/x-javascript';
+
const URL_DEBUG = 'https://github.com/mrclay/minify/blob/master/docs/Debugging.wiki.md';
/**
@@ -99,30 +97,30 @@ class Minify
public function getDefaultOptions()
{
return array(
- 'isPublic' => true,
+ 'isPublic' => true,
'encodeOutput' => function_exists('gzdeflate'),
'encodeMethod' => null, // determine later
- 'encodeLevel' => 9,
+ 'encodeLevel' => 9,
'minifiers' => array(
- Minify::TYPE_JS => array('JSMin\\JSMin', 'minify'),
- Minify::TYPE_CSS => array('Minify_CSSmin', 'minify'),
+ Minify::TYPE_JS => array('JSMin\\JSMin', 'minify'),
+ Minify::TYPE_CSS => array('Minify_CSSmin', 'minify'),
Minify::TYPE_HTML => array('Minify_HTML', 'minify'),
),
'minifierOptions' => array(), // no minifier options
'contentTypeCharset' => 'utf-8',
- 'maxAge' => 1800, // 30 minutes
- 'rewriteCssUris' => true,
- 'bubbleCssImports' => false,
- 'quiet' => false, // serve() will send headers and output
- 'debug' => false,
- 'concatOnly' => false,
+ 'maxAge' => 1800, // 30 minutes
+ 'rewriteCssUris' => true,
+ 'bubbleCssImports' => false,
+ 'quiet' => false, // serve() will send headers and output
+ 'debug' => false,
+ 'concatOnly' => false,
// if you override these, the response codes MUST be directly after
// the first space.
'badRequestHeader' => 'HTTP/1.0 400 Bad Request',
- 'errorHeader' => 'HTTP/1.0 500 Internal Server Error',
+ 'errorHeader' => 'HTTP/1.0 500 Internal Server Error',
// callback function to see/modify content of all sources
'postprocessor' => null,
@@ -135,7 +133,7 @@ class Minify
* appear too late in the combined stylesheet. If found, serve() will prepend
* the output with this warning.
*/
- 'importWarning' => "/* See https://github.com/mrclay/minify/blob/master/docs/CommonProblems.wiki.md#imports-can-appear-in-invalid-locations-in-combined-css-files */\n"
+ 'importWarning' => "/* See https://github.com/mrclay/minify/blob/master/docs/CommonProblems.wiki.md#imports-can-appear-in-invalid-locations-in-combined-css-files */\n",
);
}
@@ -176,6 +174,7 @@ class Minify
*
* 'debug' : set to true to minify all sources with the 'Lines' controller, which
* eases the debugging of combined files. This also prevents 304 responses.
+ *
* @see Minify_Lines::minify()
*
* 'concatOnly' : set to true to disable minification and simply concatenate the files.
@@ -211,14 +210,13 @@ class Minify
* Any controller options are documented in that controller's createConfiguration() method.
*
* @param Minify_ControllerInterface $controller instance of subclass of Minify_Controller_Base
- *
* @param array $options controller/serve options
*
- * @return null|array if the 'quiet' option is set to true, an array
- * with keys "success" (bool), "statusCode" (int), "content" (string), and
- * "headers" (array).
- *
* @throws Exception
+ *
+ * @return array|null if the 'quiet' option is set to true, an array
+ * with keys "success" (bool), "statusCode" (int), "content" (string), and
+ * "headers" (array)
*/
public function serve(Minify_ControllerInterface $controller, $options = array())
{
@@ -239,16 +237,16 @@ class Minify
// check request validity
if (!$this->sources) {
// invalid request!
- if (! $this->options['quiet']) {
+ if (!$this->options['quiet']) {
$this->errorExit($this->options['badRequestHeader'], self::URL_DEBUG);
} else {
- list(,$statusCode) = explode(' ', $this->options['badRequestHeader']);
+ list(, $statusCode) = explode(' ', $this->options['badRequestHeader']);
return array(
- 'success' => false,
- 'statusCode' => (int)$statusCode,
- 'content' => '',
- 'headers' => array(),
+ 'success' => false,
+ 'statusCode' => (int) $statusCode,
+ 'content' => '',
+ 'headers' => array(),
);
}
}
@@ -273,7 +271,7 @@ class Minify
// getAcceptedEncoding(false, false) leaves out compress and deflate as options.
$list = HTTP_Encoder::getAcceptedEncoding(false, false);
list($this->options['encodeMethod'], $contentEncoding) = $list;
- $sendVary = ! HTTP_Encoder::isBuggyIe();
+ $sendVary = !HTTP_Encoder::isBuggyIe();
}
} else {
$this->options['encodeMethod'] = ''; // identity (no encoding)
@@ -282,8 +280,8 @@ class Minify
// check client cache
$cgOptions = array(
'lastModifiedTime' => $this->options['lastModifiedTime'],
- 'isPublic' => $this->options['isPublic'],
- 'encoding' => $this->options['encodeMethod'],
+ 'isPublic' => $this->options['isPublic'],
+ 'encoding' => $this->options['encodeMethod'],
);
if ($this->options['maxAge'] > 0) {
@@ -295,17 +293,17 @@ class Minify
$cg = new HTTP_ConditionalGet($cgOptions);
if ($cg->cacheIsValid) {
// client's cache is valid
- if (! $this->options['quiet']) {
+ if (!$this->options['quiet']) {
$cg->sendHeaders();
return;
}
return array(
- 'success' => true,
+ 'success' => true,
'statusCode' => 304,
- 'content' => '',
- 'headers' => $cg->getHeaders(),
+ 'content' => '',
+ 'headers' => $cg->getHeaders(),
);
}
@@ -332,7 +330,7 @@ class Minify
}
// check server cache
- if (! $this->options['debug']) {
+ if (!$this->options['debug']) {
// using cache
// the goal is to use only the cache methods to sniff the length and
// output the content, as they do not require ever loading the file into
@@ -350,9 +348,10 @@ class Minify
$content = $this->combineMinify();
} catch (Exception $e) {
$this->logger && $this->logger->critical($e->getMessage());
- if (! $this->options['quiet']) {
+ if (!$this->options['quiet']) {
$this->errorExit($this->options['errorHeader'], self::URL_DEBUG);
}
+
throw $e;
}
$this->cache->store($cacheId, $content);
@@ -363,17 +362,19 @@ class Minify
} else {
// no cache
$cacheIsReady = false;
+
try {
$content = $this->combineMinify();
} catch (Exception $e) {
$this->logger && $this->logger->critical($e->getMessage());
- if (! $this->options['quiet']) {
+ if (!$this->options['quiet']) {
$this->errorExit($this->options['errorHeader'], self::URL_DEBUG);
}
+
throw $e;
}
}
- if (! $cacheIsReady && $this->options['encodeMethod']) {
+ if (!$cacheIsReady && $this->options['encodeMethod']) {
// still need to encode
$content = gzencode($content, $this->options['encodeLevel']);
}
@@ -382,7 +383,7 @@ class Minify
if ($cacheIsReady) {
$headers['Content-Length'] = $cacheContentLength;
} else {
- if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+ if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
$headers['Content-Length'] = mb_strlen($content, '8bit');
} else {
$headers['Content-Length'] = strlen($content);
@@ -401,7 +402,7 @@ class Minify
$headers['Vary'] = 'Accept-Encoding';
}
- if (! $this->options['quiet']) {
+ if (!$this->options['quiet']) {
// output headers & content
foreach ($headers as $name => $val) {
header($name . ': ' . $val);
@@ -413,10 +414,10 @@ class Minify
}
} else {
return array(
- 'success' => true,
+ 'success' => true,
'statusCode' => 200,
- 'content' => $cacheIsReady ? $this->cache->fetch($fullCacheId) : $content,
- 'headers' => $headers,
+ 'content' => $cacheIsReady ? $this->cache->fetch($fullCacheId) : $content,
+ 'headers' => $headers,
);
}
}
@@ -427,8 +428,7 @@ class Minify
* No internal caching will be used and the content will not be HTTP encoded.
*
* @param array $sources array of filepaths and/or Minify_Source objects
- *
- * @param array $options (optional) array of options for serve.
+ * @param array $options (optional) array of options for serve
*
* @return string
*/
@@ -444,9 +444,9 @@ class Minify
$controller = new Minify_Controller_Files($env, $sourceFactory, $this->logger);
$options = array_merge($options, array(
- 'files' => (array)$sources,
- 'quiet' => true,
- 'encodeMethod' => '',
+ 'files' => (array) $sources,
+ 'quiet' => true,
+ 'encodeMethod' => '',
'lastModifiedTime' => 0,
));
$out = $this->serve($controller, $options);
@@ -464,24 +464,24 @@ class Minify
* @param string $msgHtml HTML message for the client
*
* @return void
+ *
* @internal This is not part of the public API and is subject to change
- * @access private
*/
public function errorExit($header, $url = '', $msgHtml = '')
{
$url = htmlspecialchars($url, ENT_QUOTES);
- list(,$h1) = explode(' ', $header, 2);
+ list(, $h1) = explode(' ', $header, 2);
$h1 = htmlspecialchars($h1);
// FastCGI environments require 3rd arg to header() to be set
list(, $code) = explode(' ', $header, 3);
header($header, true, $code);
header('Content-Type: text/html; charset=utf-8');
- echo "$h1
";
+ echo "${h1}
";
if ($msgHtml) {
echo $msgHtml;
}
if ($url) {
- echo "Please see $url.
";
+ echo "Please see ${url}.
";
}
exit;
}
@@ -490,6 +490,7 @@ class Minify
* Default minifier for .min or -min JS files.
*
* @param string $content
+ *
* @return string
*/
public static function nullMinifier($content)
@@ -537,9 +538,9 @@ class Minify
/**
* Combines sources and minifies the result.
*
- * @return string
- *
* @throws Exception
+ *
+ * @return string
*/
protected function combineMinify()
{
@@ -590,10 +591,11 @@ class Minify
// do we need to process our group right now?
if ($i > 0 // yes, we have at least the first group populated
&& (
- ! $source // yes, we ran out of sources
+ !$source // yes, we ran out of sources
|| $type === self::TYPE_CSS // yes, to process CSS individually (avoiding PCRE bugs/limits)
|| $minifier !== $lastMinifier // yes, minifier changed
- || $options !== $lastOptions)) { // yes, options changed
+ || $options !== $lastOptions
+ )) { // yes, options changed
// minify previous sources with last settings
$imploded = implode($implodeSeparator, $groupToProcessTogether);
$groupToProcessTogether = array();
@@ -601,7 +603,7 @@ class Minify
try {
$content[] = call_user_func($lastMinifier, $imploded, $lastOptions);
} catch (Exception $e) {
- throw new Exception("Exception in minifier: " . $e->getMessage());
+ throw new Exception('Exception in minifier: ' . $e->getMessage());
}
} else {
$content[] = $imploded;
@@ -618,7 +620,7 @@ class Minify
$content = implode($implodeSeparator, $content);
- if ($type === self::TYPE_CSS && false !== strpos($content, '@import')) {
+ if ($type === self::TYPE_CSS && strpos($content, '@import') !== false) {
$content = $this->handleCssImports($content);
}
@@ -671,12 +673,11 @@ class Minify
if ($this->options['bubbleCssImports']) {
// bubble CSS imports
preg_match_all('/@import.*?;/', $css, $imports);
- $css = implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css);
- return $css;
+ return implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css);
}
- if ('' === $this->options['importWarning']) {
+ if ($this->options['importWarning'] === '') {
return $css;
}
@@ -684,8 +685,8 @@ class Minify
$noCommentCss = preg_replace('@/\\*[\\s\\S]*?\\*/@', '', $css);
$lastImportPos = strrpos($noCommentCss, '@import');
$firstBlockPos = strpos($noCommentCss, '{');
- if (false !== $lastImportPos
- && false !== $firstBlockPos
+ if ($lastImportPos !== false
+ && $firstBlockPos !== false
&& $firstBlockPos < $lastImportPos
) {
// { appears before @import : prepend warning
@@ -738,7 +739,7 @@ class Minify
}
if (empty($options['contentType'])) {
- if (null === $type) {
+ if ($type === null) {
$type = 'text/plain';
}
$options['contentType'] = $type;
diff --git a/lib/Minify/App.php b/lib/Minify/App.php
index bc885b2..4f40d06 100644
--- a/lib/Minify/App.php
+++ b/lib/Minify/App.php
@@ -2,6 +2,7 @@
namespace Minify;
+use Minify;
use Minify_Cache_File;
use Minify_CacheInterface;
use Minify_Controller_MinApp;
@@ -9,11 +10,10 @@ use Minify_ControllerInterface;
use Minify_DebugDetector;
use Minify_Env;
use Minify_Source_Factory;
+use Monolog;
use Props\Container;
use Psr\Log\LoggerInterface;
use RuntimeException;
-use Monolog;
-use Minify;
/**
* @property Minify_CacheInterface $cache
@@ -34,7 +34,6 @@ use Minify;
*/
class App extends Container
{
-
/**
* Constructor
*
@@ -58,8 +57,9 @@ class App extends Container
}
$type = $that->typeOf($config->cachePath);
+
throw new RuntimeException('$min_cachePath must be a path or implement Minify_CacheInterface.'
- . " Given $type");
+ . " Given ${type}");
};
$this->config = function (App $app) {
@@ -76,14 +76,13 @@ class App extends Container
$propNames = array_keys(get_object_vars($config));
$prefixer = function ($name) {
- return "min_$name";
+ return "min_${name}";
};
$varNames = array_map($prefixer, $propNames);
$varDefined = get_defined_vars();
- $varNames = array_filter($varNames, function($name) use($varDefined)
- {
+ $varNames = array_filter($varNames, function ($name) use ($varDefined) {
return array_key_exists($name, $varDefined);
});
@@ -122,8 +121,9 @@ class App extends Container
}
$type = $that->typeOf($ctrl);
+
throw new RuntimeException('$min_factories["controller"] callable must return an implementation'
- ." of Minify_CacheInterface. Returned $type");
+ . " of Minify_CacheInterface. Returned ${type}");
};
$this->docRoot = function (App $app) {
@@ -140,7 +140,7 @@ class App extends Container
};
$this->errorLogHandler = function (App $app) {
- $format = "%channel%.%level_name%: %message% %context% %extra%";
+ $format = '%channel%.%level_name%: %message% %context% %extra%';
$handler = new Monolog\Handler\ErrorLogHandler();
$handler->setFormatter(new Monolog\Formatter\LineFormatter($format));
@@ -148,7 +148,7 @@ class App extends Container
};
$this->groupsConfig = function (App $app) {
- return (require $app->groupsConfigPath);
+ return require $app->groupsConfigPath;
};
$this->groupsConfigPath = "{$this->dir}/groupsConfig.php";
@@ -188,8 +188,9 @@ class App extends Container
}
$type = $that->typeOf($value);
+
throw new RuntimeException('If set, $min_errorLogger must be a PSR-3 logger or a Monolog handler.'
- ." Given $type");
+ . " Given ${type}");
};
$this->minify = function (App $app) use ($that) {
@@ -205,8 +206,9 @@ class App extends Container
}
$type = $that->typeOf($minify);
+
throw new RuntimeException('$min_factories["minify"] callable must return a Minify object.'
- ." Returned $type");
+ . " Returned ${type}");
};
$this->serveOptions = function (App $app) {
@@ -289,6 +291,7 @@ class App extends Container
/**
* @param mixed $var
+ *
* @return string
*/
private function typeOf($var)
diff --git a/lib/Minify/Build.php b/lib/Minify/Build.php
index d018d93..b6e7023 100644
--- a/lib/Minify/Build.php
+++ b/lib/Minify/Build.php
@@ -1,7 +1,6 @@
(time() + 86400 * 365)
* ));
*
- *
- * @package Minify
- * @author Stephen Clay " . h($e->getMessage()) . "
"; - if (0 === strpos(get_class($e), 'JSMin_Unterminated') +function getExceptionMsg(Exception $e, $input) +{ + $msg = '' . h($e->getMessage()) . '
'; + if (strpos(get_class($e), 'JSMin_Unterminated') === 0 && preg_match('~byte (\d+)~', $e->getMessage(), $m)) { - $msg .= "";
+ $msg .= '';
if ($m[1] > 200) {
$msg .= h(substr($input, ($m[1] - 200), 200));
} else {
@@ -102,9 +103,10 @@ function getExceptionMsg(Exception $e, $input) {
if ($highlighted === "\n") {
$highlighted = "⏎\n";
}
- $msg .= "$highlighted";
- $msg .= h(substr($input, $m[1] + 1, 200)) . "";
+ $msg .= "${highlighted}";
+ $msg .= h(substr($input, $m[1] + 1, 200)) . '';
}
+
return $msg;
}
@@ -113,37 +115,35 @@ function getExceptionMsg(Exception $e, $input) {
*
* @param array $vars
*/
-function sendPage($vars) {
- header('Content-Type: text/html; charset=utf-8');
-?>
+function sendPage($vars)
+{
+ header('Content-Type: text/html; charset=utf-8'); ?>
Warning! Please do not place this application on a public site. This should be used only for testing.
\\n)