From b31855f6b8b84c5533f816d8f397dade3893836a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 3 Apr 2020 10:43:07 +0300 Subject: [PATCH] Apply php-cs-fixer fixers - braces - function_declaration - lowercase_keywords - method_argument_space - no_spaces_inside_parenthesis - no_trailing_whitespace - no_trailing_whitespace_in_comment - single_blank_line_at_eof --- builder/index.php | 2 +- builder/ocCheck.php | 3 +- builder/test.php | 4 +- config-test.php | 3 +- config.php | 39 ++++++++------- index.php | 4 +- lib/HTTP/Encoder.php | 18 ++++--- lib/Minify.php | 7 +-- lib/Minify/App.php | 3 +- lib/Minify/CSSmin.php | 12 ++--- lib/Minify/Cache/Null.php | 2 +- lib/Minify/Cache/WinCache.php | 2 +- lib/Minify/Controller/Files.php | 1 - lib/Minify/Controller/Groups.php | 1 - lib/Minify/Controller/Page.php | 1 - lib/Minify/ControllerInterface.php | 2 +- lib/Minify/HTML.php | 57 ++++++++++++---------- lib/Minify/ImportProcessor.php | 2 +- lib/Minify/JS/ClosureCompiler.php | 4 +- lib/Minify/NailgunClosureCompiler.php | 2 +- lib/Minify/Source/Factory.php | 2 +- lib/Minify/YUICompressor.php | 1 - lib/MrClay/Cli.php | 1 - min_extras/cli/rewrite-uris.php | 5 +- min_extras/config.php | 4 +- min_extras/tools/minifyTextarea.php | 38 +++++++-------- min_extras/tools/minifyUrl.php | 22 +++++---- min_extras/tools/testRewriteUri.php | 8 ++- server-info.php | 3 +- static/gen.php | 4 +- static/lib.php | 12 +++-- tests/HTTPEncoderTest.php | 44 ++++++++--------- tests/JSMinTest.php | 2 +- tests/JsClosureCompilerTest.php | 28 ++++++++--- tests/LessSourceTest.php | 2 +- tests/MinifyBuildTest.php | 2 +- tests/MinifyCSSUriRewriterTest.php | 13 ++--- tests/MinifyCacheAPCTest.php | 2 +- tests/MinifyCacheMemcacheTest.php | 1 - tests/MinifyCacheWinCacheTest.php | 2 +- tests/MinifyCacheZendPlatformTest.php | 2 +- tests/MinifyCommentPreserverTest.php | 2 +- tests/MinifyHTMLHelperTest.php | 2 +- tests/MinifyImportProcessorTest.php | 7 ++- tests/MinifyNailgunClosureCompilerTest.php | 2 +- tests/MinifyTest.php | 17 ++++--- tests/MinifyYuiCSSTest.php | 2 +- tests/ScssSourceTest.php | 2 +- tests/TestCase.php | 2 +- utils.php | 2 +- 50 files changed, 217 insertions(+), 188 deletions(-) diff --git a/builder/index.php b/builder/index.php index 9cb8c1a..d4ea38c 100644 --- a/builder/index.php +++ b/builder/index.php @@ -1,4 +1,4 @@ -env->get('hello')) { )); $he->encode(); $he->sendAll(); - } else { // echo status "0" or "1" header('Content-Type: text/plain'); 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..8b903a5 100644 --- a/config-test.php +++ b/config-test.php @@ -4,7 +4,6 @@ * * 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..3eb084d 100644 --- a/config.php +++ b/config.php @@ -2,7 +2,7 @@ /** * Configuration for "min", the default application built with the Minify * library - * + * * @package Minify */ @@ -47,7 +47,7 @@ $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. */ @@ -73,11 +73,11 @@ $min_allowDebugFlag = false; /** * 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 = ''; @@ -87,7 +87,7 @@ $min_documentRoot = ''; /** - * 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; @@ -96,9 +96,9 @@ $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; @@ -134,8 +134,8 @@ $min_serveOptions['maxAge'] = 1800; * 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'); @@ -149,7 +149,7 @@ $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. */ @@ -160,8 +160,8 @@ $min_serveOptions['minApp']['groupsOnly'] = false; * 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 @@ -173,17 +173,17 @@ $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 */ @@ -198,4 +198,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/index.php b/index.php index 7b58bcc..e3fea30 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,9 @@ 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, @@ -470,7 +470,7 @@ class Minify 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); @@ -593,7 +593,8 @@ class Minify ! $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(); diff --git a/lib/Minify/App.php b/lib/Minify/App.php index bc885b2..4ed15a6 100644 --- a/lib/Minify/App.php +++ b/lib/Minify/App.php @@ -82,8 +82,7 @@ class App extends Container $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); }); diff --git a/lib/Minify/CSSmin.php b/lib/Minify/CSSmin.php index 753c510..0003f73 100644 --- a/lib/Minify/CSSmin.php +++ b/lib/Minify/CSSmin.php @@ -73,16 +73,16 @@ class Minify_CSSmin } if ($options['currentDir']) { return Minify_CSS_UriRewriter::rewrite( - $css - ,$options['currentDir'] - ,$options['docRoot'] - ,$options['symlinks'] + $css, + $options['currentDir'], + $options['docRoot'], + $options['symlinks'] ); } return Minify_CSS_UriRewriter::prepend( - $css - ,$options['prependRelativePath'] + $css, + $options['prependRelativePath'] ); } } diff --git a/lib/Minify/Cache/Null.php b/lib/Minify/Cache/Null.php index 4f654a6..165043e 100644 --- a/lib/Minify/Cache/Null.php +++ b/lib/Minify/Cache/Null.php @@ -64,4 +64,4 @@ class Minify_Cache_Null implements Minify_CacheInterface public function fetch($id) { } -} \ No newline at end of file +} diff --git a/lib/Minify/Cache/WinCache.php b/lib/Minify/Cache/WinCache.php index 46e285a..3dd1c40 100644 --- a/lib/Minify/Cache/WinCache.php +++ b/lib/Minify/Cache/WinCache.php @@ -136,4 +136,4 @@ class Minify_Cache_WinCache implements Minify_CacheInterface return true; } -} \ No newline at end of file +} diff --git a/lib/Minify/Controller/Files.php b/lib/Minify/Controller/Files.php index 85a76d0..7d517f4 100644 --- a/lib/Minify/Controller/Files.php +++ b/lib/Minify/Controller/Files.php @@ -68,4 +68,3 @@ class Minify_Controller_Files extends Minify_Controller_Base return new Minify_ServeConfiguration($options, $sources); } } - diff --git a/lib/Minify/Controller/Groups.php b/lib/Minify/Controller/Groups.php index af8af33..d3813f2 100644 --- a/lib/Minify/Controller/Groups.php +++ b/lib/Minify/Controller/Groups.php @@ -73,4 +73,3 @@ class Minify_Controller_Groups extends Minify_Controller_Files return parent::createConfiguration($options); } } - diff --git a/lib/Minify/Controller/Page.php b/lib/Minify/Controller/Page.php index 7001fe0..ca2778c 100644 --- a/lib/Minify/Controller/Page.php +++ b/lib/Minify/Controller/Page.php @@ -66,4 +66,3 @@ class Minify_Controller_Page extends Minify_Controller_Base return new Minify_ServeConfiguration($options, $sources, $selectionId); } } - diff --git a/lib/Minify/ControllerInterface.php b/lib/Minify/ControllerInterface.php index 35b4de3..1527ff6 100644 --- a/lib/Minify/ControllerInterface.php +++ b/lib/Minify/ControllerInterface.php @@ -19,4 +19,4 @@ interface Minify_ControllerInterface * @return Minify_Env */ public function getEnv(); -} \ No newline at end of file +} diff --git a/lib/Minify/HTML.php b/lib/Minify/HTML.php index 5dfb095..ef98b38 100644 --- a/lib/Minify/HTML.php +++ b/lib/Minify/HTML.php @@ -99,32 +99,34 @@ class Minify_HTML // replace SCRIPTs (and minify) with placeholders $this->_html = preg_replace_callback( - '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/iu' - ,array($this, '_removeScriptCB') - ,$this->_html); + '/(\\s*)]*?>)([\\s\\S]*?)<\\/script>(\\s*)/iu', + array($this, '_removeScriptCB'), + $this->_html + ); // replace STYLEs (and minify) with placeholders $this->_html = preg_replace_callback( - '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/iu' - ,array($this, '_removeStyleCB') - ,$this->_html); + '/\\s*]*>)([\\s\\S]*?)<\\/style>\\s*/iu', + array($this, '_removeStyleCB'), + $this->_html + ); // remove HTML comments (not containing IE conditional comments). $this->_html = preg_replace_callback( - '//u' - ,array($this, '_commentCB') - ,$this->_html); + '//u', + array($this, '_commentCB'), + $this->_html + ); // replace PREs with placeholders - $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu' - ,array($this, '_removePreCB') - ,$this->_html); + $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu', array($this, '_removePreCB'), $this->_html); // replace TEXTAREAs with placeholders $this->_html = preg_replace_callback( - '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu' - ,array($this, '_removeTextareaCB') - ,$this->_html); + '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu', + array($this, '_removeTextareaCB'), + $this->_html + ); // trim each line. // @todo take into account attribute values that span multiple lines. @@ -139,24 +141,25 @@ class Minify_HTML // remove ws outside of all elements $this->_html = preg_replace( - '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<' - ,$this->_html); + '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<', + $this->_html + ); // use newlines before 1st attribute in open tags (to limit line lengths) $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/iu', "$1\n$2", $this->_html); // fill placeholders $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); // issue 229: multi-pass to catch scripts that didn't get replaced in textareas $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); return $this->_html; @@ -209,7 +212,8 @@ class Minify_HTML : 'trim'; $css = call_user_func($minifier, $css); - return $this->_reservePlace($this->_needsCdata($css) + return $this->_reservePlace( + $this->_needsCdata($css) ? "{$openStyle}/**/" : "{$openStyle}{$css}" ); @@ -238,7 +242,8 @@ class Minify_HTML : 'trim'; $js = call_user_func($minifier, $js); - return $this->_reservePlace($this->_needsCdata($js) + return $this->_reservePlace( + $this->_needsCdata($js) ? "{$ws1}{$openScript}/**/{$ws2}" : "{$ws1}{$openScript}{$js}{$ws2}" ); diff --git a/lib/Minify/ImportProcessor.php b/lib/Minify/ImportProcessor.php index 85d9ff5..f8ed4b4 100644 --- a/lib/Minify/ImportProcessor.php +++ b/lib/Minify/ImportProcessor.php @@ -66,7 +66,7 @@ class Minify_ImportProcessor $this->_currentDir = dirname($file); // remove UTF-8 BOM if present - if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) { + if (pack("CCC", 0xef, 0xbb, 0xbf) === substr($content, 0, 3)) { $content = substr($content, 3); } // ensure uniform EOLs diff --git a/lib/Minify/JS/ClosureCompiler.php b/lib/Minify/JS/ClosureCompiler.php index b842622..1919035 100644 --- a/lib/Minify/JS/ClosureCompiler.php +++ b/lib/Minify/JS/ClosureCompiler.php @@ -195,13 +195,13 @@ class Minify_JS_ClosureCompiler curl_close($ch); } else { throw new Minify_JS_ClosureCompiler_Exception( - "Could not make HTTP request: allow_url_open is false and cURL not available" + "Could not make HTTP request: allow_url_open is false and cURL not available" ); } if (false === $contents) { throw new Minify_JS_ClosureCompiler_Exception( - "No HTTP response from server" + "No HTTP response from server" ); } diff --git a/lib/Minify/NailgunClosureCompiler.php b/lib/Minify/NailgunClosureCompiler.php index bdc49da..8ce4520 100644 --- a/lib/Minify/NailgunClosureCompiler.php +++ b/lib/Minify/NailgunClosureCompiler.php @@ -110,4 +110,4 @@ class Minify_NailgunClosureCompiler extends Minify_ClosureCompiler $this->shell("$serverCommand /dev/null 2>/dev/null & sleep 10"); } -} \ No newline at end of file +} diff --git a/lib/Minify/Source/Factory.php b/lib/Minify/Source/Factory.php index f36d1b2..3e6e378 100644 --- a/lib/Minify/Source/Factory.php +++ b/lib/Minify/Source/Factory.php @@ -170,7 +170,7 @@ class Minify_Source_Factory if ($this->options['noMinPattern'] && preg_match($this->options['noMinPattern'], $basename)) { if (preg_match('~\.(css|less)$~i', $basename)) { $spec['minifyOptions']['compress'] = false; - // we still want URI rewriting to work for CSS + // we still want URI rewriting to work for CSS } else { $spec['minifier'] = 'Minify::nullMinifier'; } diff --git a/lib/Minify/YUICompressor.php b/lib/Minify/YUICompressor.php index a45f572..47723fc 100644 --- a/lib/Minify/YUICompressor.php +++ b/lib/Minify/YUICompressor.php @@ -154,4 +154,3 @@ class Minify_YUICompressor } } } - diff --git a/lib/MrClay/Cli.php b/lib/MrClay/Cli.php index e9ef3b3..fc736ab 100644 --- a/lib/MrClay/Cli.php +++ b/lib/MrClay/Cli.php @@ -390,4 +390,3 @@ class Cli $this->errors[$letter][] = sprintf($msg, $value); } } - diff --git a/min_extras/cli/rewrite-uris.php b/min_extras/cli/rewrite-uris.php index 0ca560f..08ca7c8 100755 --- a/min_extras/cli/rewrite-uris.php +++ b/min_extras/cli/rewrite-uris.php @@ -27,7 +27,7 @@ $outfile = $cli->values['o']; $testRun = $cli->values['t']; $docRoot = $cli->values['d']; -$pathRewriter = function($css, $options) { +$pathRewriter = function ($css, $options) { return Minify_CSS_UriRewriter::rewrite($css, $options['currentDir'], $options['docRoot']); }; @@ -54,9 +54,8 @@ $combined = Minify::combine($sources) . "\n"; if ($testRun) { echo $combined; echo Minify_CSS_UriRewriter::$debugText . "\n"; -} else { +} else { $fp = $cli->openOutput(); fwrite($fp, $combined); $cli->closeOutput(); } - diff --git a/min_extras/config.php b/min_extras/config.php index cb33edd..c7143b6 100644 --- a/min_extras/config.php +++ b/min_extras/config.php @@ -4,6 +4,6 @@ require __DIR__ . '/../config.php'; -$minifyCachePath = isset($min_cachePath) - ? $min_cachePath +$minifyCachePath = isset($min_cachePath) + ? $min_cachePath : ''; diff --git a/min_extras/tools/minifyTextarea.php b/min_extras/tools/minifyTextarea.php index a5b5926..64c04f8 100644 --- a/min_extras/tools/minifyTextarea.php +++ b/min_extras/tools/minifyTextarea.php @@ -13,7 +13,8 @@ $app->cache = new Minify_Cache_Null(); $env = $app->env; -function h($txt) { +function h($txt) +{ return htmlspecialchars($txt, ENT_QUOTES, 'UTF-8'); } @@ -22,13 +23,12 @@ if ($env->post('textIn')) { } if ($env->post('method') === 'Minify and serve') { - $base = trim($env->post('base')); if ($base) { $textIn = preg_replace( - '@(]*>)@i' - ,'$1' - ,$textIn + '@(]*>)@i', + '$1', + $textIn ); } @@ -58,7 +58,6 @@ $tpl = array(); $tpl['classes'] = array('Minify_HTML', 'JSMin\\JSMin', 'Minify_CSS', 'Minify_Lines'); if (in_array($env->post('method'), $tpl['classes'])) { - $args = array($textIn); if ($env->post('method') === 'Minify_HTML') { $args[] = array( @@ -88,7 +87,8 @@ sendPage($tpl); * @param string $input * @return string HTML */ -function getExceptionMsg(Exception $e, $input) { +function getExceptionMsg(Exception $e, $input) +{ $msg = "

" . h($e->getMessage()) . "

"; if (0 === strpos(get_class($e), 'JSMin_Unterminated') && preg_match('~byte (\d+)~', $e->getMessage(), $m)) { @@ -113,37 +113,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'); ?> minifyTextarea

Warning! Please do not place this application on a public site. This should be used only for testing.

Bytes in{$vars['inBytes']} (after line endings normalized to \\n) Bytes out{$vars['outBytes']} (reduced " . round(100 - (100 * $vars['outBytes'] / $vars['inBytes'])) . "%) Time (s)" . round($vars['time'], 5) . " "; -} -?> + } ?>

+ echo h($vars['output']); + } ?>

