futtta /
autoptimize
@@ -139,6 +139,10 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * @param string $noptimize_in |
|
| 145 | + */ |
|
| 142 | 146 | protected function hide_noptimize($noptimize_in) { |
| 143 | 147 | if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
| 144 | 148 | $noptimize_out = preg_replace_callback( |
@@ -267,6 +271,9 @@ discard block |
||
| 267 | 271 | return $url; |
| 268 | 272 | } |
| 269 | 273 | |
| 274 | + /** |
|
| 275 | + * @param string $payload |
|
| 276 | + */ |
|
| 270 | 277 | protected function inject_in_html($payload,$replaceTag) { |
| 271 | 278 | if (strpos($this->content,$replaceTag[0])!== false) { |
| 272 | 279 | if ($replaceTag[1]==="after") { |
@@ -286,6 +293,9 @@ discard block |
||
| 286 | 293 | } |
| 287 | 294 | } |
| 288 | 295 | |
| 296 | + /** |
|
| 297 | + * @param string $tag |
|
| 298 | + */ |
|
| 289 | 299 | protected function isremovable($tag, $removables) { |
| 290 | 300 | foreach ($removables as $match) { |
| 291 | 301 | if (strpos($tag,$match)!==false) { |
@@ -296,6 +306,10 @@ discard block |
||
| 296 | 306 | } |
| 297 | 307 | |
| 298 | 308 | // inject already minified code in optimized JS/CSS |
| 309 | + |
|
| 310 | + /** |
|
| 311 | + * @return string |
|
| 312 | + */ |
|
| 299 | 313 | protected function inject_minified($in) { |
| 300 | 314 | if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
| 301 | 315 | $out = preg_replace_callback( |
@@ -340,6 +354,9 @@ discard block |
||
| 340 | 354 | return $out; |
| 341 | 355 | } |
| 342 | 356 | |
| 357 | + /** |
|
| 358 | + * @param string $pathIn |
|
| 359 | + */ |
|
| 343 | 360 | protected function minify_single($pathIn) { |
| 344 | 361 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 345 | 362 | if ( $this->str_ends_in($pathIn,".js") === true ) { |
@@ -403,6 +420,9 @@ discard block |
||
| 403 | 420 | return $_CachedMinifiedUrl; |
| 404 | 421 | } |
| 405 | 422 | |
| 423 | + /** |
|
| 424 | + * @param string $needle |
|
| 425 | + */ |
|
| 406 | 426 | protected function str_ends_in($haystack,$needle) { |
| 407 | 427 | $needleLength = strlen($needle); |
| 408 | 428 | $haystackLength = strlen($haystack); |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | abstract class autoptimizeBase { |
| 5 | 8 | protected $content = ''; |
@@ -122,7 +125,9 @@ discard block |
||
| 122 | 125 | $out = parse_url($in,PHP_URL_HOST); |
| 123 | 126 | |
| 124 | 127 | // fallback if parse_url does not understand the url is in fact a url |
| 125 | - if (empty($out)) $out=$in; |
|
| 128 | + if (empty($out)) { |
|
| 129 | + $out=$in; |
|
| 130 | + } |
|
| 126 | 131 | |
| 127 | 132 | return $out; |
| 128 | 133 | } |
@@ -359,7 +364,9 @@ discard block |
||
| 359 | 364 | |
| 360 | 365 | // read file, return false if empty |
| 361 | 366 | $_toMinify = file_get_contents($pathIn); |
| 362 | - if ( empty($_toMinify) ) return false; |
|
| 367 | + if ( empty($_toMinify) ) { |
|
| 368 | + return false; |
|
| 369 | + } |
|
| 363 | 370 | |
| 364 | 371 | // check cache |
| 365 | 372 | $_md5hash = "single_".md5($_toMinify); |
@@ -341,43 +341,43 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | protected function minify_single($pathIn) { |
| 344 | - // determine JS or CSS and set var (also mimetype), return false if neither |
|
| 345 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 346 | - $codeType="js"; |
|
| 347 | - $codeMime="text/javascript"; |
|
| 348 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 349 | - $codeType="css"; |
|
| 350 | - $codeMime="text/css"; |
|
| 351 | - } else { |
|
| 352 | - return false; |
|
| 353 | - } |
|
| 344 | + // determine JS or CSS and set var (also mimetype), return false if neither |
|
| 345 | + if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 346 | + $codeType="js"; |
|
| 347 | + $codeMime="text/javascript"; |
|
| 348 | + } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 349 | + $codeType="css"; |
|
| 350 | + $codeMime="text/css"; |
|
| 351 | + } else { |
|
| 352 | + return false; |
|
| 353 | + } |
|
| 354 | 354 | |
| 355 | - // if min.js or min.css return false |
|
| 356 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 357 | - return false; |
|
| 358 | - } |
|
| 355 | + // if min.js or min.css return false |
|
| 356 | + if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 357 | + return false; |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - // read file, return false if empty |
|
| 361 | - $_toMinify = file_get_contents($pathIn); |
|
| 362 | - if ( empty($_toMinify) ) return false; |
|
| 360 | + // read file, return false if empty |
|
| 361 | + $_toMinify = file_get_contents($pathIn); |
|
| 362 | + if ( empty($_toMinify) ) return false; |
|
| 363 | 363 | |
| 364 | - // check cache |
|
| 365 | - $_md5hash = "single_".md5($_toMinify); |
|
| 366 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 367 | - if ($_cache->check() ) { |
|
| 368 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 369 | - } else { |
|
| 370 | - // if not in cache first minify |
|
| 371 | - $_Minified = $_toMinify; |
|
| 372 | - if ($codeType === "js") { |
|
| 373 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 374 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 375 | - $tmp_code = trim(JSMin::minify($_toMinify)); |
|
| 376 | - } |
|
| 377 | - } |
|
| 378 | - } else if ($codeType === "css") { |
|
| 364 | + // check cache |
|
| 365 | + $_md5hash = "single_".md5($_toMinify); |
|
| 366 | + $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 367 | + if ($_cache->check() ) { |
|
| 368 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 369 | + } else { |
|
| 370 | + // if not in cache first minify |
|
| 371 | + $_Minified = $_toMinify; |
|
| 372 | + if ($codeType === "js") { |
|
| 373 | + if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 374 | + if (@is_callable(array("JSMin","minify"))) { |
|
| 375 | + $tmp_code = trim(JSMin::minify($_toMinify)); |
|
| 376 | + } |
|
| 377 | + } |
|
| 378 | + } else if ($codeType === "css") { |
|
| 379 | 379 | if (class_exists('Minify_CSS_Compressor')) { |
| 380 | - $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
| 380 | + $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
| 381 | 381 | } else if(class_exists('CSSmin')) { |
| 382 | 382 | $cssmin = new CSSmin(); |
| 383 | 383 | if (method_exists($cssmin,"run")) { |
@@ -386,31 +386,31 @@ discard block |
||
| 386 | 386 | $tmp_code = trim(CssMin::minify($_toMinify)); |
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | - } |
|
| 390 | - if (!empty($tmp_code)) { |
|
| 391 | - $_Minified = $tmp_code; |
|
| 392 | - unset($tmp_code); |
|
| 393 | - } |
|
| 394 | - // and then cache |
|
| 395 | - $_cache->cache($_Minified,$codeMime); |
|
| 396 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 397 | - } |
|
| 398 | - unset($_cache); |
|
| 389 | + } |
|
| 390 | + if (!empty($tmp_code)) { |
|
| 391 | + $_Minified = $tmp_code; |
|
| 392 | + unset($tmp_code); |
|
| 393 | + } |
|
| 394 | + // and then cache |
|
| 395 | + $_cache->cache($_Minified,$codeMime); |
|
| 396 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 397 | + } |
|
| 398 | + unset($_cache); |
|
| 399 | 399 | |
| 400 | - // if CDN, then CDN |
|
| 401 | - $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
| 400 | + // if CDN, then CDN |
|
| 401 | + $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
| 402 | 402 | |
| 403 | - return $_CachedMinifiedUrl; |
|
| 404 | - } |
|
| 403 | + return $_CachedMinifiedUrl; |
|
| 404 | + } |
|
| 405 | 405 | |
| 406 | - protected function str_ends_in($haystack,$needle) { |
|
| 407 | - $needleLength = strlen($needle); |
|
| 408 | - $haystackLength = strlen($haystack); |
|
| 409 | - $lastPos=strrpos($haystack,$needle); |
|
| 410 | - if ($lastPos === $haystackLength - $needleLength) { |
|
| 411 | - return true; |
|
| 412 | - } else { |
|
| 413 | - return false; |
|
| 414 | - } |
|
| 415 | - } |
|
| 406 | + protected function str_ends_in($haystack,$needle) { |
|
| 407 | + $needleLength = strlen($needle); |
|
| 408 | + $haystackLength = strlen($haystack); |
|
| 409 | + $lastPos=strrpos($haystack,$needle); |
|
| 410 | + if ($lastPos === $haystackLength - $needleLength) { |
|
| 411 | + return true; |
|
| 412 | + } else { |
|
| 413 | + return false; |
|
| 414 | + } |
|
| 415 | + } |
|
| 416 | 416 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | abstract class autoptimizeBase { |
| 5 | 5 | protected $content = ''; |
@@ -23,37 +23,37 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Converts an URL to a full path |
| 25 | 25 | protected function getpath($url) { |
| 26 | - $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url); |
|
| 26 | + $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url); |
|
| 27 | 27 | |
| 28 | - if (strpos($url,'%')!==false) { |
|
| 29 | - $url=urldecode($url); |
|
| 28 | + if (strpos($url, '%') !== false) { |
|
| 29 | + $url = urldecode($url); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST); |
|
| 33 | - $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST); |
|
| 32 | + $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST); |
|
| 33 | + $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST); |
|
| 34 | 34 | |
| 35 | 35 | // normalize |
| 36 | - if (strpos($url,'//')===0) { |
|
| 36 | + if (strpos($url, '//') === 0) { |
|
| 37 | 37 | if (is_ssl()) { |
| 38 | 38 | $url = "https:".$url; |
| 39 | 39 | } else { |
| 40 | 40 | $url = "http:".$url; |
| 41 | 41 | } |
| 42 | - } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) { |
|
| 42 | + } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) { |
|
| 43 | 43 | if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) { |
| 44 | 44 | $url = AUTOPTIMIZE_WP_SITE_URL.$url; |
| 45 | 45 | } else { |
| 46 | - $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/"); |
|
| 47 | - $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url; |
|
| 46 | + $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/"); |
|
| 47 | + $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if ($siteHost !== $contentHost) { |
| 52 | - $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url); |
|
| 52 | + $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // first check; hostname wp site should be hostname of url |
| 56 | - $thisHost=@parse_url($url,PHP_URL_HOST); |
|
| 56 | + $thisHost = @parse_url($url, PHP_URL_HOST); |
|
| 57 | 57 | if ($thisHost !== $siteHost) { |
| 58 | 58 | /* |
| 59 | 59 | * first try to get all domains from WPML (if available) |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains'); |
| 67 | 67 | if (!empty($multidomainsWPML)) { |
| 68 | - $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML); |
|
| 68 | + $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | if (!empty($this->cdn_url)) { |
| 72 | - $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST); |
|
| 72 | + $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains); |
| 76 | 76 | |
| 77 | 77 | if (!empty($multidomains)) { |
| 78 | - if (in_array($thisHost,$multidomains)) { |
|
| 79 | - $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url); |
|
| 78 | + if (in_array($thisHost, $multidomains)) { |
|
| 79 | + $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url); |
|
| 80 | 80 | } else { |
| 81 | 81 | return false; |
| 82 | 82 | } |
@@ -86,22 +86,22 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | // try to remove "wp root url" from url while not minding http<>https |
| 89 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL); |
|
| 89 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL); |
|
| 90 | 90 | if ($siteHost !== $contentHost) { |
| 91 | 91 | // as we replaced the content-domain with the site-domain, we should match against that |
| 92 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL); |
|
| 92 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL); |
|
| 93 | 93 | } |
| 94 | - $tmp_url = preg_replace('/https?:/','',$url); |
|
| 95 | - $path = str_replace($tmp_ao_root,'',$tmp_url); |
|
| 94 | + $tmp_url = preg_replace('/https?:/', '', $url); |
|
| 95 | + $path = str_replace($tmp_ao_root, '', $tmp_url); |
|
| 96 | 96 | |
| 97 | 97 | // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate |
| 98 | - if (preg_match('#^:?//#',$path)) { |
|
| 98 | + if (preg_match('#^:?//#', $path)) { |
|
| 99 | 99 | /** External script/css (adsense, etc) */ |
| 100 | 100 | return false; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | // prepend with WP_ROOT_DIR to have full path to file |
| 104 | - $path = str_replace('//','/',WP_ROOT_DIR.$path); |
|
| 104 | + $path = str_replace('//', '/', WP_ROOT_DIR.$path); |
|
| 105 | 105 | |
| 106 | 106 | // final check: does file exist and is it readable |
| 107 | 107 | if (file_exists($path) && is_file($path) && is_readable($path)) { |
@@ -114,25 +114,25 @@ discard block |
||
| 114 | 114 | // needed for WPML-filter |
| 115 | 115 | protected function ao_getDomain($in) { |
| 116 | 116 | // make sure the url starts with something vaguely resembling a protocol |
| 117 | - if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) { |
|
| 118 | - $in="http://".$in; |
|
| 117 | + if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) { |
|
| 118 | + $in = "http://".$in; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // do the actual parse_url |
| 122 | - $out = parse_url($in,PHP_URL_HOST); |
|
| 122 | + $out = parse_url($in, PHP_URL_HOST); |
|
| 123 | 123 | |
| 124 | 124 | // fallback if parse_url does not understand the url is in fact a url |
| 125 | - if (empty($out)) $out=$in; |
|
| 125 | + if (empty($out)) $out = $in; |
|
| 126 | 126 | |
| 127 | 127 | return $out; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | // logger |
| 132 | - protected function ao_logger($logmsg,$appendHTML=true) { |
|
| 132 | + protected function ao_logger($logmsg, $appendHTML = true) { |
|
| 133 | 133 | if ($appendHTML) { |
| 134 | - $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | - $this->content.=$logmsg; |
|
| 134 | + $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | + $this->content .= $logmsg; |
|
| 136 | 136 | } else { |
| 137 | 137 | error_log("Autoptimize: ".$logmsg); |
| 138 | 138 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | 142 | protected function hide_noptimize($noptimize_in) { |
| 143 | - if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
|
| 143 | + if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { |
|
| 144 | 144 | $noptimize_out = preg_replace_callback( |
| 145 | 145 | '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is', |
| 146 | 146 | create_function( |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | // unhide noptimize-tags |
| 159 | 159 | protected function restore_noptimize($noptimize_in) { |
| 160 | - if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { |
|
| 160 | + if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { |
|
| 161 | 161 | $noptimize_out = preg_replace_callback( |
| 162 | 162 | '#%%NOPTIMIZE%%(.*?)%%NOPTIMIZE%%#is', |
| 163 | 163 | create_function( |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | protected function hide_iehacks($iehacks_in) { |
| 176 | - if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { |
|
| 176 | + if (strpos($iehacks_in, '<!--[if') !== false) { |
|
| 177 | 177 | $iehacks_out = preg_replace_callback( |
| 178 | 178 | '#<!--\[if.*?\[endif\]-->#is', |
| 179 | 179 | create_function( |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | protected function restore_iehacks($iehacks_in) { |
| 192 | - if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { |
|
| 192 | + if (strpos($iehacks_in, '%%IEHACK%%') !== false) { |
|
| 193 | 193 | $iehacks_out = preg_replace_callback( |
| 194 | 194 | '#%%IEHACK%%(.*?)%%IEHACK%%#is', |
| 195 | 195 | create_function( |
@@ -199,13 +199,13 @@ discard block |
||
| 199 | 199 | $iehacks_in |
| 200 | 200 | ); |
| 201 | 201 | } else { |
| 202 | - $iehacks_out=$iehacks_in; |
|
| 202 | + $iehacks_out = $iehacks_in; |
|
| 203 | 203 | } |
| 204 | 204 | return $iehacks_out; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | protected function hide_comments($comments_in) { |
| 208 | - if ( strpos( $comments_in, '<!--' ) !== false ) { |
|
| 208 | + if (strpos($comments_in, '<!--') !== false) { |
|
| 209 | 209 | $comments_out = preg_replace_callback( |
| 210 | 210 | '#<!--.*?-->#is', |
| 211 | 211 | create_function( |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | protected function restore_comments($comments_in) { |
| 224 | - if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) { |
|
| 224 | + if (strpos($comments_in, '%%COMMENTS%%') !== false) { |
|
| 225 | 225 | $comments_out = preg_replace_callback( |
| 226 | 226 | '#%%COMMENTS%%(.*?)%%COMMENTS%%#is', |
| 227 | 227 | create_function( |
@@ -231,31 +231,31 @@ discard block |
||
| 231 | 231 | $comments_in |
| 232 | 232 | ); |
| 233 | 233 | } else { |
| 234 | - $comments_out=$comments_in; |
|
| 234 | + $comments_out = $comments_in; |
|
| 235 | 235 | } |
| 236 | 236 | return $comments_out; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - protected function url_replace_cdn( $url ) { |
|
| 239 | + protected function url_replace_cdn($url) { |
|
| 240 | 240 | // API filter to change base CDN URL |
| 241 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url ); |
|
| 241 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url); |
|
| 242 | 242 | |
| 243 | - if ( !empty($cdn_url) ) { |
|
| 243 | + if (!empty($cdn_url)) { |
|
| 244 | 244 | // prepend domain-less absolute URL's |
| 245 | - if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) { |
|
| 246 | - $url = rtrim( $cdn_url, '/' ) . $url; |
|
| 245 | + if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) { |
|
| 246 | + $url = rtrim($cdn_url, '/').$url; |
|
| 247 | 247 | } else { |
| 248 | 248 | // get wordpress base URL |
| 249 | - $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL ); |
|
| 250 | - $WPBaseUrl = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host']; |
|
| 251 | - if ( ! empty( $WPSiteBreakdown['port'] ) ) { |
|
| 252 | - $WPBaseUrl .= ":" . $WPSiteBreakdown['port']; |
|
| 249 | + $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL); |
|
| 250 | + $WPBaseUrl = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host']; |
|
| 251 | + if (!empty($WPSiteBreakdown['port'])) { |
|
| 252 | + $WPBaseUrl .= ":".$WPSiteBreakdown['port']; |
|
| 253 | 253 | } |
| 254 | 254 | // replace full url's with scheme |
| 255 | - $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url ); |
|
| 256 | - if ( $tmp_url === $url ) { |
|
| 255 | + $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url); |
|
| 256 | + if ($tmp_url === $url) { |
|
| 257 | 257 | // last attempt; replace scheme-less URL's |
| 258 | - $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url ); |
|
| 258 | + $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url); |
|
| 259 | 259 | } else { |
| 260 | 260 | $url = $tmp_url; |
| 261 | 261 | } |
@@ -263,32 +263,32 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // allow API filter to alter URL after CDN replacement |
| 266 | - $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url ); |
|
| 266 | + $url = apply_filters('autoptimize_filter_base_replace_cdn', $url); |
|
| 267 | 267 | return $url; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - protected function inject_in_html($payload,$replaceTag) { |
|
| 271 | - if (strpos($this->content,$replaceTag[0])!== false) { |
|
| 272 | - if ($replaceTag[1]==="after") { |
|
| 273 | - $replaceBlock=$replaceTag[0].$payload; |
|
| 274 | - } else if ($replaceTag[1]==="replace"){ |
|
| 275 | - $replaceBlock=$payload; |
|
| 270 | + protected function inject_in_html($payload, $replaceTag) { |
|
| 271 | + if (strpos($this->content, $replaceTag[0]) !== false) { |
|
| 272 | + if ($replaceTag[1] === "after") { |
|
| 273 | + $replaceBlock = $replaceTag[0].$payload; |
|
| 274 | + } else if ($replaceTag[1] === "replace") { |
|
| 275 | + $replaceBlock = $payload; |
|
| 276 | 276 | } else { |
| 277 | - $replaceBlock=$payload.$replaceTag[0]; |
|
| 277 | + $replaceBlock = $payload.$replaceTag[0]; |
|
| 278 | 278 | } |
| 279 | - $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0])); |
|
| 279 | + $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0])); |
|
| 280 | 280 | } else { |
| 281 | 281 | $this->content .= $payload; |
| 282 | 282 | if (!$this->tagWarning) { |
| 283 | - $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 284 | - $this->tagWarning=true; |
|
| 283 | + $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 284 | + $this->tagWarning = true; |
|
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | protected function isremovable($tag, $removables) { |
| 290 | 290 | foreach ($removables as $match) { |
| 291 | - if (strpos($tag,$match)!==false) { |
|
| 291 | + if (strpos($tag, $match) !== false) { |
|
| 292 | 292 | return true; |
| 293 | 293 | } |
| 294 | 294 | } |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | |
| 298 | 298 | // inject already minified code in optimized JS/CSS |
| 299 | 299 | protected function inject_minified($in) { |
| 300 | - if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
|
| 300 | + if (strpos($in, '%%INJECTLATER%%') !== false) { |
|
| 301 | 301 | $out = preg_replace_callback( |
| 302 | 302 | '#\/\*\!%%INJECTLATER%%(.*?)%%INJECTLATER%%\*\/#is', |
| 303 | 303 | create_function( |
@@ -342,47 +342,47 @@ discard block |
||
| 342 | 342 | |
| 343 | 343 | protected function minify_single($pathIn) { |
| 344 | 344 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 345 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 346 | - $codeType="js"; |
|
| 347 | - $codeMime="text/javascript"; |
|
| 348 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 349 | - $codeType="css"; |
|
| 350 | - $codeMime="text/css"; |
|
| 345 | + if ($this->str_ends_in($pathIn, ".js") === true) { |
|
| 346 | + $codeType = "js"; |
|
| 347 | + $codeMime = "text/javascript"; |
|
| 348 | + } else if ($this->str_ends_in($pathIn, ".css") === true) { |
|
| 349 | + $codeType = "css"; |
|
| 350 | + $codeMime = "text/css"; |
|
| 351 | 351 | } else { |
| 352 | 352 | return false; |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | // if min.js or min.css return false |
| 356 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 356 | + if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) { |
|
| 357 | 357 | return false; |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | // read file, return false if empty |
| 361 | 361 | $_toMinify = file_get_contents($pathIn); |
| 362 | - if ( empty($_toMinify) ) return false; |
|
| 362 | + if (empty($_toMinify)) return false; |
|
| 363 | 363 | |
| 364 | 364 | // check cache |
| 365 | 365 | $_md5hash = "single_".md5($_toMinify); |
| 366 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 367 | - if ($_cache->check() ) { |
|
| 366 | + $_cache = new autoptimizeCache($_md5hash, $codeType); |
|
| 367 | + if ($_cache->check()) { |
|
| 368 | 368 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 369 | 369 | } else { |
| 370 | 370 | // if not in cache first minify |
| 371 | 371 | $_Minified = $_toMinify; |
| 372 | 372 | if ($codeType === "js") { |
| 373 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 374 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 373 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 374 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 375 | 375 | $tmp_code = trim(JSMin::minify($_toMinify)); |
| 376 | 376 | } |
| 377 | 377 | } |
| 378 | 378 | } else if ($codeType === "css") { |
| 379 | 379 | if (class_exists('Minify_CSS_Compressor')) { |
| 380 | 380 | $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
| 381 | - } else if(class_exists('CSSmin')) { |
|
| 381 | + } else if (class_exists('CSSmin')) { |
|
| 382 | 382 | $cssmin = new CSSmin(); |
| 383 | - if (method_exists($cssmin,"run")) { |
|
| 383 | + if (method_exists($cssmin, "run")) { |
|
| 384 | 384 | $tmp_code = trim($cssmin->run($_toMinify)); |
| 385 | - } elseif (@is_callable(array($cssmin,"minify"))) { |
|
| 385 | + } elseif (@is_callable(array($cssmin, "minify"))) { |
|
| 386 | 386 | $tmp_code = trim(CssMin::minify($_toMinify)); |
| 387 | 387 | } |
| 388 | 388 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | unset($tmp_code); |
| 393 | 393 | } |
| 394 | 394 | // and then cache |
| 395 | - $_cache->cache($_Minified,$codeMime); |
|
| 395 | + $_cache->cache($_Minified, $codeMime); |
|
| 396 | 396 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 397 | 397 | } |
| 398 | 398 | unset($_cache); |
@@ -403,10 +403,10 @@ discard block |
||
| 403 | 403 | return $_CachedMinifiedUrl; |
| 404 | 404 | } |
| 405 | 405 | |
| 406 | - protected function str_ends_in($haystack,$needle) { |
|
| 406 | + protected function str_ends_in($haystack, $needle) { |
|
| 407 | 407 | $needleLength = strlen($needle); |
| 408 | 408 | $haystackLength = strlen($haystack); |
| 409 | - $lastPos=strrpos($haystack,$needle); |
|
| 409 | + $lastPos = strrpos($haystack, $needle); |
|
| 410 | 410 | if ($lastPos === $haystackLength - $needleLength) { |
| 411 | 411 | return true; |
| 412 | 412 | } else { |
@@ -284,8 +284,8 @@ discard block |
||
| 284 | 284 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
| 285 | 285 | $css = preg_replace('/\s+/', ' ', $css); |
| 286 | 286 | |
| 287 | - // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
| 288 | - $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
| 287 | + // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
| 288 | + $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
| 289 | 289 | |
| 290 | 290 | // Shorten & preserve calculations calc(...) since spaces are important |
| 291 | 291 | $css = preg_replace_callback('/calc(\(((?:[^\(\)]+|(?1))*)\))/i', array($this, 'replace_calc'), $css); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 389 | 389 | $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
| 390 | 390 | |
| 391 | - // Replace multiple semi-colons in a row by a single one |
|
| 391 | + // Replace multiple semi-colons in a row by a single one |
|
| 392 | 392 | // See SF bug #1980989 |
| 393 | 393 | $css = preg_replace('/;;+/', ';', $css); |
| 394 | 394 | |
@@ -603,10 +603,10 @@ discard block |
||
| 603 | 603 | return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - private function preserve_old_IE_specific_matrix_definition($matches) |
|
| 607 | - { |
|
| 608 | - $this->preserved_tokens[] = $matches[1]; |
|
| 609 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 606 | + private function preserve_old_IE_specific_matrix_definition($matches) |
|
| 607 | + { |
|
| 608 | + $this->preserved_tokens[] = $matches[1]; |
|
| 609 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | private function rgb_to_hex($matches) |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function __construct($raise_php_limits = TRUE) |
| 46 | 46 | { |
| 47 | - $this->memory_limit = 128 * 1048576; // 128MB in bytes |
|
| 48 | - $this->pcre_backtrack_limit = 1000 * 1000; |
|
| 49 | - $this->pcre_recursion_limit = 500 * 1000; |
|
| 47 | + $this->memory_limit = 128*1048576; // 128MB in bytes |
|
| 48 | + $this->pcre_backtrack_limit = 1000*1000; |
|
| 49 | + $this->pcre_recursion_limit = 500*1000; |
|
| 50 | 50 | |
| 51 | 51 | $this->raise_php_limits = (bool) $raise_php_limits; |
| 52 | 52 | } |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | $comment_found = $this->str_slice($css, $start_index + 2, $end_index); |
| 85 | 85 | $this->comments[] = $comment_found; |
| 86 | - $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___'; |
|
| 87 | - $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index); |
|
| 86 | + $comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___'; |
|
| 87 | + $css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index); |
|
| 88 | 88 | // Set correct start_index: Fixes issue #2528130 |
| 89 | 89 | $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found); |
| 90 | 90 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $charset = ''; |
| 102 | 102 | $charset_regexp = '/(@charset)( [^;]+;)/i'; |
| 103 | 103 | $css_chunks = array(); |
| 104 | - $increment = $this->chunk_length / 100; |
|
| 104 | + $increment = $this->chunk_length/100; |
|
| 105 | 105 | $start_index = 0; |
| 106 | 106 | $i = $this->chunk_length; // save initial iterations |
| 107 | 107 | $l = strlen($css); |
@@ -137,14 +137,14 @@ discard block |
||
| 137 | 137 | $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos); |
| 138 | 138 | // Keep the first @charset at-rule found |
| 139 | 139 | if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) { |
| 140 | - $charset = strtolower($matches[1]) . $matches[2]; |
|
| 140 | + $charset = strtolower($matches[1]).$matches[2]; |
|
| 141 | 141 | } |
| 142 | 142 | // Delete all @charset at-rules |
| 143 | 143 | $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // Update the first chunk and push the charset to the top of the file. |
| 147 | - $css_chunks[0] = $charset . $css_chunks[0]; |
|
| 147 | + $css_chunks[0] = $charset.$css_chunks[0]; |
|
| 148 | 148 | |
| 149 | 149 | return implode('', $css_chunks); |
| 150 | 150 | } |
@@ -239,17 +239,17 @@ discard block |
||
| 239 | 239 | for ($i = 0, $max = count($this->comments); $i < $max; $i++) { |
| 240 | 240 | |
| 241 | 241 | $token = $this->comments[$i]; |
| 242 | - $placeholder = '/' . self::COMMENT . $i . '___/'; |
|
| 242 | + $placeholder = '/'.self::COMMENT.$i.'___/'; |
|
| 243 | 243 | |
| 244 | 244 | // ! in the first position of the comment means preserve |
| 245 | 245 | // so push to the preserved tokens keeping the ! |
| 246 | 246 | if (substr($token, 0, 1) === '!') { |
| 247 | 247 | $this->preserved_tokens[] = $token; |
| 248 | - $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; |
|
| 248 | + $token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___'; |
|
| 249 | 249 | $css = preg_replace($placeholder, $token_tring, $css, 1); |
| 250 | 250 | // Preserve new lines for /*! important comments |
| 251 | - $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css); |
|
| 252 | - $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css); |
|
| 251 | + $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css); |
|
| 252 | + $css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css); |
|
| 253 | 253 | continue; |
| 254 | 254 | } |
| 255 | 255 | |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | // shorten that to /*\*/ and the next one to /**/ |
| 258 | 258 | if (substr($token, (strlen($token) - 1), 1) === '\\') { |
| 259 | 259 | $this->preserved_tokens[] = '\\'; |
| 260 | - $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 260 | + $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 261 | 261 | $i = $i + 1; // attn: advancing the loop |
| 262 | 262 | $this->preserved_tokens[] = ''; |
| 263 | - $css = preg_replace('/' . self::COMMENT . $i . '___/', self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 263 | + $css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 264 | 264 | continue; |
| 265 | 265 | } |
| 266 | 266 | |
@@ -271,13 +271,13 @@ discard block |
||
| 271 | 271 | if ($start_index > 2) { |
| 272 | 272 | if (substr($css, $start_index - 3, 1) === '>') { |
| 273 | 273 | $this->preserved_tokens[] = ''; |
| 274 | - $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 274 | + $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 275 | 275 | } |
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | // in all other cases kill the comment |
| 280 | - $css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1); |
|
| 280 | + $css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1); |
|
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | $css = preg_replace('/\!important/i', ' !important', $css); |
| 321 | 321 | |
| 322 | 322 | // bring back the colon |
| 323 | - $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css); |
|
| 323 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 324 | 324 | |
| 325 | 325 | // retain space for special IE6 cases |
| 326 | 326 | $css = preg_replace_callback('/\:first\-(line|letter)(\{|,)/i', array($this, 'lowercase_pseudo_first'), $css); |
@@ -380,20 +380,20 @@ discard block |
||
| 380 | 380 | |
| 381 | 381 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 382 | 382 | // Add token to add the "\" back in later |
| 383 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 383 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 384 | 384 | |
| 385 | 385 | // Remove empty rules. |
| 386 | 386 | $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css); |
| 387 | 387 | |
| 388 | 388 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 389 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 389 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 390 | 390 | |
| 391 | 391 | // Replace multiple semi-colons in a row by a single one |
| 392 | 392 | // See SF bug #1980989 |
| 393 | 393 | $css = preg_replace('/;;+/', ';', $css); |
| 394 | 394 | |
| 395 | 395 | // Restore new lines for /*! important comments |
| 396 | - $css = preg_replace('/'. self::NL .'/', "\n", $css); |
|
| 396 | + $css = preg_replace('/'.self::NL.'/', "\n", $css); |
|
| 397 | 397 | |
| 398 | 398 | // Lowercase all uppercase properties |
| 399 | 399 | $css = preg_replace_callback('/(\{|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css); |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | while ($i < strlen($css)) { |
| 408 | 408 | $i++; |
| 409 | 409 | if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) { |
| 410 | - $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i); |
|
| 410 | + $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i); |
|
| 411 | 411 | $start_index = $i; |
| 412 | 412 | } |
| 413 | 413 | } |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | |
| 416 | 416 | // restore preserved comments and strings in reverse order |
| 417 | 417 | for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) { |
| 418 | - $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
| 418 | + $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1); |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | // Trim the final string (for any leading or trailing white spaces) |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | $terminator = ')'; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | - while ($found_terminator === FALSE && $end_index+1 <= $max_index) { |
|
| 458 | + while ($found_terminator === FALSE && $end_index + 1 <= $max_index) { |
|
| 459 | 459 | $end_index = $this->index_of($css, $terminator, $end_index + 1); |
| 460 | 460 | |
| 461 | 461 | // endIndex == 0 doesn't really apply here |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | $token = preg_replace_callback('/.+base64,.+/s', array($this, 'remove_data_urls_spaces'), $token); |
| 477 | 477 | $this->preserved_tokens[] = trim($token); |
| 478 | 478 | |
| 479 | - $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; |
|
| 479 | + $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)'; |
|
| 480 | 480 | $sb[] = $preserver; |
| 481 | 481 | |
| 482 | 482 | $append_index = $end_index + 1; |
@@ -538,16 +538,16 @@ discard block |
||
| 538 | 538 | |
| 539 | 539 | if ($is_filter) { |
| 540 | 540 | // Restore, maintain case, otherwise filter will break |
| 541 | - $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 541 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 542 | 542 | } else { |
| 543 | 543 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 544 | 544 | strtolower($m[4]) == strtolower($m[5]) && |
| 545 | 545 | strtolower($m[6]) == strtolower($m[7])) { |
| 546 | 546 | // Compress. |
| 547 | - $hex = '#' . strtolower($m[3] . $m[5] . $m[7]); |
|
| 547 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 548 | 548 | } else { |
| 549 | 549 | // Non compressible color, restore but lower case. |
| 550 | - $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 550 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 551 | 551 | } |
| 552 | 552 | // replace Hex colors to short safe color names |
| 553 | 553 | $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex; |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | // one, maybe more? put'em back then |
| 582 | 582 | if (($pos = $this->index_of($match, self::COMMENT)) >= 0) { |
| 583 | 583 | for ($i = 0, $max = count($this->comments); $i < $max; $i++) { |
| 584 | - $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1); |
|
| 584 | + $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1); |
|
| 585 | 585 | } |
| 586 | 586 | } |
| 587 | 587 | |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match); |
| 590 | 590 | |
| 591 | 591 | $this->preserved_tokens[] = $match; |
| 592 | - return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote; |
|
| 592 | + return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote; |
|
| 593 | 593 | } |
| 594 | 594 | |
| 595 | 595 | private function replace_colon($matches) |
@@ -599,23 +599,23 @@ discard block |
||
| 599 | 599 | |
| 600 | 600 | private function replace_calc($matches) |
| 601 | 601 | { |
| 602 | - $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/',') $1',preg_replace('/([\+\-]{1})\(/','$1 (',trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2])))); |
|
| 603 | - return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 602 | + $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/', ') $1', preg_replace('/([\+\-]{1})\(/', '$1 (', trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2])))); |
|
| 603 | + return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 604 | 604 | } |
| 605 | 605 | |
| 606 | 606 | private function preserve_old_IE_specific_matrix_definition($matches) |
| 607 | 607 | { |
| 608 | 608 | $this->preserved_tokens[] = $matches[1]; |
| 609 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 609 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 610 | 610 | } |
| 611 | 611 | |
| 612 | 612 | private function rgb_to_hex($matches) |
| 613 | 613 | { |
| 614 | 614 | // Support for percentage values rgb(100%, 0%, 45%); |
| 615 | - if ($this->index_of($matches[1], '%') >= 0){ |
|
| 615 | + if ($this->index_of($matches[1], '%') >= 0) { |
|
| 616 | 616 | $rgbcolors = explode(',', str_replace('%', '', $matches[1])); |
| 617 | 617 | for ($i = 0; $i < count($rgbcolors); $i++) { |
| 618 | - $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55); |
|
| 618 | + $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55); |
|
| 619 | 619 | } |
| 620 | 620 | } else { |
| 621 | 621 | $rgbcolors = explode(',', $matches[1]); |
@@ -628,11 +628,11 @@ discard block |
||
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | // Fix for issue #2528093 |
| 631 | - if (!preg_match('/[\s\,\);\}]/', $matches[2])){ |
|
| 632 | - $matches[2] = ' ' . $matches[2]; |
|
| 631 | + if (!preg_match('/[\s\,\);\}]/', $matches[2])) { |
|
| 632 | + $matches[2] = ' '.$matches[2]; |
|
| 633 | 633 | } |
| 634 | 634 | |
| 635 | - return '#' . implode('', $rgbcolors) . $matches[2]; |
|
| 635 | + return '#'.implode('', $rgbcolors).$matches[2]; |
|
| 636 | 636 | } |
| 637 | 637 | |
| 638 | 638 | private function hsl_to_hex($matches) |
@@ -643,18 +643,18 @@ discard block |
||
| 643 | 643 | $l = floatval($values[2]); |
| 644 | 644 | |
| 645 | 645 | // Wrap and clamp, then fraction! |
| 646 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 647 | - $s = $this->clamp_number($s, 0, 100) / 100; |
|
| 648 | - $l = $this->clamp_number($l, 0, 100) / 100; |
|
| 646 | + $h = ((($h%360) + 360)%360)/360; |
|
| 647 | + $s = $this->clamp_number($s, 0, 100)/100; |
|
| 648 | + $l = $this->clamp_number($l, 0, 100)/100; |
|
| 649 | 649 | |
| 650 | 650 | if ($s == 0) { |
| 651 | - $r = $g = $b = $this->round_number(255 * $l); |
|
| 651 | + $r = $g = $b = $this->round_number(255*$l); |
|
| 652 | 652 | } else { |
| 653 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 654 | - $v1 = (2 * $l) - $v2; |
|
| 655 | - $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 656 | - $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h)); |
|
| 657 | - $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 653 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 654 | + $v1 = (2*$l) - $v2; |
|
| 655 | + $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 656 | + $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h)); |
|
| 657 | + $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2])); |
@@ -662,32 +662,32 @@ discard block |
||
| 662 | 662 | |
| 663 | 663 | private function lowercase_at_rules_operators($matches) |
| 664 | 664 | { |
| 665 | - return $matches[1] . strtolower($matches[2]) . ' ('; |
|
| 665 | + return $matches[1].strtolower($matches[2]).' ('; |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | private function lowercase_pseudo_first($matches) |
| 669 | 669 | { |
| 670 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 670 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | private function lowercase_directives($matches) |
| 674 | 674 | { |
| 675 | - return '@'. strtolower($matches[1]); |
|
| 675 | + return '@'.strtolower($matches[1]); |
|
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | private function lowercase_pseudo_elements($matches) |
| 679 | 679 | { |
| 680 | - return ':'. strtolower($matches[1]); |
|
| 680 | + return ':'.strtolower($matches[1]); |
|
| 681 | 681 | } |
| 682 | 682 | |
| 683 | 683 | private function lowercase_common_functions($matches) |
| 684 | 684 | { |
| 685 | - return ':'. strtolower($matches[1]) .'('; |
|
| 685 | + return ':'.strtolower($matches[1]).'('; |
|
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | private function lowercase_common_functions_values($matches) |
| 689 | 689 | { |
| 690 | - return $matches[1] . strtolower($matches[2]); |
|
| 690 | + return $matches[1].strtolower($matches[2]); |
|
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | private function lowercase_properties($matches) |
@@ -702,9 +702,9 @@ discard block |
||
| 702 | 702 | private function hue_to_rgb($v1, $v2, $vh) |
| 703 | 703 | { |
| 704 | 704 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 705 | - if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 706 | - if ($vh * 2 < 1) return $v2; |
|
| 707 | - if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 705 | + if ($vh*6 < 1) return $v1 + ($v2 - $v1)*6*$vh; |
|
| 706 | + if ($vh*2 < 1) return $v2; |
|
| 707 | + if ($vh*3 < 2) return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 708 | 708 | return $v1; |
| 709 | 709 | } |
| 710 | 710 | |
@@ -780,9 +780,9 @@ discard block |
||
| 780 | 780 | $letter = substr($size, -1); |
| 781 | 781 | $size = intval($size); |
| 782 | 782 | switch ($letter) { |
| 783 | - case 'M': case 'm': return (int) $size * 1048576; |
|
| 784 | - case 'K': case 'k': return (int) $size * 1024; |
|
| 785 | - case 'G': case 'g': return (int) $size * 1073741824; |
|
| 783 | + case 'M': case 'm': return (int) $size*1048576; |
|
| 784 | + case 'K': case 'k': return (int) $size*1024; |
|
| 785 | + case 'G': case 'g': return (int) $size*1073741824; |
|
| 786 | 786 | } |
| 787 | 787 | } |
| 788 | 788 | return (int) $size; |
@@ -701,9 +701,15 @@ |
||
| 701 | 701 | private function hue_to_rgb($v1, $v2, $vh) |
| 702 | 702 | { |
| 703 | 703 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 704 | - if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 705 | - if ($vh * 2 < 1) return $v2; |
|
| 706 | - if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 704 | + if ($vh * 6 < 1) { |
|
| 705 | + return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 706 | + } |
|
| 707 | + if ($vh * 2 < 1) { |
|
| 708 | + return $v2; |
|
| 709 | + } |
|
| 710 | + if ($vh * 3 < 2) { |
|
| 711 | + return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 712 | + } |
|
| 707 | 713 | return $v1; |
| 708 | 714 | } |
| 709 | 715 | |
@@ -686,6 +686,11 @@ discard block |
||
| 686 | 686 | * --------------------------------------------------------------------------------------------- |
| 687 | 687 | */ |
| 688 | 688 | |
| 689 | + /** |
|
| 690 | + * @param double $v1 |
|
| 691 | + * @param double $v2 |
|
| 692 | + * @param integer $vh |
|
| 693 | + */ |
|
| 689 | 694 | private function hue_to_rgb($v1, $v2, $vh) |
| 690 | 695 | { |
| 691 | 696 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
@@ -700,6 +705,10 @@ discard block |
||
| 700 | 705 | return intval(floor(floatval($n) + 0.5), 10); |
| 701 | 706 | } |
| 702 | 707 | |
| 708 | + /** |
|
| 709 | + * @param integer $min |
|
| 710 | + * @param integer $max |
|
| 711 | + */ |
|
| 703 | 712 | private function clamp_number($n, $min, $max) |
| 704 | 713 | { |
| 705 | 714 | return min(max($n, $min), $max); |
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function __construct($raisePhpLimits = true) |
| 51 | 51 | { |
| 52 | - $this->memoryLimit = 128 * 1048576; // 128MB in bytes |
|
| 53 | - $this->pcreBacktrackLimit = 1000 * 1000; |
|
| 54 | - $this->pcreRecursionLimit = 500 * 1000; |
|
| 52 | + $this->memoryLimit = 128*1048576; // 128MB in bytes |
|
| 53 | + $this->pcreBacktrackLimit = 1000*1000; |
|
| 54 | + $this->pcreRecursionLimit = 500*1000; |
|
| 55 | 55 | |
| 56 | 56 | $this->raisePhpLimits = (bool) $raisePhpLimits; |
| 57 | 57 | |
| 58 | - $this->numRegex = '(?:\+|-)?\d*\.?\d+' . $this->unitsGroupRegex .'?'; |
|
| 58 | + $this->numRegex = '(?:\+|-)?\d*\.?\d+'.$this->unitsGroupRegex.'?'; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | $cssChunks[$i] = $this->minify($cssChunks[$i], $linebreakPos); |
| 135 | 135 | // Keep the first @charset at-rule found |
| 136 | 136 | if (empty($charset) && preg_match($charsetRegexp, $cssChunks[$i], $matches)) { |
| 137 | - $charset = strtolower($matches[1]) . $matches[2]; |
|
| 137 | + $charset = strtolower($matches[1]).$matches[2]; |
|
| 138 | 138 | } |
| 139 | 139 | // Delete all @charset at-rules |
| 140 | 140 | $cssChunks[$i] = preg_replace($charsetRegexp, '', $cssChunks[$i]); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // Update the first chunk and push the charset to the top of the file. |
| 144 | - $cssChunks[0] = $charset . $cssChunks[0]; |
|
| 144 | + $cssChunks[0] = $charset.$cssChunks[0]; |
|
| 145 | 145 | |
| 146 | 146 | return trim(implode('', $cssChunks)); |
| 147 | 147 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | private function registerPreservedToken($token) |
| 236 | 236 | { |
| 237 | 237 | $this->preservedTokens[] = $token; |
| 238 | - return self::TOKEN . (count($this->preservedTokens) - 1) .'___'; |
|
| 238 | + return self::TOKEN.(count($this->preservedTokens) - 1).'___'; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | private function getPreservedTokenPlaceholderRegexById($id) |
| 247 | 247 | { |
| 248 | - return '/'. self::TOKEN . $id .'___/'; |
|
| 248 | + return '/'.self::TOKEN.$id.'___/'; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | private function registerComment($comment) |
| 257 | 257 | { |
| 258 | 258 | $this->comments[] = $comment; |
| 259 | - return '/*'. self::COMMENT . (count($this->comments) - 1) .'___*/'; |
|
| 259 | + return '/*'.self::COMMENT.(count($this->comments) - 1).'___*/'; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | private function getCommentPlaceholderById($id) |
| 268 | 268 | { |
| 269 | - return self::COMMENT . $id .'___'; |
|
| 269 | + return self::COMMENT.$id.'___'; |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | private function getCommentPlaceholderRegexById($id) |
| 278 | 278 | { |
| 279 | - return '/'. $this->getCommentPlaceholderById($id) .'/'; |
|
| 279 | + return '/'.$this->getCommentPlaceholderById($id).'/'; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | private function registerAtRuleBlock($block) |
| 288 | 288 | { |
| 289 | 289 | $this->atRuleBlocks[] = $block; |
| 290 | - return self::AT_RULE_BLOCK . (count($this->atRuleBlocks) - 1) .'___'; |
|
| 290 | + return self::AT_RULE_BLOCK.(count($this->atRuleBlocks) - 1).'___'; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | private function getAtRuleBlockPlaceholderRegexById($id) |
| 299 | 299 | { |
| 300 | - return '/'. self::AT_RULE_BLOCK . $id .'___/'; |
|
| 300 | + return '/'.self::AT_RULE_BLOCK.$id.'___/'; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | /** |
@@ -330,8 +330,8 @@ discard block |
||
| 330 | 330 | $preservedTokenPlaceholder = $this->registerPreservedToken($comment); |
| 331 | 331 | $css = preg_replace($commentPlaceholderRegex, $preservedTokenPlaceholder, $css, 1); |
| 332 | 332 | // Preserve new lines for /*! important comments |
| 333 | - $css = preg_replace('/\R+\s*(\/\*'. $preservedTokenPlaceholder .')/', self::NL.'$1', $css); |
|
| 334 | - $css = preg_replace('/('. $preservedTokenPlaceholder .'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 333 | + $css = preg_replace('/\R+\s*(\/\*'.$preservedTokenPlaceholder.')/', self::NL.'$1', $css); |
|
| 334 | + $css = preg_replace('/('.$preservedTokenPlaceholder.'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 335 | 335 | continue; |
| 336 | 336 | } |
| 337 | 337 | |
@@ -360,14 +360,14 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // in all other cases kill the comment |
| 363 | - $css = preg_replace('/\/\*' . $commentPlaceholder . '\*\//', '', $css, 1); |
|
| 363 | + $css = preg_replace('/\/\*'.$commentPlaceholder.'\*\//', '', $css, 1); |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
| 367 | 367 | $css = preg_replace('/\s+/', ' ', $css); |
| 368 | 368 | |
| 369 | 369 | // Remove spaces before & after newlines |
| 370 | - $css = preg_replace('/\s*'. self::NL .'\s*/', self::NL, $css); |
|
| 370 | + $css = preg_replace('/\s*'.self::NL.'\s*/', self::NL, $css); |
|
| 371 | 371 | |
| 372 | 372 | // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
| 373 | 373 | $css = preg_replace_callback( |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $css = preg_replace('/!important/i', ' !important', $css); |
| 410 | 410 | |
| 411 | 411 | // bring back the colon |
| 412 | - $css = preg_replace('/'. self::CLASSCOLON .'/', ':', $css); |
|
| 412 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 413 | 413 | |
| 414 | 414 | // retain space for special IE6 cases |
| 415 | 415 | $css = preg_replace_callback('/:first-(line|letter)(\{|,)/i', array($this, 'lowercasePseudoFirst'), $css); |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | // lowercase some popular @directives |
| 421 | 421 | $css = preg_replace_callback( |
| 422 | - '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|' . |
|
| 422 | + '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|'. |
|
| 423 | 423 | 'supports|viewport)/i', |
| 424 | 424 | array($this, 'lowercaseDirectives'), |
| 425 | 425 | $css |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | // lowercase some more common pseudo-elements |
| 429 | 429 | $css = preg_replace_callback( |
| 430 | - '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|' . |
|
| 430 | + '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|'. |
|
| 431 | 431 | 'last-(?:child|of-type)|link|only-(?:child|of-type)|root|:selection|target|visited)/i', |
| 432 | 432 | array($this, 'lowercasePseudoElements'), |
| 433 | 433 | $css |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | // lower case some common function that can be values |
| 444 | 444 | // NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us |
| 445 | 445 | $css = preg_replace_callback( |
| 446 | - '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|' . |
|
| 446 | + '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|'. |
|
| 447 | 447 | '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|max|min|(?:repeating-)?(?:linear|radial)-gradient))/iS', |
| 448 | 448 | array($this, 'lowercaseCommonFunctionsValues'), |
| 449 | 449 | $css |
@@ -500,19 +500,19 @@ discard block |
||
| 500 | 500 | |
| 501 | 501 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 502 | 502 | // Add token to add the "\" back in later |
| 503 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 503 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 504 | 504 | |
| 505 | 505 | // Patch new lines to avoid being removed when followed by empty rules cases |
| 506 | - $css = preg_replace('/'. self::NL .'/', self::NL .'}', $css); |
|
| 506 | + $css = preg_replace('/'.self::NL.'/', self::NL.'}', $css); |
|
| 507 | 507 | |
| 508 | 508 | // Remove empty rules. |
| 509 | 509 | $css = preg_replace('/[^{};\/]+\{\}/S', '', $css); |
| 510 | 510 | |
| 511 | 511 | // Restore new lines for /*! important comments |
| 512 | - $css = preg_replace('/'. self::NL .'}/', "\n", $css); |
|
| 512 | + $css = preg_replace('/'.self::NL.'}/', "\n", $css); |
|
| 513 | 513 | |
| 514 | 514 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 515 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 515 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 516 | 516 | |
| 517 | 517 | // Replace multiple semi-colons in a row by a single one |
| 518 | 518 | // See SF bug #1980989 |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | $linebreakPos = (int) $linebreakPos; |
| 529 | 529 | for ($startIndex = $i = 1, $l = strlen($css); $i < $l; $i++) { |
| 530 | 530 | if ($css[$i - 1] === '}' && $i - $startIndex > $linebreakPos) { |
| 531 | - $css = $this->strSlice($css, 0, $i) . "\n" . $this->strSlice($css, $i); |
|
| 531 | + $css = $this->strSlice($css, 0, $i)."\n".$this->strSlice($css, $i); |
|
| 532 | 532 | $l = strlen($css); |
| 533 | 533 | $startIndex = $i; |
| 534 | 534 | } |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | $terminator = ')'; |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | - while ($terminatorFound === false && $endIndex+1 <= $maxIndex) { |
|
| 584 | + while ($terminatorFound === false && $endIndex + 1 <= $maxIndex) { |
|
| 585 | 585 | $endIndex = $this->indexOf($css, $terminator, $endIndex + 1); |
| 586 | 586 | // endIndex == 0 doesn't really apply here |
| 587 | 587 | if ($endIndex > 0 && substr($css, $endIndex - 1, 1) !== '\\') { |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | trim($token) |
| 605 | 605 | ); |
| 606 | 606 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 607 | - $sb[] = 'url('. $preservedTokenPlaceholder .')'; |
|
| 607 | + $sb[] = 'url('.$preservedTokenPlaceholder.')'; |
|
| 608 | 608 | $appenIndex = $endIndex + 1; |
| 609 | 609 | } else { |
| 610 | 610 | // No end terminator found, re-add the whole match. Should we throw/warn here? |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | private function shortenZeroValues($css) |
| 631 | 631 | { |
| 632 | 632 | $unitsGroupReg = $this->unitsGroupRegex; |
| 633 | - $numOrPosReg = '('. $this->numRegex .'|top|left|bottom|right|center)'; |
|
| 633 | + $numOrPosReg = '('.$this->numRegex.'|top|left|bottom|right|center)'; |
|
| 634 | 634 | $oneZeroSafeProperties = array( |
| 635 | 635 | '(?:line-)?height', |
| 636 | 636 | '(?:(?:min|max)-)?width', |
@@ -656,17 +656,17 @@ discard block |
||
| 656 | 656 | $regEnd = '/i'; |
| 657 | 657 | |
| 658 | 658 | // First zero regex start |
| 659 | - $oneZeroRegStart = $regStart .'('. implode('|', $oneZeroSafeProperties) .'):'; |
|
| 659 | + $oneZeroRegStart = $regStart.'('.implode('|', $oneZeroSafeProperties).'):'; |
|
| 660 | 660 | |
| 661 | 661 | // Multiple zeros regex start |
| 662 | - $nZerosRegStart = $regStart .'('. implode('|', $nZeroSafeProperties) .'):'; |
|
| 662 | + $nZerosRegStart = $regStart.'('.implode('|', $nZeroSafeProperties).'):'; |
|
| 663 | 663 | |
| 664 | 664 | $css = preg_replace( |
| 665 | 665 | array( |
| 666 | - $oneZeroRegStart .'0'. $unitsGroupReg . $regEnd, |
|
| 667 | - $nZerosRegStart . $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 668 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 669 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd |
|
| 666 | + $oneZeroRegStart.'0'.$unitsGroupReg.$regEnd, |
|
| 667 | + $nZerosRegStart.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 668 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 669 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd |
|
| 670 | 670 | ), |
| 671 | 671 | array( |
| 672 | 672 | '$1$2:0', |
@@ -682,13 +682,13 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0 for safe properties only. |
| 684 | 684 | $css = preg_replace( |
| 685 | - '/('. implode('|', $nZeroSafeProperties) .'):0(?: 0){1,3}(;|\}| !)'. $regEnd, |
|
| 685 | + '/('.implode('|', $nZeroSafeProperties).'):0(?: 0){1,3}(;|\}| !)'.$regEnd, |
|
| 686 | 686 | '$1:0$2', |
| 687 | 687 | $css |
| 688 | 688 | ); |
| 689 | 689 | |
| 690 | 690 | // Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property. |
| 691 | - $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'. $regEnd, '$1:0 0$2', $css); |
|
| 691 | + $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'.$regEnd, '$1:0 0$2', $css); |
|
| 692 | 692 | |
| 693 | 693 | return $css; |
| 694 | 694 | } |
@@ -712,12 +712,12 @@ discard block |
||
| 712 | 712 | '(?:text|box)-shadow' |
| 713 | 713 | ); |
| 714 | 714 | |
| 715 | - $regStart = '/(;|\{)('. implode('|', $propertiesWithColors) .'):([^;}]*)\b'; |
|
| 715 | + $regStart = '/(;|\{)('.implode('|', $propertiesWithColors).'):([^;}]*)\b'; |
|
| 716 | 716 | $regEnd = '\b/iS'; |
| 717 | 717 | |
| 718 | 718 | foreach ($longNamedColors as $colorName => $colorCode) { |
| 719 | - $patterns[] = $regStart . $colorName . $regEnd; |
|
| 720 | - $replacements[] = '$1$2:$3'. $colorCode; |
|
| 719 | + $patterns[] = $regStart.$colorName.$regEnd; |
|
| 720 | + $replacements[] = '$1$2:$3'.$colorCode; |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | // Run at least 4 times to cover most cases (same color used several times for the same property) |
@@ -762,16 +762,16 @@ discard block |
||
| 762 | 762 | |
| 763 | 763 | if ($isFilter) { |
| 764 | 764 | // Restore, maintain case, otherwise filter will break |
| 765 | - $sb[] = $m[1] .'#'. $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 765 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 766 | 766 | } else { |
| 767 | 767 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 768 | 768 | strtolower($m[4]) == strtolower($m[5]) && |
| 769 | 769 | strtolower($m[6]) == strtolower($m[7])) { |
| 770 | 770 | // Compress. |
| 771 | - $hex = '#'. strtolower($m[3] . $m[5] . $m[7]); |
|
| 771 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 772 | 772 | } else { |
| 773 | 773 | // Non compressible color, restore but lower case. |
| 774 | - $hex = '#'. strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 774 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 775 | 775 | } |
| 776 | 776 | // replace Hex colors with shorter color names |
| 777 | 777 | $sb[] = array_key_exists($hex, $longHexColors) ? $longHexColors[$hex] : $hex; |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | $match = preg_replace('/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i', 'alpha(opacity=', $match); |
| 819 | 819 | |
| 820 | 820 | $preservedTokenPlaceholder = $this->registerPreservedToken($match); |
| 821 | - return $quote . $preservedTokenPlaceholder . $quote; |
|
| 821 | + return $quote.$preservedTokenPlaceholder.$quote; |
|
| 822 | 822 | } |
| 823 | 823 | |
| 824 | 824 | private function processAtRuleBlocks($matches) |
@@ -838,13 +838,13 @@ discard block |
||
| 838 | 838 | ) |
| 839 | 839 | ); |
| 840 | 840 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 841 | - return 'calc('. $preservedTokenPlaceholder .')'; |
|
| 841 | + return 'calc('.$preservedTokenPlaceholder.')'; |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | private function processOldIeSpecificMatrixDefinition($matches) |
| 845 | 845 | { |
| 846 | 846 | $preservedTokenPlaceholder = $this->registerPreservedToken($matches[1]); |
| 847 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $preservedTokenPlaceholder .')'; |
|
| 847 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$preservedTokenPlaceholder.')'; |
|
| 848 | 848 | } |
| 849 | 849 | |
| 850 | 850 | private function processColon($matches) |
@@ -869,10 +869,10 @@ discard block |
||
| 869 | 869 | |
| 870 | 870 | // Fix for issue #2528093 |
| 871 | 871 | if (!preg_match('/[\s,);}]/', $matches[2])) { |
| 872 | - $matches[2] = ' '. $matches[2]; |
|
| 872 | + $matches[2] = ' '.$matches[2]; |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - return '#'. implode('', $hexColors) . $matches[2]; |
|
| 875 | + return '#'.implode('', $hexColors).$matches[2]; |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | private function hslToHex($matches) |
@@ -886,37 +886,37 @@ discard block |
||
| 886 | 886 | |
| 887 | 887 | private function processAtRulesOperators($matches) |
| 888 | 888 | { |
| 889 | - return $matches[1] . strtolower($matches[2]) .' ('; |
|
| 889 | + return $matches[1].strtolower($matches[2]).' ('; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | private function lowercasePseudoFirst($matches) |
| 893 | 893 | { |
| 894 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 894 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 895 | 895 | } |
| 896 | 896 | |
| 897 | 897 | private function lowercaseDirectives($matches) |
| 898 | 898 | { |
| 899 | - return '@'. strtolower($matches[1]); |
|
| 899 | + return '@'.strtolower($matches[1]); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | private function lowercasePseudoElements($matches) |
| 903 | 903 | { |
| 904 | - return ':'. strtolower($matches[1]); |
|
| 904 | + return ':'.strtolower($matches[1]); |
|
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | private function lowercaseCommonFunctions($matches) |
| 908 | 908 | { |
| 909 | - return ':'. strtolower($matches[1]) .'('; |
|
| 909 | + return ':'.strtolower($matches[1]).'('; |
|
| 910 | 910 | } |
| 911 | 911 | |
| 912 | 912 | private function lowercaseCommonFunctionsValues($matches) |
| 913 | 913 | { |
| 914 | - return $matches[1] . strtolower($matches[2]); |
|
| 914 | + return $matches[1].strtolower($matches[2]); |
|
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | private function lowercaseProperties($matches) |
| 918 | 918 | { |
| 919 | - return $matches[1] . strtolower($matches[2]) . $matches[3]; |
|
| 919 | + return $matches[1].strtolower($matches[2]).$matches[3]; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | // --------------------------------------------------------------------------------------------- |
@@ -967,18 +967,18 @@ discard block |
||
| 967 | 967 | $l = floatval(str_replace('%', '', $hslValues[2])); |
| 968 | 968 | |
| 969 | 969 | // Wrap and clamp, then fraction! |
| 970 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 971 | - $s = $this->clampNumber($s, 0, 100) / 100; |
|
| 972 | - $l = $this->clampNumber($l, 0, 100) / 100; |
|
| 970 | + $h = ((($h%360) + 360)%360)/360; |
|
| 971 | + $s = $this->clampNumber($s, 0, 100)/100; |
|
| 972 | + $l = $this->clampNumber($l, 0, 100)/100; |
|
| 973 | 973 | |
| 974 | 974 | if ($s == 0) { |
| 975 | - $r = $g = $b = $this->roundNumber(255 * $l); |
|
| 975 | + $r = $g = $b = $this->roundNumber(255*$l); |
|
| 976 | 976 | } else { |
| 977 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 978 | - $v1 = (2 * $l) - $v2; |
|
| 979 | - $r = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | - $g = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h)); |
|
| 981 | - $b = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 977 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 978 | + $v1 = (2*$l) - $v2; |
|
| 979 | + $r = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | + $g = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h)); |
|
| 981 | + $b = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | return array($r, $g, $b); |
@@ -995,16 +995,16 @@ discard block |
||
| 995 | 995 | { |
| 996 | 996 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 997 | 997 | |
| 998 | - if ($vh * 6 < 1) { |
|
| 999 | - return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 998 | + if ($vh*6 < 1) { |
|
| 999 | + return $v1 + ($v2 - $v1)*6*$vh; |
|
| 1000 | 1000 | } |
| 1001 | 1001 | |
| 1002 | - if ($vh * 2 < 1) { |
|
| 1002 | + if ($vh*2 < 1) { |
|
| 1003 | 1003 | return $v2; |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - if ($vh * 3 < 2) { |
|
| 1007 | - return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6; |
|
| 1006 | + if ($vh*3 < 2) { |
|
| 1007 | + return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | return $v1; |
@@ -1039,13 +1039,13 @@ discard block |
||
| 1039 | 1039 | switch ($letter) { |
| 1040 | 1040 | case 'M': |
| 1041 | 1041 | case 'm': |
| 1042 | - return (int) $size * 1048576; |
|
| 1042 | + return (int) $size*1048576; |
|
| 1043 | 1043 | case 'K': |
| 1044 | 1044 | case 'k': |
| 1045 | - return (int) $size * 1024; |
|
| 1045 | + return (int) $size*1024; |
|
| 1046 | 1046 | case 'G': |
| 1047 | 1047 | case 'g': |
| 1048 | - return (int) $size * 1073741824; |
|
| 1048 | + return (int) $size*1073741824; |
|
| 1049 | 1049 | } |
| 1050 | 1050 | } |
| 1051 | 1051 | return (int) $size; |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | private function rgbPercentageToRgbInteger($rgbPercentage) |
| 1060 | 1060 | { |
| 1061 | 1061 | if (strpos($rgbPercentage, '%') !== false) { |
| 1062 | - $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55); |
|
| 1062 | + $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55); |
|
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | 1065 | return intval($rgbPercentage, 10); |