Minify with: - +

...or this HTML to the browser. Also minify: : diff --git a/min_extras/tools/minifyUrl.php b/min_extras/tools/minifyUrl.php index a2629e6..8851c87 100644 --- a/min_extras/tools/minifyUrl.php +++ b/min_extras/tools/minifyUrl.php @@ -12,7 +12,8 @@ $app->cache = new Minify_Cache_Null(); $env = $app->env; -function getPost($key) { +function getPost($key) +{ if (! isset($_POST[$key])) { return null; } @@ -21,14 +22,16 @@ function getPost($key) { : $_POST[$key]; } -function sniffType($headers) { +function sniffType($headers) +{ $charset = 'utf-8'; $type = null; $headers = "\n\n" . implode("\n\n", $headers) . "\n\n"; if (preg_match( - '@\\n\\nContent-Type: *([\\w/\\+-]+)( *; *charset *= *([\\w-]+))? *\\n\\n@i' - ,$headers - ,$m)) { + '@\\n\\nContent-Type: *([\\w/\\+-]+)( *; *charset *= *([\\w-]+))? *\\n\\n@i', + $headers, + $m + )) { $sentType = $m[1]; if (isset($m[3])) { $charset = $m[3]; @@ -49,7 +52,6 @@ function sniffType($headers) { } if (isset($_POST['url'])) { - require '../config.php'; $url = trim($env->post('url')); @@ -88,13 +90,13 @@ if (isset($_POST['url'])) { die('Unrecognized Content-Type: ' . $type['sent']); } - if ($type['minify'] === 'text/html' + if ($type['minify'] === 'text/html' && isset($_POST['addBase']) && ! preg_match('@]*>)@i' - ,'$1' - ,$content + '@(]*>)@i', + '$1', + $content ); } diff --git a/min_extras/tools/testRewriteUri.php b/min_extras/tools/testRewriteUri.php index f2f0011..3977e2e 100644 --- a/min_extras/tools/testRewriteUri.php +++ b/min_extras/tools/testRewriteUri.php @@ -8,9 +8,13 @@ $env = $app->env; header('Content-Type: text/html;charset=utf-8'); -function h($str) { return htmlspecialchars($str, ENT_QUOTES); } +function h($str) +{ + return htmlspecialchars($str, ENT_QUOTES); +} -function getInput($name, $default = '', $size = 50) { +function getInput($name, $default = '', $size = 50) +{ global $env; $val = $env->post($name, $default); return ""; diff --git a/server-info.php b/server-info.php index e0c6af8..e6369c2 100644 --- a/server-info.php +++ b/server-info.php @@ -13,7 +13,8 @@ if (!$enabled) { die('Set $enabled to true to see server info.'); } -function assertTrue($test, $message) { +function assertTrue($test, $message) +{ if (!$test) { echo "Warning: $message\n"; } diff --git a/static/gen.php b/static/gen.php index f07aac2..c39cefa 100644 --- a/static/gen.php +++ b/static/gen.php @@ -7,12 +7,12 @@ if (is_file(__DIR__ . '/bootstrap.php')) { $bootstrap_file = __DIR__ . '/../bootstrap.php'; } -$send_400 = function($content = 'Bad URL') { +$send_400 = function ($content = 'Bad URL') { http_response_code(400); die($content); }; -$send_301 = function($url) { +$send_301 = function ($url) { http_response_code(301); header("Cache-Control: max-age=31536000"); header("Location: $url"); diff --git a/static/lib.php b/static/lib.php index 665bc13..864e0f7 100644 --- a/static/lib.php +++ b/static/lib.php @@ -10,7 +10,8 @@ namespace Minify\StaticService; * @param string $type "css" or "js" * @return string */ -function build_uri($static_uri, $query, $type) { +function build_uri($static_uri, $query, $type) +{ $static_uri = rtrim($static_uri, '/'); $query = ltrim($query, '?'); @@ -30,7 +31,8 @@ function build_uri($static_uri, $query, $type) { * @param bool $auto_create Automatically create the directory if missing? * @return null|string null if missing or can't create */ -function get_cache_time($auto_create = true) { +function get_cache_time($auto_create = true) +{ foreach (scandir(__DIR__) as $entry) { if (ctype_digit($entry)) { return $entry; @@ -50,14 +52,16 @@ function get_cache_time($auto_create = true) { return $time; } -function flush_cache() { +function flush_cache() +{ $time = get_cache_time(false); if ($time) { remove_tree(__DIR__ . "/$time"); } } -function remove_tree($dir) { +function remove_tree($dir) +{ $files = array_diff(scandir($dir), array('.', '..')); foreach ($files as $file) { diff --git a/tests/HTTPEncoderTest.php b/tests/HTTPEncoderTest.php index a3b3359..b512e3c 100644 --- a/tests/HTTPEncoderTest.php +++ b/tests/HTTPEncoderTest.php @@ -166,15 +166,15 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) $len = strlen($data); - if ($len < 18 || strcmp(substr($data,0,2),"\x1f\x8b")) { + if ($len < 18 || strcmp(substr($data, 0, 2), "\x1f\x8b")) { $error = "Not in GZIP format."; if ($mbIntEnc !== null) { mb_internal_encoding($mbIntEnc); } return null; // Not GZIP format (See RFC 1952) } - $method = ord(substr($data,2,1)); // Compression method - $flags = ord(substr($data,3,1)); // Flags + $method = ord(substr($data, 2, 1)); // Compression method + $flags = ord(substr($data, 3, 1)); // Flags if ($flags & 31 != $flags) { $error = "Reserved bits not allowed."; if ($mbIntEnc !== null) { @@ -183,10 +183,10 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) return null; } // NOTE: $mtime may be negative (PHP integer limitations) - $mtime = unpack("V", substr($data,4,4)); + $mtime = unpack("V", substr($data, 4, 4)); $mtime = $mtime[1]; - $xfl = substr($data,8,1); - $os = substr($data,8,1); + $xfl = substr($data, 8, 1); + $os = substr($data, 8, 1); $headerlen = 10; $extralen = 0; $extra = ""; @@ -198,7 +198,7 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return false; // invalid } - $extralen = unpack("v",substr($data,8,2)); + $extralen = unpack("v", substr($data, 8, 2)); $extralen = $extralen[1]; if ($len - $headerlen - 2 - $extralen < 8) { if ($mbIntEnc !== null) { @@ -206,7 +206,7 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return false; // invalid } - $extra = substr($data,10,$extralen); + $extra = substr($data, 10, $extralen); $headerlen += 2 + $extralen; } $filenamelen = 0; @@ -219,14 +219,14 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return false; // invalid } - $filenamelen = strpos(substr($data,$headerlen),chr(0)); + $filenamelen = strpos(substr($data, $headerlen), chr(0)); if ($filenamelen === false || $len - $headerlen - $filenamelen - 1 < 8) { if ($mbIntEnc !== null) { mb_internal_encoding($mbIntEnc); } return false; // invalid } - $filename = substr($data,$headerlen,$filenamelen); + $filename = substr($data, $headerlen, $filenamelen); $headerlen += $filenamelen + 1; } $commentlen = 0; @@ -239,14 +239,14 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return false; // invalid } - $commentlen = strpos(substr($data,$headerlen),chr(0)); + $commentlen = strpos(substr($data, $headerlen), chr(0)); if ($commentlen === false || $len - $headerlen - $commentlen - 1 < 8) { if ($mbIntEnc !== null) { mb_internal_encoding($mbIntEnc); } return false; // Invalid header format } - $comment = substr($data,$headerlen,$commentlen); + $comment = substr($data, $headerlen, $commentlen); $headerlen += $commentlen + 1; } $headercrc = ""; @@ -258,8 +258,8 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return false; // invalid } - $calccrc = crc32(substr($data,0,$headerlen)) & 0xffff; - $headercrc = unpack("v", substr($data,$headerlen,2)); + $calccrc = crc32(substr($data, 0, $headerlen)) & 0xffff; + $headercrc = unpack("v", substr($data, $headerlen, 2)); $headercrc = $headercrc[1]; if ($headercrc != $calccrc) { $error = "Header checksum failed."; @@ -271,9 +271,9 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) $headerlen += 2; } // GZIP FOOTER - $datacrc = unpack("V",substr($data,-8,4)); - $datacrc = sprintf('%u',$datacrc[1] & 0xFFFFFFFF); - $isize = unpack("V",substr($data,-4)); + $datacrc = unpack("V", substr($data, -8, 4)); + $datacrc = sprintf('%u', $datacrc[1] & 0xFFFFFFFF); + $isize = unpack("V", substr($data, -4)); $isize = $isize[1]; // decompression: $bodylen = $len-$headerlen-8; @@ -284,13 +284,13 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } return null; } - $body = substr($data,$headerlen,$bodylen); + $body = substr($data, $headerlen, $bodylen); $data = ""; if ($bodylen > 0) { switch ($method) { case 8: // Currently the only supported compression method: - $data = gzinflate($body,$maxlength); + $data = gzinflate($body, $maxlength); break; default: $error = "Unknown compression method."; @@ -301,11 +301,11 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) } } // zero-byte body content is allowed // Verifiy CRC32 - $crc = sprintf("%u",crc32($data)); + $crc = sprintf("%u", crc32($data)); $crcOK = $crc == $datacrc; $lenOK = $isize == strlen($data); if (!$lenOK || !$crcOK) { - $error = ( $lenOK ? '' : 'Length check FAILED. ') . ( $crcOK ? '' : 'Checksum FAILED.'); + $error = ($lenOK ? '' : 'Length check FAILED. ') . ($crcOK ? '' : 'Checksum FAILED.'); $ret = false; } $ret = $data; @@ -313,4 +313,4 @@ function _phpman_gzdecode($data, &$filename='', &$error='', $maxlength=null) mb_internal_encoding($mbIntEnc); } return $ret; -} \ No newline at end of file +} diff --git a/tests/JSMinTest.php b/tests/JSMinTest.php index 66c19c0..dc94c09 100644 --- a/tests/JSMinTest.php +++ b/tests/JSMinTest.php @@ -126,4 +126,4 @@ class JSMinTest extends TestCase ), ); } -} \ No newline at end of file +} diff --git a/tests/JsClosureCompilerTest.php b/tests/JsClosureCompilerTest.php index 1d3ffab..d9f7a7a 100644 --- a/tests/JsClosureCompilerTest.php +++ b/tests/JsClosureCompilerTest.php @@ -32,8 +32,11 @@ class JsClosureCompilerTest extends TestCase $this->compile($src); } catch (Minify_JS_ClosureCompiler_Exception $e) { } - $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, - 'Throws Minify_JS_ClosureCompiler_Exception'); + $this->assertInstanceOf( + 'Minify_JS_ClosureCompiler_Exception', + $e, + 'Throws Minify_JS_ClosureCompiler_Exception' + ); } // Test maximum byte size check (default) @@ -46,8 +49,11 @@ class JsClosureCompilerTest extends TestCase $this->compile($src); } catch (Minify_JS_ClosureCompiler_Exception $e) { } - $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, - 'Throws Minify_JS_ClosureCompiler_Exception'); + $this->assertInstanceOf( + 'Minify_JS_ClosureCompiler_Exception', + $e, + 'Throws Minify_JS_ClosureCompiler_Exception' + ); $expected = 'POST content larger than ' . Minify_JS_ClosureCompiler::DEFAULT_MAX_BYTES . ' bytes'; $this->assertEquals($expected, $e->getMessage(), 'Message must tell how big maximum byte size is'); @@ -76,8 +82,11 @@ class JsClosureCompilerTest extends TestCase )); } catch (Minify_JS_ClosureCompiler_Exception $e) { } - $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, - 'Throws Minify_JS_ClosureCompiler_Exception'); + $this->assertInstanceOf( + 'Minify_JS_ClosureCompiler_Exception', + $e, + 'Throws Minify_JS_ClosureCompiler_Exception' + ); $expected = 'POST content larger than ' . $allowedBytes . ' bytes'; $this->assertEquals($expected, $e->getMessage(), 'Message must tell how big maximum byte size is'); @@ -96,8 +105,11 @@ class JsClosureCompilerTest extends TestCase )); } catch (Minify_JS_ClosureCompiler_Exception $e) { } - $this->assertInstanceOf('Minify_JS_ClosureCompiler_Exception', $e, - 'Throws Minify_JS_ClosureCompiler_Exception'); + $this->assertInstanceOf( + 'Minify_JS_ClosureCompiler_Exception', + $e, + 'Throws Minify_JS_ClosureCompiler_Exception' + ); } public function test7() diff --git a/tests/LessSourceTest.php b/tests/LessSourceTest.php index 037d055..16c0715 100644 --- a/tests/LessSourceTest.php +++ b/tests/LessSourceTest.php @@ -39,4 +39,4 @@ class LessSourceTest extends TestCase $this->assertEquals("/min/g=less&{$max}", $res); } -} \ No newline at end of file +} diff --git a/tests/MinifyBuildTest.php b/tests/MinifyBuildTest.php index f0ab994..6e5ae6b 100644 --- a/tests/MinifyBuildTest.php +++ b/tests/MinifyBuildTest.php @@ -25,4 +25,4 @@ class MinifyBuildTest extends TestCase $this->assertEquals($b->uri('/path'), "/path?{$maxTime}", 'uri() with no querystring'); $this->assertEquals($b->uri('/path?hello'), "/path?hello&{$maxTime}", 'uri() with existing querystring'); } -} \ No newline at end of file +} diff --git a/tests/MinifyCSSUriRewriterTest.php b/tests/MinifyCSSUriRewriterTest.php index 83871bf..63e4ebe 100644 --- a/tests/MinifyCSSUriRewriterTest.php +++ b/tests/MinifyCSSUriRewriterTest.php @@ -16,9 +16,10 @@ class MinifyCSSUriRewriterTest extends TestCase $in = file_get_contents(self::$test_files . '/css_uriRewriter/in.css'); $expected = file_get_contents(self::$test_files . '/css_uriRewriter/exp.css'); $actual = Minify_CSS_UriRewriter::rewrite( - $in - , self::$test_files . '/css_uriRewriter' // currentDir - , self::$document_root // use DOCUMENT_ROOT = '/full/path/to/min_unit_tests' + $in, + self::$test_files . '/css_uriRewriter' // currentDir + , + self::$document_root // use DOCUMENT_ROOT = '/full/path/to/min_unit_tests' ); $this->assertEquals($expected, $actual, 'rewrite, debug: ' . Minify_CSS_UriRewriter::$debugText); @@ -47,9 +48,9 @@ class MinifyCSSUriRewriterTest extends TestCase $in = '../../../../assets/skins/sam/sprite.png'; $exp = '/yui/assets/skins/sam/sprite.png'; $actual = Minify_CSS_UriRewriter::rewriteRelative( - $in - , 'sf_root_dir\web\yui\menu\assets\skins\sam' - , 'sf_root_dir\web' + $in, + 'sf_root_dir\web\yui\menu\assets\skins\sam', + 'sf_root_dir\web' ); $this->assertEquals($exp, $actual, 'Issue 99, debug: ' . Minify_CSS_UriRewriter::$debugText); diff --git a/tests/MinifyCacheAPCTest.php b/tests/MinifyCacheAPCTest.php index 447f72b..15b3b69 100644 --- a/tests/MinifyCacheAPCTest.php +++ b/tests/MinifyCacheAPCTest.php @@ -22,4 +22,4 @@ class MinifyCacheAPCTest extends TestCase $cache = new Minify_Cache_APC(); $this->assertTestCache($cache, $id, $data); } -} \ No newline at end of file +} diff --git a/tests/MinifyCacheMemcacheTest.php b/tests/MinifyCacheMemcacheTest.php index 6d71c27..4758a53 100644 --- a/tests/MinifyCacheMemcacheTest.php +++ b/tests/MinifyCacheMemcacheTest.php @@ -45,4 +45,3 @@ class MinifyCacheMemcacheTest extends TestCase $this->assertTestCache($cache, $id, $data); } } - diff --git a/tests/MinifyCacheWinCacheTest.php b/tests/MinifyCacheWinCacheTest.php index 4ef00e3..511ef2e 100644 --- a/tests/MinifyCacheWinCacheTest.php +++ b/tests/MinifyCacheWinCacheTest.php @@ -21,4 +21,4 @@ class MinifyCacheWinCacheTest extends TestCase $cache = new Minify_Cache_WinCache(); $this->assertTestCache($cache, $id, $data); } -} \ No newline at end of file +} diff --git a/tests/MinifyCacheZendPlatformTest.php b/tests/MinifyCacheZendPlatformTest.php index e93f800..79988e9 100644 --- a/tests/MinifyCacheZendPlatformTest.php +++ b/tests/MinifyCacheZendPlatformTest.php @@ -22,4 +22,4 @@ class MinifyCacheZendPlatformTest extends TestCase $cache = new Minify_Cache_ZendPlatform(); $this->assertTestCache($cache, $id, $data); } -} \ No newline at end of file +} diff --git a/tests/MinifyCommentPreserverTest.php b/tests/MinifyCommentPreserverTest.php index 77222eb..e0e1ffb 100644 --- a/tests/MinifyCommentPreserverTest.php +++ b/tests/MinifyCommentPreserverTest.php @@ -31,4 +31,4 @@ class MinifyCommentPreserverTest extends TestCase ++$callCount; return $callCount . strtoupper($content); } -} \ No newline at end of file +} diff --git a/tests/MinifyHTMLHelperTest.php b/tests/MinifyHTMLHelperTest.php index 94e336b..cba8844 100644 --- a/tests/MinifyHTMLHelperTest.php +++ b/tests/MinifyHTMLHelperTest.php @@ -80,4 +80,4 @@ class MinifyHTMLHelperTest extends TestCase $this->assertEquals($maxTime, $output, 'utils.php : Minify_mtime w/ obj & group'); } } -} \ No newline at end of file +} diff --git a/tests/MinifyImportProcessorTest.php b/tests/MinifyImportProcessorTest.php index 34cdba4..c330b39 100644 --- a/tests/MinifyImportProcessorTest.php +++ b/tests/MinifyImportProcessorTest.php @@ -23,7 +23,10 @@ class MinifyImportProcessorTest extends TestCase realpath($linDir . '/lib/css/example.css'), ); - $this->assertEquals($expectedIncludes, Minify_ImportProcessor::$filesIncluded, - 'included right files in right order'); + $this->assertEquals( + $expectedIncludes, + Minify_ImportProcessor::$filesIncluded, + 'included right files in right order' + ); } } diff --git a/tests/MinifyNailgunClosureCompilerTest.php b/tests/MinifyNailgunClosureCompilerTest.php index 1b1dc41..96ded32 100644 --- a/tests/MinifyNailgunClosureCompilerTest.php +++ b/tests/MinifyNailgunClosureCompilerTest.php @@ -54,4 +54,4 @@ class MinifyNailgunClosureCompilerTest extends TestCase $this->markTestSkipped($e->getMessage()); } } -} \ No newline at end of file +} diff --git a/tests/MinifyTest.php b/tests/MinifyTest.php index ffeb672..6d142b8 100644 --- a/tests/MinifyTest.php +++ b/tests/MinifyTest.php @@ -62,8 +62,8 @@ class MinifyTest extends TestCase $content = preg_replace('/\\r\\n?/', "\n", file_get_contents($minifyTestPath . '/minified.js')); $lastModified = max( - filemtime($minifyTestPath . '/email.js') - , filemtime($minifyTestPath . '/QueryString.js') + filemtime($minifyTestPath . '/email.js'), + filemtime($minifyTestPath . '/QueryString.js') ); $expected = array( 'success' => true, @@ -153,8 +153,10 @@ class MinifyTest extends TestCase )); $output = $output['content']; - $this->assertFalse(strpos($output, $defaultOptions['importWarning']), - 'Issue 89 : don\'t warn about valid imports'); + $this->assertFalse( + strpos($output, $defaultOptions['importWarning']), + 'Issue 89 : don\'t warn about valid imports' + ); // Test Issue 132 if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { @@ -164,8 +166,11 @@ class MinifyTest extends TestCase 'encodeOutput' => false, )); - $this->assertEquals(77, $output['headers']['Content-Length'], - 'Issue 132 : mbstring.func_overload shouldn\'t cause incorrect Content-Length'); + $this->assertEquals( + 77, + $output['headers']['Content-Length'], + 'Issue 132 : mbstring.func_overload shouldn\'t cause incorrect Content-Length' + ); } // Test minifying CSS and responding with Etag/Last-Modified diff --git a/tests/MinifyYuiCSSTest.php b/tests/MinifyYuiCSSTest.php index b26cb15..4a240f7 100644 --- a/tests/MinifyYuiCSSTest.php +++ b/tests/MinifyYuiCSSTest.php @@ -60,4 +60,4 @@ class MinifyYuiCSSTest extends TestCase $this->markTestSkipped($e->getMessage()); } } -} \ No newline at end of file +} diff --git a/tests/ScssSourceTest.php b/tests/ScssSourceTest.php index 2a2dec9..96f6401 100644 --- a/tests/ScssSourceTest.php +++ b/tests/ScssSourceTest.php @@ -39,4 +39,4 @@ class ScssSourceTest extends TestCase $this->assertEquals("/min/g=scss&{$max}", $res); } -} \ No newline at end of file +} diff --git a/tests/TestCase.php b/tests/TestCase.php index fda57d3..141df2c 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -70,4 +70,4 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase return $contents; } -} \ No newline at end of file +} diff --git a/utils.php b/utils.php index 46e29d7..dddffab 100644 --- a/utils.php +++ b/utils.php @@ -48,7 +48,7 @@ function Minify_getUri($keyOrFiles, $opts = array()) * * Since this makes a bunch of stat() calls, you might not want to check this * on every request. - * + * * @param array $keysAndFiles group keys and/or file paths/URIs. * @return int latest modification time of all given keys/files */