@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @param string $url URL to transform. |
66 | 66 | * |
67 | - * @return bool|string |
|
67 | + * @return false|string |
|
68 | 68 | */ |
69 | 69 | public function getpath( $url ) |
70 | 70 | { |
@@ -610,7 +610,7 @@ discard block |
||
610 | 610 | /** |
611 | 611 | * Logs given `$data` for debugging purposes (when debug logging is on). |
612 | 612 | * |
613 | - * @param mixed $data Data to log. |
|
613 | + * @param string $data Data to log. |
|
614 | 614 | * |
615 | 615 | * @return void |
616 | 616 | */ |
@@ -632,7 +632,7 @@ discard block |
||
632 | 632 | * |
633 | 633 | * @param string $filepath Filepath. |
634 | 634 | * |
635 | - * @return bool|string to be minified code or false. |
|
635 | + * @return false|string to be minified code or false. |
|
636 | 636 | */ |
637 | 637 | protected function prepare_minify_single( $filepath ) |
638 | 638 | { |
@@ -412,7 +412,7 @@ |
||
412 | 412 | * First element is the filepath, second is the md5 hash of contents |
413 | 413 | * the filepath had when it was being processed. |
414 | 414 | * If we don't have those, we'll bail out early. |
415 | - */ |
|
415 | + */ |
|
416 | 416 | $filepath = null; |
417 | 417 | $filehash = null; |
418 | 418 |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Base class other (more-specific) classes inherit from. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public $cdn_url = ''; |
32 | 32 | |
33 | - public function __construct( $content ) |
|
33 | + public function __construct($content) |
|
34 | 34 | { |
35 | 35 | $this->content = $content; |
36 | 36 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @return bool |
44 | 44 | */ |
45 | - abstract public function read( $options ); |
|
45 | + abstract public function read($options); |
|
46 | 46 | |
47 | 47 | /** |
48 | 48 | * Joins and optimizes collected things. |
@@ -73,40 +73,40 @@ discard block |
||
73 | 73 | * |
74 | 74 | * @return bool|string |
75 | 75 | */ |
76 | - public function getpath( $url ) |
|
76 | + public function getpath($url) |
|
77 | 77 | { |
78 | - $url = apply_filters( 'autoptimize_filter_cssjs_alter_url', $url ); |
|
78 | + $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url); |
|
79 | 79 | |
80 | - if ( false !== strpos( $url, '%' ) ) { |
|
81 | - $url = urldecode( $url ); |
|
80 | + if (false !== strpos($url, '%')) { |
|
81 | + $url = urldecode($url); |
|
82 | 82 | } |
83 | 83 | |
84 | - $site_host = parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ); |
|
85 | - $content_host = parse_url( AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST ); |
|
84 | + $site_host = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST); |
|
85 | + $content_host = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST); |
|
86 | 86 | |
87 | 87 | // Normalizing attempts... |
88 | - $double_slash_position = strpos( $url, '//' ); |
|
89 | - if ( 0 === $double_slash_position ) { |
|
90 | - if ( is_ssl() ) { |
|
91 | - $url = 'https:' . $url; |
|
88 | + $double_slash_position = strpos($url, '//'); |
|
89 | + if (0 === $double_slash_position) { |
|
90 | + if (is_ssl()) { |
|
91 | + $url = 'https:'.$url; |
|
92 | 92 | } else { |
93 | - $url = 'http:' . $url; |
|
93 | + $url = 'http:'.$url; |
|
94 | 94 | } |
95 | - } elseif ( ( false === $double_slash_position ) && ( false === strpos( $url, $site_host ) ) ) { |
|
96 | - if ( AUTOPTIMIZE_WP_SITE_URL === $site_host ) { |
|
97 | - $url = AUTOPTIMIZE_WP_SITE_URL . $url; |
|
95 | + } elseif ((false === $double_slash_position) && (false === strpos($url, $site_host))) { |
|
96 | + if (AUTOPTIMIZE_WP_SITE_URL === $site_host) { |
|
97 | + $url = AUTOPTIMIZE_WP_SITE_URL.$url; |
|
98 | 98 | } else { |
99 | - $url = AUTOPTIMIZE_WP_SITE_URL . autoptimizeUtils::path_canonicalize( $url ); |
|
99 | + $url = AUTOPTIMIZE_WP_SITE_URL.autoptimizeUtils::path_canonicalize($url); |
|
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
103 | - if ( $site_host !== $content_host ) { |
|
104 | - $url = str_replace( AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL . AUTOPTIMIZE_WP_CONTENT_NAME, $url ); |
|
103 | + if ($site_host !== $content_host) { |
|
104 | + $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | // First check; hostname wp site should be hostname of url! |
108 | - $url_host = @parse_url( $url, PHP_URL_HOST ); // @codingStandardsIgnoreLine |
|
109 | - if ( $url_host !== $site_host ) { |
|
108 | + $url_host = @parse_url($url, PHP_URL_HOST); // @codingStandardsIgnoreLine |
|
109 | + if ($url_host !== $site_host) { |
|
110 | 110 | /** |
111 | 111 | * First try to get all domains from WPML (if available) |
112 | 112 | * then explicitely declare $this->cdn_url as OK as well |
@@ -115,20 +115,20 @@ discard block |
||
115 | 115 | */ |
116 | 116 | $multidomains = array(); |
117 | 117 | |
118 | - $multidomains_wpml = apply_filters( 'wpml_setting', array(), 'language_domains' ); |
|
119 | - if ( ! empty( $multidomains_wpml ) ) { |
|
120 | - $multidomains = array_map( array( $this, 'get_url_hostname' ), $multidomains_wpml ); |
|
118 | + $multidomains_wpml = apply_filters('wpml_setting', array(), 'language_domains'); |
|
119 | + if (!empty($multidomains_wpml)) { |
|
120 | + $multidomains = array_map(array($this, 'get_url_hostname'), $multidomains_wpml); |
|
121 | 121 | } |
122 | 122 | |
123 | - if ( ! empty( $this->cdn_url ) ) { |
|
124 | - $multidomains[] = parse_url( $this->cdn_url, PHP_URL_HOST ); |
|
123 | + if (!empty($this->cdn_url)) { |
|
124 | + $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST); |
|
125 | 125 | } |
126 | 126 | |
127 | - $multidomains = apply_filters( 'autoptimize_filter_cssjs_multidomain', $multidomains ); |
|
127 | + $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains); |
|
128 | 128 | |
129 | - if ( ! empty( $multidomains ) ) { |
|
130 | - if ( in_array( $url_host, $multidomains ) ) { |
|
131 | - $url = str_replace( $url_host, $site_host, $url ); |
|
129 | + if (!empty($multidomains)) { |
|
130 | + if (in_array($url_host, $multidomains)) { |
|
131 | + $url = str_replace($url_host, $site_host, $url); |
|
132 | 132 | } else { |
133 | 133 | return false; |
134 | 134 | } |
@@ -138,28 +138,28 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | // Try to remove "wp root url" from url while not minding http<>https. |
141 | - $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL ); |
|
141 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL); |
|
142 | 142 | |
143 | - if ( $site_host !== $content_host ) { |
|
143 | + if ($site_host !== $content_host) { |
|
144 | 144 | // As we replaced the content-domain with the site-domain, we should match against that. |
145 | - $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_SITE_URL ); |
|
145 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL); |
|
146 | 146 | } |
147 | 147 | |
148 | - $tmp_url = preg_replace( '/https?:/', '', $url ); |
|
149 | - $path = str_replace( $tmp_ao_root, '', $tmp_url ); |
|
148 | + $tmp_url = preg_replace('/https?:/', '', $url); |
|
149 | + $path = str_replace($tmp_ao_root, '', $tmp_url); |
|
150 | 150 | |
151 | 151 | // If path starts with :// or //, this is not a URL in the WP context and |
152 | 152 | // we have to assume we can't aggregate. |
153 | - if ( preg_match( '#^:?//#', $path ) ) { |
|
153 | + if (preg_match('#^:?//#', $path)) { |
|
154 | 154 | // External script/css (adsense, etc). |
155 | 155 | return false; |
156 | 156 | } |
157 | 157 | |
158 | 158 | // Prepend with WP_ROOT_DIR to have full path to file. |
159 | - $path = str_replace( '//', '/', WP_ROOT_DIR . $path ); |
|
159 | + $path = str_replace('//', '/', WP_ROOT_DIR.$path); |
|
160 | 160 | |
161 | 161 | // Final check: does file exist and is it readable? |
162 | - if ( file_exists( $path ) && is_file( $path ) && is_readable( $path ) ) { |
|
162 | + if (file_exists($path) && is_file($path) && is_readable($path)) { |
|
163 | 163 | return $path; |
164 | 164 | } else { |
165 | 165 | return false; |
@@ -176,18 +176,18 @@ discard block |
||
176 | 176 | * |
177 | 177 | * @return string |
178 | 178 | */ |
179 | - protected function get_url_hostname( $url ) |
|
179 | + protected function get_url_hostname($url) |
|
180 | 180 | { |
181 | 181 | // Checking that the url starts with something vaguely resembling a protocol. |
182 | - if ( ( 0 !== strpos( $url, 'http' ) ) && ( 0 !== strpos( $url, '//' ) ) ) { |
|
183 | - $url = 'http://' . $url; |
|
182 | + if ((0 !== strpos($url, 'http')) && (0 !== strpos($url, '//'))) { |
|
183 | + $url = 'http://'.$url; |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | // Grab the hostname. |
187 | - $hostname = parse_url( $url, PHP_URL_HOST ); |
|
187 | + $hostname = parse_url($url, PHP_URL_HOST); |
|
188 | 188 | |
189 | 189 | // Fallback when parse_url() fails. |
190 | - if ( empty( $hostname ) ) { |
|
190 | + if (empty($hostname)) { |
|
191 | 191 | $hostname = $url; |
192 | 192 | } |
193 | 193 | |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | * |
202 | 202 | * @return string |
203 | 203 | */ |
204 | - protected function hide_noptimize( $markup ) |
|
204 | + protected function hide_noptimize($markup) |
|
205 | 205 | { |
206 | 206 | return $this->replace_contents_with_marker_if_exists( |
207 | 207 | 'NOPTIMIZE', |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | * |
219 | 219 | * @return string |
220 | 220 | */ |
221 | - protected function restore_noptimize( $markup ) |
|
221 | + protected function restore_noptimize($markup) |
|
222 | 222 | { |
223 | - return $this->restore_marked_content( 'NOPTIMIZE', $markup ); |
|
223 | + return $this->restore_marked_content('NOPTIMIZE', $markup); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * |
231 | 231 | * @return string |
232 | 232 | */ |
233 | - protected function hide_iehacks( $markup ) |
|
233 | + protected function hide_iehacks($markup) |
|
234 | 234 | { |
235 | 235 | return $this->replace_contents_with_marker_if_exists( |
236 | 236 | 'IEHACK', // Marker name... |
@@ -247,9 +247,9 @@ discard block |
||
247 | 247 | * |
248 | 248 | * @return string |
249 | 249 | */ |
250 | - protected function restore_iehacks( $markup ) |
|
250 | + protected function restore_iehacks($markup) |
|
251 | 251 | { |
252 | - return $this->restore_marked_content( 'IEHACK', $markup ); |
|
252 | + return $this->restore_marked_content('IEHACK', $markup); |
|
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | * |
262 | 262 | * @return string |
263 | 263 | */ |
264 | - protected function hide_comments( $markup ) |
|
264 | + protected function hide_comments($markup) |
|
265 | 265 | { |
266 | 266 | return $this->replace_contents_with_marker_if_exists( |
267 | 267 | 'COMMENTS', |
@@ -279,9 +279,9 @@ discard block |
||
279 | 279 | * |
280 | 280 | * @return string |
281 | 281 | */ |
282 | - protected function restore_comments( $markup ) |
|
282 | + protected function restore_comments($markup) |
|
283 | 283 | { |
284 | - return $this->restore_marked_content( 'COMMENTS', $markup ); |
|
284 | + return $this->restore_marked_content('COMMENTS', $markup); |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | /** |
@@ -292,44 +292,44 @@ discard block |
||
292 | 292 | * |
293 | 293 | * @return string |
294 | 294 | */ |
295 | - public function url_replace_cdn( $url ) |
|
295 | + public function url_replace_cdn($url) |
|
296 | 296 | { |
297 | 297 | // For 2.3 back-compat in which cdn-ing appeared to be automatically |
298 | 298 | // including WP subfolder/subdirectory into account as part of cdn-ing, |
299 | 299 | // even though it might've caused serious troubles in certain edge-cases. |
300 | - $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $this->cdn_url ); |
|
300 | + $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($this->cdn_url); |
|
301 | 301 | |
302 | 302 | // Allows API/filter to further tweak the cdn url... |
303 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url ); |
|
304 | - if ( ! empty( $cdn_url ) ) { |
|
305 | - $this->debug_log( 'before=' . $url ); |
|
303 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url); |
|
304 | + if (!empty($cdn_url)) { |
|
305 | + $this->debug_log('before='.$url); |
|
306 | 306 | |
307 | 307 | // Simple str_replace-based approach fails when $url is protocol-or-host-relative. |
308 | - $is_protocol_relative = autoptimizeUtils::is_protocol_relative( $url ); |
|
309 | - $is_host_relative = ( ! $is_protocol_relative && ( '/' === $url[0] ) ); |
|
310 | - $cdn_url = rtrim( $cdn_url, '/' ); |
|
308 | + $is_protocol_relative = autoptimizeUtils::is_protocol_relative($url); |
|
309 | + $is_host_relative = (!$is_protocol_relative && ('/' === $url[0])); |
|
310 | + $cdn_url = rtrim($cdn_url, '/'); |
|
311 | 311 | |
312 | - if ( $is_host_relative ) { |
|
312 | + if ($is_host_relative) { |
|
313 | 313 | // Prepending host-relative urls with the cdn url. |
314 | - $url = $cdn_url . $url; |
|
314 | + $url = $cdn_url.$url; |
|
315 | 315 | } else { |
316 | 316 | // Either a protocol-relative or "regular" url, replacing it either way. |
317 | - if ( $is_protocol_relative ) { |
|
317 | + if ($is_protocol_relative) { |
|
318 | 318 | // Massage $site_url so that simple str_replace() still "works" by |
319 | 319 | // searching for the protocol-relative version of AUTOPTIMIZE_WP_SITE_URL. |
320 | - $site_url = str_replace( array( 'http:', 'https:' ), '', AUTOPTIMIZE_WP_SITE_URL ); |
|
320 | + $site_url = str_replace(array('http:', 'https:'), '', AUTOPTIMIZE_WP_SITE_URL); |
|
321 | 321 | } else { |
322 | 322 | $site_url = AUTOPTIMIZE_WP_SITE_URL; |
323 | 323 | } |
324 | - $this->debug_log( '`' . $site_url . '` -> `' . $cdn_url . '` in `' . $url . '`' ); |
|
325 | - $url = str_replace( $site_url, $cdn_url, $url ); |
|
324 | + $this->debug_log('`'.$site_url.'` -> `'.$cdn_url.'` in `'.$url.'`'); |
|
325 | + $url = str_replace($site_url, $cdn_url, $url); |
|
326 | 326 | } |
327 | 327 | |
328 | - $this->debug_log( 'after=' . $url ); |
|
328 | + $this->debug_log('after='.$url); |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | // Allow API filter to take further care of CDN replacement. |
332 | - $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url ); |
|
332 | + $url = apply_filters('autoptimize_filter_base_replace_cdn', $url); |
|
333 | 333 | |
334 | 334 | return $url; |
335 | 335 | } |
@@ -347,18 +347,18 @@ discard block |
||
347 | 347 | * |
348 | 348 | * @return void |
349 | 349 | */ |
350 | - protected function inject_in_html( $payload, $where ) |
|
350 | + protected function inject_in_html($payload, $where) |
|
351 | 351 | { |
352 | 352 | $warned = false; |
353 | - $position = autoptimizeUtils::strpos( $this->content, $where[0] ); |
|
354 | - if ( false !== $position ) { |
|
353 | + $position = autoptimizeUtils::strpos($this->content, $where[0]); |
|
354 | + if (false !== $position) { |
|
355 | 355 | // Found the tag, setup content/injection as specified. |
356 | - if ( 'after' === $where[1] ) { |
|
357 | - $content = $where[0] . $payload; |
|
358 | - } elseif ( 'replace' === $where[1] ) { |
|
356 | + if ('after' === $where[1]) { |
|
357 | + $content = $where[0].$payload; |
|
358 | + } elseif ('replace' === $where[1]) { |
|
359 | 359 | $content = $payload; |
360 | 360 | } else { |
361 | - $content = $payload . $where[0]; |
|
361 | + $content = $payload.$where[0]; |
|
362 | 362 | } |
363 | 363 | // Place where specified. |
364 | 364 | $this->content = autoptimizeUtils::substr_replace( |
@@ -367,14 +367,14 @@ discard block |
||
367 | 367 | $position, |
368 | 368 | // Using plain strlen() should be safe here for now, since |
369 | 369 | // we're not searching for multibyte chars here still... |
370 | - strlen( $where[0] ) |
|
370 | + strlen($where[0]) |
|
371 | 371 | ); |
372 | 372 | } else { |
373 | 373 | // Couldn't find what was specified, just append and add a warning. |
374 | 374 | $this->content .= $payload; |
375 | - if ( ! $warned ) { |
|
376 | - $tag_display = str_replace( array( '<', '>' ), '', $where[0] ); |
|
377 | - $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `' . $tag_display . '` missing --><!--/noptimize-->'; |
|
375 | + if (!$warned) { |
|
376 | + $tag_display = str_replace(array('<', '>'), '', $where[0]); |
|
377 | + $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `'.$tag_display.'` missing --><!--/noptimize-->'; |
|
378 | 378 | $warned = true; |
379 | 379 | } |
380 | 380 | } |
@@ -388,10 +388,10 @@ discard block |
||
388 | 388 | * |
389 | 389 | * @return bool |
390 | 390 | */ |
391 | - protected function isremovable( $tag, $removables ) |
|
391 | + protected function isremovable($tag, $removables) |
|
392 | 392 | { |
393 | - foreach ( $removables as $match ) { |
|
394 | - if ( false !== strpos( $tag, $match ) ) { |
|
393 | + foreach ($removables as $match) { |
|
394 | + if (false !== strpos($tag, $match)) { |
|
395 | 395 | return true; |
396 | 396 | } |
397 | 397 | } |
@@ -406,10 +406,10 @@ discard block |
||
406 | 406 | * |
407 | 407 | * @return string |
408 | 408 | */ |
409 | - public function inject_minified_callback( $matches ) |
|
409 | + public function inject_minified_callback($matches) |
|
410 | 410 | { |
411 | 411 | static $conf = null; |
412 | - if ( null === $conf ) { |
|
412 | + if (null === $conf) { |
|
413 | 413 | $conf = autoptimizeConfig::instance(); |
414 | 414 | } |
415 | 415 | |
@@ -424,62 +424,62 @@ discard block |
||
424 | 424 | $filehash = null; |
425 | 425 | |
426 | 426 | // Grab the parts we need. |
427 | - $parts = explode( '|', $matches[1] ); |
|
428 | - if ( ! empty( $parts ) ) { |
|
429 | - $filepath = isset( $parts[0] ) ? base64_decode( $parts[0] ) : null; |
|
430 | - $filehash = isset( $parts[1] ) ? $parts[1] : null; |
|
427 | + $parts = explode('|', $matches[1]); |
|
428 | + if (!empty($parts)) { |
|
429 | + $filepath = isset($parts[0]) ? base64_decode($parts[0]) : null; |
|
430 | + $filehash = isset($parts[1]) ? $parts[1] : null; |
|
431 | 431 | } |
432 | 432 | |
433 | 433 | // Bail early if something's not right... |
434 | - if ( ! $filepath || ! $filehash ) { |
|
434 | + if (!$filepath || !$filehash) { |
|
435 | 435 | return "\n"; |
436 | 436 | } |
437 | 437 | |
438 | - $filecontent = file_get_contents( $filepath ); |
|
438 | + $filecontent = file_get_contents($filepath); |
|
439 | 439 | |
440 | 440 | // Some things are differently handled for css/js... |
441 | - $is_js_file = ( '.js' === substr( $filepath, -3, 3 ) ); |
|
441 | + $is_js_file = ('.js' === substr($filepath, -3, 3)); |
|
442 | 442 | |
443 | 443 | $is_css_file = false; |
444 | - if ( ! $is_js_file ) { |
|
445 | - $is_css_file = ( '.css' === substr( $filepath, -4, 4 ) ); |
|
444 | + if (!$is_js_file) { |
|
445 | + $is_css_file = ('.css' === substr($filepath, -4, 4)); |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | // BOMs being nuked here unconditionally (regardless of where they are)! |
449 | - $filecontent = preg_replace( "#\x{EF}\x{BB}\x{BF}#", '', $filecontent ); |
|
449 | + $filecontent = preg_replace("#\x{EF}\x{BB}\x{BF}#", '', $filecontent); |
|
450 | 450 | |
451 | 451 | // Remove comments and blank lines. |
452 | - if ( $is_js_file ) { |
|
453 | - $filecontent = preg_replace( '#^\s*\/\/.*$#Um', '', $filecontent ); |
|
452 | + if ($is_js_file) { |
|
453 | + $filecontent = preg_replace('#^\s*\/\/.*$#Um', '', $filecontent); |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | // Nuke un-important comments. |
457 | - $filecontent = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent ); |
|
457 | + $filecontent = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent); |
|
458 | 458 | |
459 | 459 | // Normalize newlines. |
460 | - $filecontent = preg_replace( '#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent ); |
|
460 | + $filecontent = preg_replace('#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent); |
|
461 | 461 | |
462 | 462 | // JS specifics. |
463 | - if ( $is_js_file ) { |
|
463 | + if ($is_js_file) { |
|
464 | 464 | // Append a semicolon at the end of js files if it's missing. |
465 | - $last_char = substr( $filecontent, -1, 1 ); |
|
466 | - if ( ';' !== $last_char && '}' !== $last_char ) { |
|
465 | + $last_char = substr($filecontent, -1, 1); |
|
466 | + if (';' !== $last_char && '}' !== $last_char) { |
|
467 | 467 | $filecontent .= ';'; |
468 | 468 | } |
469 | 469 | // Check if try/catch should be used. |
470 | - $opt_js_try_catch = $conf->get( 'autoptimize_js_trycatch' ); |
|
471 | - if ( 'on' === $opt_js_try_catch ) { |
|
470 | + $opt_js_try_catch = $conf->get('autoptimize_js_trycatch'); |
|
471 | + if ('on' === $opt_js_try_catch) { |
|
472 | 472 | // It should, wrap in try/catch. |
473 | - $filecontent = 'try{' . $filecontent . '}catch(e){}'; |
|
473 | + $filecontent = 'try{'.$filecontent.'}catch(e){}'; |
|
474 | 474 | } |
475 | - } elseif ( $is_css_file ) { |
|
476 | - $filecontent = autoptimizeStyles::fixurls( $filepath, $filecontent ); |
|
475 | + } elseif ($is_css_file) { |
|
476 | + $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent); |
|
477 | 477 | } else { |
478 | 478 | $filecontent = ''; |
479 | 479 | } |
480 | 480 | |
481 | 481 | // Return modified (or empty!) code/content. |
482 | - return "\n" . $filecontent; |
|
482 | + return "\n".$filecontent; |
|
483 | 483 | } |
484 | 484 | |
485 | 485 | /** |
@@ -489,13 +489,13 @@ discard block |
||
489 | 489 | * |
490 | 490 | * @return string |
491 | 491 | */ |
492 | - protected function inject_minified( $in ) |
|
492 | + protected function inject_minified($in) |
|
493 | 493 | { |
494 | 494 | $out = $in; |
495 | - if ( false !== strpos( $in, '%%INJECTLATER%%' ) ) { |
|
495 | + if (false !== strpos($in, '%%INJECTLATER%%')) { |
|
496 | 496 | $out = preg_replace_callback( |
497 | - '#\/\*\!%%INJECTLATER' . AUTOPTIMIZE_HASH . '%%(.*?)%%INJECTLATER%%\*\/#is', |
|
498 | - array( $this, 'inject_minified_callback' ), |
|
497 | + '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is', |
|
498 | + array($this, 'inject_minified_callback'), |
|
499 | 499 | $in |
500 | 500 | ); |
501 | 501 | } |
@@ -515,9 +515,9 @@ discard block |
||
515 | 515 | * |
516 | 516 | * @return string |
517 | 517 | */ |
518 | - public static function build_injectlater_marker( $filepath, $hash ) |
|
518 | + public static function build_injectlater_marker($filepath, $hash) |
|
519 | 519 | { |
520 | - $contents = '/*!' . self::build_marker( 'INJECTLATER', $filepath, $hash ) . '*/'; |
|
520 | + $contents = '/*!'.self::build_marker('INJECTLATER', $filepath, $hash).'*/'; |
|
521 | 521 | |
522 | 522 | return $contents; |
523 | 523 | } |
@@ -535,18 +535,18 @@ discard block |
||
535 | 535 | * |
536 | 536 | * @return string |
537 | 537 | */ |
538 | - public static function build_marker( $name, $data, $hash = null ) |
|
538 | + public static function build_marker($name, $data, $hash = null) |
|
539 | 539 | { |
540 | 540 | // Start the marker, add the data. |
541 | - $marker = '%%' . $name . AUTOPTIMIZE_HASH . '%%' . base64_encode( $data ); |
|
541 | + $marker = '%%'.$name.AUTOPTIMIZE_HASH.'%%'.base64_encode($data); |
|
542 | 542 | |
543 | 543 | // Add the hash if provided. |
544 | - if ( null !== $hash ) { |
|
545 | - $marker .= '|' . $hash; |
|
544 | + if (null !== $hash) { |
|
545 | + $marker .= '|'.$hash; |
|
546 | 546 | } |
547 | 547 | |
548 | 548 | // Close the marker. |
549 | - $marker .= '%%' . $name . '%%'; |
|
549 | + $marker .= '%%'.$name.'%%'; |
|
550 | 550 | |
551 | 551 | return $marker; |
552 | 552 | } |
@@ -566,22 +566,22 @@ discard block |
||
566 | 566 | * |
567 | 567 | * @return string |
568 | 568 | */ |
569 | - public static function replace_contents_with_marker_if_exists( $marker, $search, $re_replace_pattern, $content ) |
|
569 | + public static function replace_contents_with_marker_if_exists($marker, $search, $re_replace_pattern, $content) |
|
570 | 570 | { |
571 | 571 | $found = false; |
572 | 572 | |
573 | - $is_regex = autoptimizeUtils::str_is_valid_regex( $search ); |
|
574 | - if ( $is_regex ) { |
|
575 | - $found = preg_match( $search, $content ); |
|
573 | + $is_regex = autoptimizeUtils::str_is_valid_regex($search); |
|
574 | + if ($is_regex) { |
|
575 | + $found = preg_match($search, $content); |
|
576 | 576 | } else { |
577 | - $found = ( false !== strpos( $content, $search ) ); |
|
577 | + $found = (false !== strpos($content, $search)); |
|
578 | 578 | } |
579 | 579 | |
580 | - if ( $found ) { |
|
580 | + if ($found) { |
|
581 | 581 | $content = preg_replace_callback( |
582 | 582 | $re_replace_pattern, |
583 | - function( $matches ) use ( $marker ) { |
|
584 | - return autoptimizeBase::build_marker( $marker, $matches[0] ); |
|
583 | + function($matches) use ($marker) { |
|
584 | + return autoptimizeBase::build_marker($marker, $matches[0]); |
|
585 | 585 | }, |
586 | 586 | $content |
587 | 587 | ); |
@@ -598,13 +598,13 @@ discard block |
||
598 | 598 | * |
599 | 599 | * @return string |
600 | 600 | */ |
601 | - public static function restore_marked_content( $marker, $content ) |
|
601 | + public static function restore_marked_content($marker, $content) |
|
602 | 602 | { |
603 | - if ( false !== strpos( $content, $marker ) ) { |
|
603 | + if (false !== strpos($content, $marker)) { |
|
604 | 604 | $content = preg_replace_callback( |
605 | - '#%%' . $marker . AUTOPTIMIZE_HASH . '%%(.*?)%%' . $marker . '%%#is', |
|
606 | - function ( $matches ) { |
|
607 | - return base64_decode( $matches[1] ); |
|
605 | + '#%%'.$marker.AUTOPTIMIZE_HASH.'%%(.*?)%%'.$marker.'%%#is', |
|
606 | + function($matches) { |
|
607 | + return base64_decode($matches[1]); |
|
608 | 608 | }, |
609 | 609 | $content |
610 | 610 | ); |
@@ -620,17 +620,17 @@ discard block |
||
620 | 620 | * |
621 | 621 | * @return void |
622 | 622 | */ |
623 | - protected function debug_log( $data ) |
|
623 | + protected function debug_log($data) |
|
624 | 624 | { |
625 | - if ( ! isset( $this->debug_log ) || ! $this->debug_log ) { |
|
625 | + if (!isset($this->debug_log) || !$this->debug_log) { |
|
626 | 626 | return; |
627 | 627 | } |
628 | 628 | |
629 | - if ( ! is_string( $data ) && ! is_resource( $data ) ) { |
|
630 | - $data = var_export( $data, true ); |
|
629 | + if (!is_string($data) && !is_resource($data)) { |
|
630 | + $data = var_export($data, true); |
|
631 | 631 | } |
632 | 632 | |
633 | - error_log( $data ); |
|
633 | + error_log($data); |
|
634 | 634 | } |
635 | 635 | |
636 | 636 | /** |
@@ -640,12 +640,12 @@ discard block |
||
640 | 640 | * |
641 | 641 | * @return bool|string to be minified code or false. |
642 | 642 | */ |
643 | - protected function prepare_minify_single( $filepath ) |
|
643 | + protected function prepare_minify_single($filepath) |
|
644 | 644 | { |
645 | 645 | // Decide what we're dealing with, return false if we don't know. |
646 | - if ( autoptimizeUtils::str_ends_in( $filepath, '.js' ) ) { |
|
646 | + if (autoptimizeUtils::str_ends_in($filepath, '.js')) { |
|
647 | 647 | $type = 'js'; |
648 | - } elseif ( autoptimizeUtils::str_ends_in( $filepath, '.css' ) ) { |
|
648 | + } elseif (autoptimizeUtils::str_ends_in($filepath, '.css')) { |
|
649 | 649 | $type = 'css'; |
650 | 650 | } else { |
651 | 651 | return false; |
@@ -654,18 +654,18 @@ discard block |
||
654 | 654 | // Bail if it looks like its already minifed (by having -min or .min |
655 | 655 | // in filename) or if it looks like WP jquery.js (which is minified). |
656 | 656 | $minified_variants = array( |
657 | - '-min.' . $type, |
|
658 | - '.min.' . $type, |
|
657 | + '-min.'.$type, |
|
658 | + '.min.'.$type, |
|
659 | 659 | 'js/jquery/jquery.js', |
660 | 660 | ); |
661 | - foreach ( $minified_variants as $ending ) { |
|
662 | - if ( autoptimizeUtils::str_ends_in( $filepath, $ending ) ) { |
|
661 | + foreach ($minified_variants as $ending) { |
|
662 | + if (autoptimizeUtils::str_ends_in($filepath, $ending)) { |
|
663 | 663 | return false; |
664 | 664 | } |
665 | 665 | } |
666 | 666 | |
667 | 667 | // Get file contents, bail if empty. |
668 | - $contents = file_get_contents( $filepath ); |
|
668 | + $contents = file_get_contents($filepath); |
|
669 | 669 | |
670 | 670 | return $contents; |
671 | 671 | } |
@@ -678,12 +678,12 @@ discard block |
||
678 | 678 | * |
679 | 679 | * @return string |
680 | 680 | */ |
681 | - protected function build_minify_single_url( autoptimizeCache $cache ) |
|
681 | + protected function build_minify_single_url(autoptimizeCache $cache) |
|
682 | 682 | { |
683 | - $url = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
|
683 | + $url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
|
684 | 684 | |
685 | 685 | // CDN-replace the resulting URL if needed... |
686 | - $url = $this->url_replace_cdn( $url ); |
|
686 | + $url = $this->url_replace_cdn($url); |
|
687 | 687 | |
688 | 688 | return $url; |
689 | 689 | } |
@@ -2,9 +2,9 @@ discard block |
||
2 | 2 | |
3 | 3 | //Check everything exists before using it |
4 | 4 | if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
5 | - $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
5 | + $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
6 | 6 | if(!isset($_SERVER['HTTP_USER_AGENT'])) |
7 | - $_SERVER['HTTP_USER_AGENT'] = ''; |
|
7 | + $_SERVER['HTTP_USER_AGENT'] = ''; |
|
8 | 8 | |
9 | 9 | // Determine supported compression method |
10 | 10 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -15,30 +15,30 @@ discard block |
||
15 | 15 | |
16 | 16 | // Check for buggy versions of Internet Explorer |
17 | 17 | if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && |
18 | - preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
18 | + preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
19 | 19 | { |
20 | - $version = floatval($matches[1]); |
|
20 | + $version = floatval($matches[1]); |
|
21 | 21 | |
22 | - if ($version < 6) |
|
23 | - $encoding = 'none'; |
|
22 | + if ($version < 6) |
|
23 | + $encoding = 'none'; |
|
24 | 24 | |
25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
26 | - $encoding = 'none'; |
|
25 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
26 | + $encoding = 'none'; |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
30 | 30 | if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
31 | - $encoding = 'none'; |
|
31 | + $encoding = 'none'; |
|
32 | 32 | |
33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
34 | 34 | if($encoding != 'none' && $iscompressed == false) |
35 | 35 | { |
36 | - $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
|
37 | - $code = file_get_contents(__FILE__.'.none'); |
|
38 | - $contents = gzencode($code,9,$flag); |
|
36 | + $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
|
37 | + $code = file_get_contents(__FILE__.'.none'); |
|
38 | + $contents = gzencode($code,9,$flag); |
|
39 | 39 | }else{ |
40 | - //Get data |
|
41 | - $contents = file_get_contents(__FILE__.'.'.$encoding); |
|
40 | + //Get data |
|
41 | + $contents = file_get_contents(__FILE__.'.'.$encoding); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | // first check if we have to send 304 |
@@ -52,36 +52,36 @@ discard block |
||
52 | 52 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
53 | 53 | |
54 | 54 | if (($modTimeMatch)||($eTagMatch)) { |
55 | - header('HTTP/1.1 304 Not Modified'); |
|
56 | - header('Connection: close'); |
|
55 | + header('HTTP/1.1 304 Not Modified'); |
|
56 | + header('Connection: close'); |
|
57 | 57 | } else { |
58 | - // send all sorts of headers |
|
59 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
60 | - if ($encoding != 'none') { |
|
61 | - header('Content-Encoding: '.$encoding); |
|
62 | - } |
|
63 | - header('Vary: Accept-Encoding'); |
|
64 | - header('Content-Length: '.strlen($contents)); |
|
65 | - header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
66 | - header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
67 | - header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
|
68 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
69 | - header('ETag: ' . $eTag); |
|
70 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
58 | + // send all sorts of headers |
|
59 | + $expireTime=60*60*24*355; // 1y max according to RFC |
|
60 | + if ($encoding != 'none') { |
|
61 | + header('Content-Encoding: '.$encoding); |
|
62 | + } |
|
63 | + header('Vary: Accept-Encoding'); |
|
64 | + header('Content-Length: '.strlen($contents)); |
|
65 | + header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
66 | + header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
67 | + header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
|
68 | + header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
69 | + header('ETag: ' . $eTag); |
|
70 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
71 | 71 | |
72 | - // send output |
|
73 | - echo $contents; |
|
72 | + // send output |
|
73 | + echo $contents; |
|
74 | 74 | |
75 | - //And write to filesystem cache if not done yet |
|
76 | - if($encoding != 'none' && $iscompressed == false) |
|
77 | - { |
|
78 | - //Write the content we sent |
|
79 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
75 | + //And write to filesystem cache if not done yet |
|
76 | + if($encoding != 'none' && $iscompressed == false) |
|
77 | + { |
|
78 | + //Write the content we sent |
|
79 | + file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
80 | 80 | |
81 | - //And write the new content |
|
82 | - $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
83 | - $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
84 | - $contents = gzencode($code,9,$flag); |
|
85 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
86 | - } |
|
81 | + //And write the new content |
|
82 | + $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
83 | + $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
84 | + $contents = gzencode($code,9,$flag); |
|
85 | + file_put_contents(__FILE__.'.'.$ext,$contents); |
|
86 | + } |
|
87 | 87 | } |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php exit; |
2 | 2 | |
3 | 3 | //Check everything exists before using it |
4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
8 | 8 | |
9 | 9 | // Determine supported compression method |
@@ -27,16 +27,16 @@ discard block |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
31 | 31 | $encoding = 'none'; |
32 | 32 | |
33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
34 | -if($encoding != 'none' && $iscompressed == false) |
|
34 | +if ($encoding != 'none' && $iscompressed == false) |
|
35 | 35 | { |
36 | 36 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
37 | 37 | $code = file_get_contents(__FILE__.'.none'); |
38 | - $contents = gzencode($code,9,$flag); |
|
39 | -}else{ |
|
38 | + $contents = gzencode($code, 9, $flag); |
|
39 | +} else { |
|
40 | 40 | //Get data |
41 | 41 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
42 | 42 | } |
@@ -44,19 +44,19 @@ discard block |
||
44 | 44 | // first check if we have to send 304 |
45 | 45 | // inspired by http://www.jonasjohn.de/snippets/php/caching.htm |
46 | 46 | |
47 | -$eTag=md5($contents); |
|
48 | -$modTime=filemtime(__FILE__.'.none'); |
|
47 | +$eTag = md5($contents); |
|
48 | +$modTime = filemtime(__FILE__.'.none'); |
|
49 | 49 | |
50 | 50 | date_default_timezone_set("UTC"); |
51 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
51 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
52 | 52 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
53 | 53 | |
54 | -if (($modTimeMatch)||($eTagMatch)) { |
|
54 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
55 | 55 | header('HTTP/1.1 304 Not Modified'); |
56 | 56 | header('Connection: close'); |
57 | 57 | } else { |
58 | 58 | // send all sorts of headers |
59 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
59 | + $expireTime = 60*60*24*355; // 1y max according to RFC |
|
60 | 60 | if ($encoding != 'none') { |
61 | 61 | header('Content-Encoding: '.$encoding); |
62 | 62 | } |
@@ -66,22 +66,22 @@ discard block |
||
66 | 66 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
67 | 67 | header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
68 | 68 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
69 | - header('ETag: ' . $eTag); |
|
69 | + header('ETag: '.$eTag); |
|
70 | 70 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
71 | 71 | |
72 | 72 | // send output |
73 | 73 | echo $contents; |
74 | 74 | |
75 | 75 | //And write to filesystem cache if not done yet |
76 | - if($encoding != 'none' && $iscompressed == false) |
|
76 | + if ($encoding != 'none' && $iscompressed == false) |
|
77 | 77 | { |
78 | 78 | //Write the content we sent |
79 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
79 | + file_put_contents(__FILE__.'.'.$encoding, $contents); |
|
80 | 80 | |
81 | 81 | //And write the new content |
82 | 82 | $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
83 | 83 | $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
84 | - $contents = gzencode($code,9,$flag); |
|
85 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
84 | + $contents = gzencode($code, 9, $flag); |
|
85 | + file_put_contents(__FILE__.'.'.$ext, $contents); |
|
86 | 86 | } |
87 | 87 | } |
@@ -1,10 +1,12 @@ discard block |
||
1 | 1 | <?php exit; |
2 | 2 | |
3 | 3 | //Check everything exists before using it |
4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
4 | +if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) { |
|
5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
6 | +} |
|
7 | +if(!isset($_SERVER['HTTP_USER_AGENT'])) { |
|
7 | 8 | $_SERVER['HTTP_USER_AGENT'] = ''; |
9 | +} |
|
8 | 10 | |
9 | 11 | // Determine supported compression method |
10 | 12 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -19,16 +21,19 @@ discard block |
||
19 | 21 | { |
20 | 22 | $version = floatval($matches[1]); |
21 | 23 | |
22 | - if ($version < 6) |
|
23 | - $encoding = 'none'; |
|
24 | + if ($version < 6) { |
|
25 | + $encoding = 'none'; |
|
26 | + } |
|
24 | 27 | |
25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
26 | - $encoding = 'none'; |
|
27 | -} |
|
28 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) { |
|
29 | + $encoding = 'none'; |
|
30 | + } |
|
31 | + } |
|
28 | 32 | |
29 | 33 | //Some servers compress the output of PHP - Don't break in those cases |
30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
34 | +if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) { |
|
31 | 35 | $encoding = 'none'; |
36 | +} |
|
32 | 37 | |
33 | 38 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
34 | 39 | if($encoding != 'none' && $iscompressed == false) |
@@ -36,7 +41,7 @@ discard block |
||
36 | 41 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
37 | 42 | $code = file_get_contents(__FILE__.'.none'); |
38 | 43 | $contents = gzencode($code,9,$flag); |
39 | -}else{ |
|
44 | +} else{ |
|
40 | 45 | //Get data |
41 | 46 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
42 | 47 | } |
@@ -38,18 +38,18 @@ discard block |
||
38 | 38 | $l = floatval(str_replace('%', '', $hslValues[2])); |
39 | 39 | |
40 | 40 | // Wrap and clamp, then fraction! |
41 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
42 | - $s = self::clampNumber($s, 0, 100) / 100; |
|
43 | - $l = self::clampNumber($l, 0, 100) / 100; |
|
41 | + $h = ((($h%360) + 360)%360)/360; |
|
42 | + $s = self::clampNumber($s, 0, 100)/100; |
|
43 | + $l = self::clampNumber($l, 0, 100)/100; |
|
44 | 44 | |
45 | 45 | if ($s == 0) { |
46 | - $r = $g = $b = self::roundNumber(255 * $l); |
|
46 | + $r = $g = $b = self::roundNumber(255*$l); |
|
47 | 47 | } else { |
48 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
49 | - $v1 = (2 * $l) - $v2; |
|
50 | - $r = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h + (1/3))); |
|
51 | - $g = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h)); |
|
52 | - $b = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h - (1/3))); |
|
48 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
49 | + $v1 = (2*$l) - $v2; |
|
50 | + $r = self::roundNumber(255*self::hueToRgb($v1, $v2, $h + (1/3))); |
|
51 | + $g = self::roundNumber(255*self::hueToRgb($v1, $v2, $h)); |
|
52 | + $b = self::roundNumber(255*self::hueToRgb($v1, $v2, $h - (1/3))); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return array($r, $g, $b); |
@@ -66,16 +66,16 @@ discard block |
||
66 | 66 | { |
67 | 67 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
68 | 68 | |
69 | - if ($vh * 6 < 1) { |
|
70 | - return $v1 + ($v2 - $v1) * 6 * $vh; |
|
69 | + if ($vh*6 < 1) { |
|
70 | + return $v1 + ($v2 - $v1)*6*$vh; |
|
71 | 71 | } |
72 | 72 | |
73 | - if ($vh * 2 < 1) { |
|
73 | + if ($vh*2 < 1) { |
|
74 | 74 | return $v2; |
75 | 75 | } |
76 | 76 | |
77 | - if ($vh * 3 < 2) { |
|
78 | - return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6; |
|
77 | + if ($vh*3 < 2) { |
|
78 | + return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | return $v1; |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | switch ($letter) { |
95 | 95 | case 'M': |
96 | 96 | case 'm': |
97 | - return (int) $size * 1048576; |
|
97 | + return (int) $size*1048576; |
|
98 | 98 | case 'K': |
99 | 99 | case 'k': |
100 | - return (int) $size * 1024; |
|
100 | + return (int) $size*1024; |
|
101 | 101 | case 'G': |
102 | 102 | case 'g': |
103 | - return (int) $size * 1073741824; |
|
103 | + return (int) $size*1073741824; |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | return (int) $size; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | public static function rgbPercentageToRgbInteger($rgbPercentage) |
115 | 115 | { |
116 | 116 | if (strpos($rgbPercentage, '%') !== false) { |
117 | - $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55); |
|
117 | + $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | return intval($rgbPercentage, 10); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Handles minifying HTML markup. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -27,19 +27,19 @@ discard block |
||
27 | 27 | '<!--/noindex-->', |
28 | 28 | ); |
29 | 29 | |
30 | - public function read( $options ) |
|
30 | + public function read($options) |
|
31 | 31 | { |
32 | 32 | // Remove the HTML comments? |
33 | 33 | $this->keepcomments = (bool) $options['keepcomments']; |
34 | 34 | |
35 | 35 | // Filter to force xhtml. |
36 | - $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false ); |
|
36 | + $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false); |
|
37 | 37 | |
38 | 38 | // Filterable strings to be excluded from HTML minification. |
39 | - $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' ); |
|
40 | - if ( '' !== $exclude ) { |
|
41 | - $exclude_arr = array_filter( array_map( 'trim', explode( ',', $exclude ) ) ); |
|
42 | - $this->exclude = array_merge( $exclude_arr, $this->exclude ); |
|
39 | + $exclude = apply_filters('autoptimize_filter_html_exclude', ''); |
|
40 | + if ('' !== $exclude) { |
|
41 | + $exclude_arr = array_filter(array_map('trim', explode(',', $exclude))); |
|
42 | + $this->exclude = array_merge($exclude_arr, $this->exclude); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | // Nothing else for HTML! |
@@ -53,49 +53,49 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function minify() |
55 | 55 | { |
56 | - $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
|
57 | - if ( $noptimize ) { |
|
56 | + $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content); |
|
57 | + if ($noptimize) { |
|
58 | 58 | return false; |
59 | 59 | } |
60 | 60 | |
61 | 61 | // Wrap the to-be-excluded strings in noptimize tags. |
62 | - foreach ( $this->exclude as $str ) { |
|
63 | - if ( false !== strpos( $this->content, $str ) ) { |
|
64 | - $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->'; |
|
65 | - $this->content = str_replace( $str, $replacement, $this->content ); |
|
62 | + foreach ($this->exclude as $str) { |
|
63 | + if (false !== strpos($this->content, $str)) { |
|
64 | + $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->'; |
|
65 | + $this->content = str_replace($str, $replacement, $this->content); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | 69 | // Noptimize. |
70 | - $this->content = $this->hide_noptimize( $this->content ); |
|
70 | + $this->content = $this->hide_noptimize($this->content); |
|
71 | 71 | |
72 | 72 | // Preparing options for Minify_HTML. |
73 | - $options = array( 'keepComments' => $this->keepcomments ); |
|
74 | - if ( $this->forcexhtml ) { |
|
73 | + $options = array('keepComments' => $this->keepcomments); |
|
74 | + if ($this->forcexhtml) { |
|
75 | 75 | $options['xhtml'] = true; |
76 | 76 | } |
77 | 77 | |
78 | - $tmp_content = Minify_HTML::minify( $this->content, $options ); |
|
79 | - if ( ! empty( $tmp_content ) ) { |
|
78 | + $tmp_content = Minify_HTML::minify($this->content, $options); |
|
79 | + if (!empty($tmp_content)) { |
|
80 | 80 | $this->content = $tmp_content; |
81 | - unset( $tmp_content ); |
|
81 | + unset($tmp_content); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | // Restore noptimize. |
85 | - $this->content = $this->restore_noptimize( $this->content ); |
|
85 | + $this->content = $this->restore_noptimize($this->content); |
|
86 | 86 | |
87 | 87 | // Remove the noptimize-wrapper from around the excluded strings. |
88 | - foreach ( $this->exclude as $str ) { |
|
89 | - $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->'; |
|
90 | - if ( false !== strpos( $this->content, $replacement ) ) { |
|
91 | - $this->content = str_replace( $replacement, $str, $this->content ); |
|
88 | + foreach ($this->exclude as $str) { |
|
89 | + $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->'; |
|
90 | + if (false !== strpos($this->content, $replacement)) { |
|
91 | + $this->content = str_replace($replacement, $str, $this->content); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | |
95 | 95 | // Revslider data attribs somehow suffer from HTML optimization, this fixes that! |
96 | - if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) { |
|
97 | - $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content ); |
|
98 | - $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content ); |
|
96 | + if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) { |
|
97 | + $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content); |
|
98 | + $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | return true; |
@@ -3,12 +3,12 @@ discard block |
||
3 | 3 | * WP-CLI commands for Autoptimize. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
10 | 10 | // This is a WP-CLI command, so bail if it's not available. |
11 | -if ( ! defined( 'WP_CLI' ) ) { |
|
11 | +if (!defined('WP_CLI')) { |
|
12 | 12 | return; |
13 | 13 | } |
14 | 14 | |
@@ -24,11 +24,11 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @return void |
26 | 26 | */ |
27 | - public function clear( $args, $args_assoc ) { |
|
28 | - WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) ); |
|
27 | + public function clear($args, $args_assoc) { |
|
28 | + WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize')); |
|
29 | 29 | autoptimizeCache::clearall(); |
30 | - WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) ); |
|
30 | + WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize')); |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | -WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' ); |
|
34 | +WP_CLI::add_command('autoptimize', 'autoptimizeCLI'); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -21,9 +21,9 @@ discard block |
||
21 | 21 | * |
22 | 22 | * @param bool $raise_limits Whether to raise memory limits or not. Default true. |
23 | 23 | */ |
24 | - public function __construct( $raise_limits = true ) |
|
24 | + public function __construct($raise_limits = true) |
|
25 | 25 | { |
26 | - $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits ); |
|
26 | + $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | * |
35 | 35 | * @return string |
36 | 36 | */ |
37 | - public function run( $css ) |
|
37 | + public function run($css) |
|
38 | 38 | { |
39 | - $result = $this->minifier->run( $css ); |
|
39 | + $result = $this->minifier->run($css); |
|
40 | 40 | |
41 | 41 | return $result; |
42 | 42 | } |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | * |
49 | 49 | * @return string |
50 | 50 | */ |
51 | - public static function minify( $css ) |
|
51 | + public static function minify($css) |
|
52 | 52 | { |
53 | 53 | $minifier = new self(); |
54 | 54 | |
55 | - return $minifier->run( $css ); |
|
55 | + return $minifier->run($css); |
|
56 | 56 | } |
57 | 57 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | * new in Autoptimize 2.2 |
5 | 5 | */ |
6 | 6 | |
7 | -if ( ! defined( 'ABSPATH' ) ) { |
|
7 | +if (!defined('ABSPATH')) { |
|
8 | 8 | exit; |
9 | 9 | } |
10 | 10 | |
@@ -17,94 +17,94 @@ discard block |
||
17 | 17 | |
18 | 18 | public function add_hooks() |
19 | 19 | { |
20 | - if ( apply_filters( 'autoptimize_js_do_minify', true ) ) { |
|
21 | - add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 ); |
|
22 | - add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 ); |
|
20 | + if (apply_filters('autoptimize_js_do_minify', true)) { |
|
21 | + add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2); |
|
22 | + add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1); |
|
23 | 23 | } |
24 | - if ( apply_filters( 'autoptimize_css_do_minify', true ) ) { |
|
25 | - add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 ); |
|
26 | - add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 ); |
|
24 | + if (apply_filters('autoptimize_css_do_minify', true)) { |
|
25 | + add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2); |
|
26 | + add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1); |
|
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
30 | - public function js_snippetcacher( $jsin, $jsfilename ) |
|
30 | + public function js_snippetcacher($jsin, $jsfilename) |
|
31 | 31 | { |
32 | - $md5hash = 'snippet_' . md5( $jsin ); |
|
33 | - $ccheck = new autoptimizeCache( $md5hash, 'js' ); |
|
34 | - if ( $ccheck->check() ) { |
|
32 | + $md5hash = 'snippet_'.md5($jsin); |
|
33 | + $ccheck = new autoptimizeCache($md5hash, 'js'); |
|
34 | + if ($ccheck->check()) { |
|
35 | 35 | $scriptsrc = $ccheck->retrieve(); |
36 | 36 | } else { |
37 | - if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) { |
|
38 | - $tmp_jscode = trim( JSMin::minify( $jsin ) ); |
|
39 | - if ( ! empty( $tmp_jscode ) ) { |
|
37 | + if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) { |
|
38 | + $tmp_jscode = trim(JSMin::minify($jsin)); |
|
39 | + if (!empty($tmp_jscode)) { |
|
40 | 40 | $scriptsrc = $tmp_jscode; |
41 | - unset( $tmp_jscode ); |
|
41 | + unset($tmp_jscode); |
|
42 | 42 | } else { |
43 | 43 | $scriptsrc = $jsin; |
44 | 44 | } |
45 | 45 | } else { |
46 | 46 | // Removing comments, linebreaks and stuff! |
47 | - $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin ); |
|
48 | - $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc ); |
|
49 | - $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc ); |
|
47 | + $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin); |
|
48 | + $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc); |
|
49 | + $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc); |
|
50 | 50 | } |
51 | 51 | |
52 | - $last_char = substr( $scriptsrc, -1, 1 ); |
|
53 | - if ( ';' !== $last_char && '}' !== $last_char ) { |
|
52 | + $last_char = substr($scriptsrc, -1, 1); |
|
53 | + if (';' !== $last_char && '}' !== $last_char) { |
|
54 | 54 | $scriptsrc .= ';'; |
55 | 55 | } |
56 | 56 | |
57 | - if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) { |
|
57 | + if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) { |
|
58 | 58 | // Don't cache inline CSS or if filter says no! |
59 | - $ccheck->cache( $scriptsrc, 'text/javascript' ); |
|
59 | + $ccheck->cache($scriptsrc, 'text/javascript'); |
|
60 | 60 | } |
61 | 61 | } |
62 | - unset( $ccheck ); |
|
62 | + unset($ccheck); |
|
63 | 63 | |
64 | 64 | return $scriptsrc; |
65 | 65 | } |
66 | 66 | |
67 | - public function css_snippetcacher( $cssin, $cssfilename ) |
|
67 | + public function css_snippetcacher($cssin, $cssfilename) |
|
68 | 68 | { |
69 | - $md5hash = 'snippet_' . md5( $cssin ); |
|
70 | - $ccheck = new autoptimizeCache( $md5hash, 'css' ); |
|
71 | - if ( $ccheck->check() ) { |
|
69 | + $md5hash = 'snippet_'.md5($cssin); |
|
70 | + $ccheck = new autoptimizeCache($md5hash, 'css'); |
|
71 | + if ($ccheck->check()) { |
|
72 | 72 | $stylesrc = $ccheck->retrieve(); |
73 | 73 | } else { |
74 | - if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
74 | + if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) { |
|
75 | 75 | $cssmin = new autoptimizeCSSmin(); |
76 | - $tmp_code = trim( $cssmin->run( $cssin ) ); |
|
76 | + $tmp_code = trim($cssmin->run($cssin)); |
|
77 | 77 | |
78 | - if ( ! empty( $tmp_code ) ) { |
|
78 | + if (!empty($tmp_code)) { |
|
79 | 79 | $stylesrc = $tmp_code; |
80 | - unset( $tmp_code ); |
|
80 | + unset($tmp_code); |
|
81 | 81 | } else { |
82 | 82 | $stylesrc = $cssin; |
83 | 83 | } |
84 | 84 | } else { |
85 | 85 | // .min.css -> no heavy-lifting, just some cleanup! |
86 | - $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin ); |
|
87 | - $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc ); |
|
88 | - $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc ); |
|
86 | + $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin); |
|
87 | + $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc); |
|
88 | + $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc); |
|
89 | 89 | } |
90 | - if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
90 | + if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) { |
|
91 | 91 | // Only caching CSS if it's not inline and is allowed by filter! |
92 | - $ccheck->cache( $stylesrc, 'text/css' ); |
|
92 | + $ccheck->cache($stylesrc, 'text/css'); |
|
93 | 93 | } |
94 | 94 | } |
95 | - unset( $ccheck ); |
|
95 | + unset($ccheck); |
|
96 | 96 | |
97 | 97 | return $stylesrc; |
98 | 98 | } |
99 | 99 | |
100 | - public function css_cleanup( $cssin ) |
|
100 | + public function css_cleanup($cssin) |
|
101 | 101 | { |
102 | 102 | // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed. |
103 | - return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) ); |
|
103 | + return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin)); |
|
104 | 104 | } |
105 | 105 | |
106 | - public function js_cleanup( $jsin ) |
|
106 | + public function js_cleanup($jsin) |
|
107 | 107 | { |
108 | - return trim( $jsin ); |
|
108 | + return trim($jsin); |
|
109 | 109 | } |
110 | 110 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * |
15 | 15 | * @param bool|null $override Allows overriding the decision. |
16 | 16 | * |
17 | - * @return bool |
|
17 | + * @return boolean|null |
|
18 | 18 | */ |
19 | 19 | public static function mbstring_available( $override = null ) |
20 | 20 | { |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @param bool $override Allows overriding the decision when needed. |
132 | 132 | * |
133 | - * @return bool |
|
133 | + * @return boolean|null |
|
134 | 134 | */ |
135 | 135 | public static function siteurl_not_root( $override = null ) |
136 | 136 | { |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | * General helpers. |
4 | 4 | */ |
5 | 5 | |
6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
6 | +if (!defined('ABSPATH')) { |
|
7 | 7 | exit; |
8 | 8 | } |
9 | 9 | |
@@ -16,15 +16,15 @@ discard block |
||
16 | 16 | * |
17 | 17 | * @return bool |
18 | 18 | */ |
19 | - public static function mbstring_available( $override = null ) |
|
19 | + public static function mbstring_available($override = null) |
|
20 | 20 | { |
21 | 21 | static $available = null; |
22 | 22 | |
23 | - if ( null === $available ) { |
|
24 | - $available = \extension_loaded( 'mbstring' ); |
|
23 | + if (null === $available) { |
|
24 | + $available = \extension_loaded('mbstring'); |
|
25 | 25 | } |
26 | 26 | |
27 | - if ( null !== $override ) { |
|
27 | + if (null !== $override) { |
|
28 | 28 | $available = $override; |
29 | 29 | } |
30 | 30 | |
@@ -42,12 +42,12 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @return int|false |
44 | 44 | */ |
45 | - public static function strpos( $haystack, $needle, $offset = 0, $encoding = null ) |
|
45 | + public static function strpos($haystack, $needle, $offset = 0, $encoding = null) |
|
46 | 46 | { |
47 | - if ( self::mbstring_available() ) { |
|
48 | - return ( null === $encoding ) ? \mb_strpos( $haystack, $needle, $offset ) : \mb_strpos( $haystack, $needle, $offset, $encoding ); |
|
47 | + if (self::mbstring_available()) { |
|
48 | + return (null === $encoding) ? \mb_strpos($haystack, $needle, $offset) : \mb_strpos($haystack, $needle, $offset, $encoding); |
|
49 | 49 | } else { |
50 | - return \strpos( $haystack, $needle, $offset ); |
|
50 | + return \strpos($haystack, $needle, $offset); |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
@@ -62,12 +62,12 @@ discard block |
||
62 | 62 | * @return int Number of characters or bytes in given $string |
63 | 63 | * (characters if/when supported, bytes otherwise). |
64 | 64 | */ |
65 | - public static function strlen( $string, $encoding = null ) |
|
65 | + public static function strlen($string, $encoding = null) |
|
66 | 66 | { |
67 | - if ( self::mbstring_available() ) { |
|
68 | - return ( null === $encoding ) ? \mb_strlen( $string ) : \mb_strlen( $string, $encoding ); |
|
67 | + if (self::mbstring_available()) { |
|
68 | + return (null === $encoding) ? \mb_strlen($string) : \mb_strlen($string, $encoding); |
|
69 | 69 | } else { |
70 | - return \strlen( $string ); |
|
70 | + return \strlen($string); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
@@ -85,44 +85,44 @@ discard block |
||
85 | 85 | * |
86 | 86 | * @return string |
87 | 87 | */ |
88 | - public static function substr_replace( $string, $replacement, $start, $length = null, $encoding = null ) |
|
88 | + public static function substr_replace($string, $replacement, $start, $length = null, $encoding = null) |
|
89 | 89 | { |
90 | - if ( self::mbstring_available() ) { |
|
91 | - $strlen = self::strlen( $string, $encoding ); |
|
90 | + if (self::mbstring_available()) { |
|
91 | + $strlen = self::strlen($string, $encoding); |
|
92 | 92 | |
93 | - if ( $start < 0 ) { |
|
93 | + if ($start < 0) { |
|
94 | 94 | if ( -$start < $strlen ) { |
95 | 95 | $start = $strlen + $start; |
96 | 96 | } else { |
97 | 97 | $start = 0; |
98 | 98 | } |
99 | - } elseif ( $start > $strlen ) { |
|
99 | + } elseif ($start > $strlen) { |
|
100 | 100 | $start = $strlen; |
101 | 101 | } |
102 | 102 | |
103 | - if ( null === $length || '' === $length ) { |
|
103 | + if (null === $length || '' === $length) { |
|
104 | 104 | $start2 = $strlen; |
105 | - } elseif ( $length < 0 ) { |
|
105 | + } elseif ($length < 0) { |
|
106 | 106 | $start2 = $strlen + $length; |
107 | - if ( $start2 < $start ) { |
|
107 | + if ($start2 < $start) { |
|
108 | 108 | $start2 = $start; |
109 | 109 | } |
110 | 110 | } else { |
111 | 111 | $start2 = $start + $length; |
112 | 112 | } |
113 | 113 | |
114 | - if ( null === $encoding ) { |
|
115 | - $leader = $start ? \mb_substr( $string, 0, $start ) : ''; |
|
116 | - $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null ) : ''; |
|
114 | + if (null === $encoding) { |
|
115 | + $leader = $start ? \mb_substr($string, 0, $start) : ''; |
|
116 | + $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null) : ''; |
|
117 | 117 | } else { |
118 | - $leader = $start ? \mb_substr( $string, 0, $start, $encoding ) : ''; |
|
119 | - $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null, $encoding ) : ''; |
|
118 | + $leader = $start ? \mb_substr($string, 0, $start, $encoding) : ''; |
|
119 | + $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null, $encoding) : ''; |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | return "{$leader}{$replacement}{$trailer}"; |
123 | 123 | } |
124 | 124 | |
125 | - return ( null === $length ) ? \substr_replace( $string, $replacement, $start ) : \substr_replace( $string, $replacement, $start, $length ); |
|
125 | + return (null === $length) ? \substr_replace($string, $replacement, $start) : \substr_replace($string, $replacement, $start, $length); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
@@ -132,16 +132,16 @@ discard block |
||
132 | 132 | * |
133 | 133 | * @return bool |
134 | 134 | */ |
135 | - public static function siteurl_not_root( $override = null ) |
|
135 | + public static function siteurl_not_root($override = null) |
|
136 | 136 | { |
137 | 137 | static $subdir = null; |
138 | 138 | |
139 | - if ( null === $subdir ) { |
|
139 | + if (null === $subdir) { |
|
140 | 140 | $parts = self::get_ao_wp_site_url_parts(); |
141 | - $subdir = ( isset( $parts['path'] ) && ( '/' !== $parts['path'] ) ); |
|
141 | + $subdir = (isset($parts['path']) && ('/' !== $parts['path'])); |
|
142 | 142 | } |
143 | 143 | |
144 | - if ( null !== $override ) { |
|
144 | + if (null !== $override) { |
|
145 | 145 | $subdir = $override; |
146 | 146 | } |
147 | 147 | |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | { |
159 | 159 | static $parts = array(); |
160 | 160 | |
161 | - if ( empty( $parts ) ) { |
|
162 | - $parts = \parse_url( AUTOPTIMIZE_WP_SITE_URL ); |
|
161 | + if (empty($parts)) { |
|
162 | + $parts = \parse_url(AUTOPTIMIZE_WP_SITE_URL); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | return $parts; |
@@ -174,33 +174,33 @@ discard block |
||
174 | 174 | * |
175 | 175 | * @return string |
176 | 176 | */ |
177 | - public static function tweak_cdn_url_if_needed( $cdn_url, $force_cache_miss = false ) |
|
177 | + public static function tweak_cdn_url_if_needed($cdn_url, $force_cache_miss = false) |
|
178 | 178 | { |
179 | 179 | static $results = array(); |
180 | 180 | |
181 | - if ( ! isset( $results[ $cdn_url ] ) || $force_cache_miss ) { |
|
181 | + if (!isset($results[$cdn_url]) || $force_cache_miss) { |
|
182 | 182 | |
183 | 183 | // In order to return unmodified input when there's no need to tweak. |
184 | - $results[ $cdn_url ] = $cdn_url; |
|
184 | + $results[$cdn_url] = $cdn_url; |
|
185 | 185 | |
186 | 186 | // Behind a default true filter for backcompat, and only for sites |
187 | 187 | // in a subfolder/subdirectory, but still easily turned off if |
188 | 188 | // not wanted/needed... |
189 | - if ( autoptimizeUtils::siteurl_not_root() ) { |
|
190 | - $check = apply_filters( 'autoptimize_filter_cdn_magic_path_check', true, $cdn_url ); |
|
191 | - if ( $check ) { |
|
189 | + if (autoptimizeUtils::siteurl_not_root()) { |
|
190 | + $check = apply_filters('autoptimize_filter_cdn_magic_path_check', true, $cdn_url); |
|
191 | + if ($check) { |
|
192 | 192 | $site_url_parts = autoptimizeUtils::get_ao_wp_site_url_parts(); |
193 | - $cdn_url_parts = \parse_url( $cdn_url ); |
|
194 | - $schemeless = self::is_protocol_relative( $cdn_url ); |
|
195 | - $cdn_url_parts = self::maybe_replace_cdn_path( $site_url_parts, $cdn_url_parts ); |
|
196 | - if ( false !== $cdn_url_parts ) { |
|
197 | - $results[ $cdn_url ] = self::assemble_parsed_url( $cdn_url_parts, $schemeless ); |
|
193 | + $cdn_url_parts = \parse_url($cdn_url); |
|
194 | + $schemeless = self::is_protocol_relative($cdn_url); |
|
195 | + $cdn_url_parts = self::maybe_replace_cdn_path($site_url_parts, $cdn_url_parts); |
|
196 | + if (false !== $cdn_url_parts) { |
|
197 | + $results[$cdn_url] = self::assemble_parsed_url($cdn_url_parts, $schemeless); |
|
198 | 198 | } |
199 | 199 | } |
200 | 200 | } |
201 | 201 | } |
202 | 202 | |
203 | - return $results[ $cdn_url ]; |
|
203 | + return $results[$cdn_url]; |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -214,10 +214,10 @@ discard block |
||
214 | 214 | * |
215 | 215 | * @return array|false |
216 | 216 | */ |
217 | - public static function maybe_replace_cdn_path( array $site_url_parts, array $cdn_url_parts ) |
|
217 | + public static function maybe_replace_cdn_path(array $site_url_parts, array $cdn_url_parts) |
|
218 | 218 | { |
219 | - if ( isset( $site_url_parts['path'] ) && '/' !== $site_url_parts['path'] ) { |
|
220 | - if ( ! isset( $cdn_url_parts['path'] ) || '/' === $cdn_url_parts['path'] ) { |
|
219 | + if (isset($site_url_parts['path']) && '/' !== $site_url_parts['path']) { |
|
220 | + if (!isset($cdn_url_parts['path']) || '/' === $cdn_url_parts['path']) { |
|
221 | 221 | $cdn_url_parts['path'] = $site_url_parts['path']; |
222 | 222 | return $cdn_url_parts; |
223 | 223 | } |
@@ -237,20 +237,20 @@ discard block |
||
237 | 237 | * |
238 | 238 | * @return string |
239 | 239 | */ |
240 | - public static function assemble_parsed_url( array $parsed_url, $schemeless = false ) |
|
240 | + public static function assemble_parsed_url(array $parsed_url, $schemeless = false) |
|
241 | 241 | { |
242 | - $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : ''; |
|
243 | - if ( $schemeless ) { |
|
242 | + $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : ''; |
|
243 | + if ($schemeless) { |
|
244 | 244 | $scheme = '//'; |
245 | 245 | } |
246 | - $host = isset( $parsed_url['host'] ) ? $parsed_url['host'] : ''; |
|
247 | - $port = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : ''; |
|
248 | - $user = isset( $parsed_url['user'] ) ? $parsed_url['user'] : ''; |
|
249 | - $pass = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : ''; |
|
250 | - $pass = ( $user || $pass ) ? "$pass@" : ''; |
|
251 | - $path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : ''; |
|
252 | - $query = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : ''; |
|
253 | - $fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : ''; |
|
246 | + $host = isset($parsed_url['host']) ? $parsed_url['host'] : ''; |
|
247 | + $port = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : ''; |
|
248 | + $user = isset($parsed_url['user']) ? $parsed_url['user'] : ''; |
|
249 | + $pass = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : ''; |
|
250 | + $pass = ($user || $pass) ? "$pass@" : ''; |
|
251 | + $path = isset($parsed_url['path']) ? $parsed_url['path'] : ''; |
|
252 | + $query = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : ''; |
|
253 | + $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : ''; |
|
254 | 254 | |
255 | 255 | return "$scheme$user$pass$host$port$path$query$fragment"; |
256 | 256 | } |
@@ -262,12 +262,12 @@ discard block |
||
262 | 262 | * |
263 | 263 | * @return bool |
264 | 264 | */ |
265 | - public static function is_protocol_relative( $url ) |
|
265 | + public static function is_protocol_relative($url) |
|
266 | 266 | { |
267 | 267 | $result = false; |
268 | 268 | |
269 | - if ( ! empty( $url ) ) { |
|
270 | - $result = ( 0 === strpos( $url, '//' ) ); |
|
269 | + if (!empty($url)) { |
|
270 | + $result = (0 === strpos($url, '//')); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | return $result; |
@@ -280,9 +280,9 @@ discard block |
||
280 | 280 | * |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - public static function path_canonicalize( $path ) |
|
283 | + public static function path_canonicalize($path) |
|
284 | 284 | { |
285 | - $patterns = array( |
|
285 | + $patterns = array( |
|
286 | 286 | '~/{2,}~', |
287 | 287 | '~/(\./)+~', |
288 | 288 | '~([^/\.]+/(?R)*\.{2,}/)~', |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | '', |
296 | 296 | ); |
297 | 297 | |
298 | - return preg_replace( $patterns, $replacements, $path ); |
|
298 | + return preg_replace($patterns, $replacements, $path); |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
@@ -307,15 +307,15 @@ discard block |
||
307 | 307 | * |
308 | 308 | * @return null|array Service status or null. |
309 | 309 | */ |
310 | - public static function check_service_availability( $return_result = false ) |
|
310 | + public static function check_service_availability($return_result = false) |
|
311 | 311 | { |
312 | - $service_availability_resp = wp_remote_get( 'https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver=' . AUTOPTIMIZE_PLUGIN_VERSION ); |
|
313 | - if ( ! is_wp_error( $service_availability_resp ) ) { |
|
314 | - if ( '200' == wp_remote_retrieve_response_code( $service_availability_resp ) ) { |
|
315 | - $availabilities = json_decode( wp_remote_retrieve_body( $service_availability_resp ), true ); |
|
316 | - if ( is_array( $availabilities ) ) { |
|
317 | - autoptimizeOptionWrapper::update_option( 'autoptimize_service_availablity', $availabilities ); |
|
318 | - if ( $return_result ) { |
|
312 | + $service_availability_resp = wp_remote_get('https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver='.AUTOPTIMIZE_PLUGIN_VERSION); |
|
313 | + if (!is_wp_error($service_availability_resp)) { |
|
314 | + if ('200' == wp_remote_retrieve_response_code($service_availability_resp)) { |
|
315 | + $availabilities = json_decode(wp_remote_retrieve_body($service_availability_resp), true); |
|
316 | + if (is_array($availabilities)) { |
|
317 | + autoptimizeOptionWrapper::update_option('autoptimize_service_availablity', $availabilities); |
|
318 | + if ($return_result) { |
|
319 | 319 | return $availabilities; |
320 | 320 | } |
321 | 321 | } |
@@ -331,10 +331,10 @@ discard block |
||
331 | 331 | * |
332 | 332 | * @return bool |
333 | 333 | */ |
334 | - public static function str_is_valid_regex( $string ) |
|
334 | + public static function str_is_valid_regex($string) |
|
335 | 335 | { |
336 | - set_error_handler( function() {}, E_WARNING ); |
|
337 | - $is_regex = ( false !== preg_match( $string, '' ) ); |
|
336 | + set_error_handler(function() {}, E_WARNING); |
|
337 | + $is_regex = (false !== preg_match($string, '')); |
|
338 | 338 | restore_error_handler(); |
339 | 339 | |
340 | 340 | return $is_regex; |
@@ -347,17 +347,17 @@ discard block |
||
347 | 347 | * |
348 | 348 | * @return bool |
349 | 349 | */ |
350 | - public static function is_plugin_active( $plugin_file ) |
|
350 | + public static function is_plugin_active($plugin_file) |
|
351 | 351 | { |
352 | 352 | static $ipa_exists = null; |
353 | - if ( null === $ipa_exists ) { |
|
354 | - if ( ! function_exists( '\is_plugin_active' ) ) { |
|
355 | - require_once ABSPATH . 'wp-admin/includes/plugin.php'; |
|
353 | + if (null === $ipa_exists) { |
|
354 | + if (!function_exists('\is_plugin_active')) { |
|
355 | + require_once ABSPATH.'wp-admin/includes/plugin.php'; |
|
356 | 356 | } |
357 | - $ipa_exists = function_exists( '\is_plugin_active' ); |
|
357 | + $ipa_exists = function_exists('\is_plugin_active'); |
|
358 | 358 | } |
359 | 359 | |
360 | - return $ipa_exists && \is_plugin_active( $plugin_file ); |
|
360 | + return $ipa_exists && \is_plugin_active($plugin_file); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
@@ -367,11 +367,11 @@ discard block |
||
367 | 367 | * |
368 | 368 | * @return string |
369 | 369 | */ |
370 | - public static function remove_id_from_node( $node ) { |
|
371 | - if ( strpos( $node, 'id=' ) === false || apply_filters( 'autoptimize_filter_utils_keep_ids', false ) ) { |
|
370 | + public static function remove_id_from_node($node) { |
|
371 | + if (strpos($node, 'id=') === false || apply_filters('autoptimize_filter_utils_keep_ids', false)) { |
|
372 | 372 | return $node; |
373 | 373 | } else { |
374 | - return preg_replace( '#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node ); |
|
374 | + return preg_replace('#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node); |
|
375 | 375 | } |
376 | 376 | } |
377 | 377 | |
@@ -383,15 +383,15 @@ discard block |
||
383 | 383 | * |
384 | 384 | * @return bool |
385 | 385 | */ |
386 | - public static function str_ends_in( $str, $test ) |
|
386 | + public static function str_ends_in($str, $test) |
|
387 | 387 | { |
388 | 388 | // @codingStandardsIgnoreStart |
389 | 389 | // substr_compare() is bugged on 5.5.11: https://3v4l.org/qGYBH |
390 | 390 | // return ( 0 === substr_compare( $str, $test, -strlen( $test ) ) ); |
391 | 391 | // @codingStandardsIgnoreEnd |
392 | 392 | |
393 | - $length = strlen( $test ); |
|
393 | + $length = strlen($test); |
|
394 | 394 | |
395 | - return ( substr( $str, -$length, $length ) === $test ); |
|
395 | + return (substr($str, -$length, $length) === $test); |
|
396 | 396 | } |
397 | 397 | } |
@@ -128,6 +128,9 @@ |
||
128 | 128 | parent::tearDown(); |
129 | 129 | } |
130 | 130 | |
131 | + /** |
|
132 | + * @return string |
|
133 | + */ |
|
131 | 134 | protected function get_test_markup() |
132 | 135 | { |
133 | 136 | $siteurl = $this->get_urls()['siteurl']; |
@@ -10,17 +10,17 @@ discard block |
||
10 | 10 | protected $ao; |
11 | 11 | |
12 | 12 | protected static $flexible_url_parts_js = [ |
13 | - 'default' => 'wp-content/cache/autoptimize/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
14 | - 'custom' => 'wp-content/c/ao/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
15 | - 'multisite' => 'wp-content/cache/autoptimize/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
16 | - 'multisite_custom' => 'wp-content/c/ao/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
13 | + 'default' => 'wp-content/cache/autoptimize/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
14 | + 'custom' => 'wp-content/c/ao/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
15 | + 'multisite' => 'wp-content/cache/autoptimize/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
16 | + 'multisite_custom' => 'wp-content/c/ao/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
17 | 17 | ]; |
18 | 18 | |
19 | 19 | protected static $flexible_url_parts_css = [ |
20 | - 'default' => 'wp-content/cache/autoptimize/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
21 | - 'custom' => 'wp-content/c/ao/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
22 | - 'multisite' => 'wp-content/cache/autoptimize/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
23 | - 'multisite_custom' => 'wp-content/c/ao/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
20 | + 'default' => 'wp-content/cache/autoptimize/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
21 | + 'custom' => 'wp-content/c/ao/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
22 | + 'multisite' => 'wp-content/cache/autoptimize/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
23 | + 'multisite_custom' => 'wp-content/c/ao/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX, |
|
24 | 24 | ]; |
25 | 25 | |
26 | 26 | protected function getAoStylesDefaultOptions() |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | $conf = autoptimizeConfig::instance(); |
29 | 29 | |
30 | 30 | return [ |
31 | - 'aggregate' => $conf->get( 'autoptimize_css_aggregate' ), |
|
32 | - 'justhead' => $conf->get( 'autoptimize_css_justhead' ), |
|
33 | - 'datauris' => $conf->get( 'autoptimize_css_datauris' ), |
|
34 | - 'defer' => $conf->get( 'autoptimize_css_defer' ), |
|
35 | - 'defer_inline' => $conf->get( 'autoptimize_css_defer_inline' ), |
|
36 | - 'inline' => $conf->get( 'autoptimize_css_inline' ), |
|
37 | - 'css_exclude' => $conf->get( 'autoptimize_css_exclude' ), |
|
38 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
39 | - 'include_inline' => $conf->get( 'autoptimize_css_include_inline' ), |
|
40 | - 'nogooglefont' => $conf->get( 'autoptimize_css_nogooglefont' ), |
|
41 | - 'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ), |
|
31 | + 'aggregate' => $conf->get('autoptimize_css_aggregate'), |
|
32 | + 'justhead' => $conf->get('autoptimize_css_justhead'), |
|
33 | + 'datauris' => $conf->get('autoptimize_css_datauris'), |
|
34 | + 'defer' => $conf->get('autoptimize_css_defer'), |
|
35 | + 'defer_inline' => $conf->get('autoptimize_css_defer_inline'), |
|
36 | + 'inline' => $conf->get('autoptimize_css_inline'), |
|
37 | + 'css_exclude' => $conf->get('autoptimize_css_exclude'), |
|
38 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
39 | + 'include_inline' => $conf->get('autoptimize_css_include_inline'), |
|
40 | + 'nogooglefont' => $conf->get('autoptimize_css_nogooglefont'), |
|
41 | + 'minify_excluded' => $conf->get('autoptimize_minify_excluded'), |
|
42 | 42 | ]; |
43 | 43 | } |
44 | 44 | |
@@ -47,15 +47,15 @@ discard block |
||
47 | 47 | $conf = autoptimizeConfig::instance(); |
48 | 48 | |
49 | 49 | return [ |
50 | - 'aggregate' => $conf->get( 'autoptimize_js_aggregate' ), |
|
51 | - 'defer_not_aggregate' => $conf->get( 'autoptimize_js_defer_not_aggregate' ), |
|
52 | - 'justhead' => $conf->get( 'autoptimize_js_justhead' ), |
|
53 | - 'forcehead' => $conf->get( 'autoptimize_js_forcehead' ), |
|
54 | - 'trycatch' => $conf->get( 'autoptimize_js_trycatch' ), |
|
55 | - 'js_exclude' => $conf->get( 'autoptimize_js_exclude' ), |
|
56 | - 'cdn_url' => $conf->get( 'autoptimize_cdn_url' ), |
|
57 | - 'include_inline' => $conf->get( 'autoptimize_js_include_inline' ), |
|
58 | - 'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ), |
|
50 | + 'aggregate' => $conf->get('autoptimize_js_aggregate'), |
|
51 | + 'defer_not_aggregate' => $conf->get('autoptimize_js_defer_not_aggregate'), |
|
52 | + 'justhead' => $conf->get('autoptimize_js_justhead'), |
|
53 | + 'forcehead' => $conf->get('autoptimize_js_forcehead'), |
|
54 | + 'trycatch' => $conf->get('autoptimize_js_trycatch'), |
|
55 | + 'js_exclude' => $conf->get('autoptimize_js_exclude'), |
|
56 | + 'cdn_url' => $conf->get('autoptimize_cdn_url'), |
|
57 | + 'include_inline' => $conf->get('autoptimize_js_include_inline'), |
|
58 | + 'minify_excluded' => $conf->get('autoptimize_minify_excluded'), |
|
59 | 59 | ]; |
60 | 60 | } |
61 | 61 | |
@@ -65,35 +65,35 @@ discard block |
||
65 | 65 | protected function get_urls() |
66 | 66 | { |
67 | 67 | static $site_url = null; |
68 | - if ( null === $site_url ) { |
|
68 | + if (null === $site_url) { |
|
69 | 69 | $site_url = site_url(); |
70 | 70 | } |
71 | 71 | |
72 | 72 | static $cdn_url = null; |
73 | - if ( null === $cdn_url ) { |
|
74 | - $cdn_url = autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url' ); |
|
73 | + if (null === $cdn_url) { |
|
74 | + $cdn_url = autoptimizeOptionWrapper::get_option('autoptimize_cdn_url'); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | static $imgopt_host = null; |
78 | - if ( null === $imgopt_host ) { |
|
78 | + if (null === $imgopt_host) { |
|
79 | 79 | $optimizer = new autoptimizeImages(); |
80 | - $imgopt_host = rtrim( $optimizer->get_imgopt_host(), '/' ); |
|
80 | + $imgopt_host = rtrim($optimizer->get_imgopt_host(), '/'); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | static $urls = []; |
84 | 84 | |
85 | - if ( empty( $urls ) ) { |
|
85 | + if (empty($urls)) { |
|
86 | 86 | $parts = autoptimizeUtils::get_ao_wp_site_url_parts(); |
87 | 87 | $urls = [ |
88 | 88 | 'siteurl' => $site_url, |
89 | - 'prsiteurl' => '//' . str_replace( array( 'http://', 'https://' ), '', $site_url ), |
|
90 | - 'wwwsiteurl' => $parts['scheme'] . '://www.' . str_replace( 'www.', '', $parts['host'] ), |
|
89 | + 'prsiteurl' => '//'.str_replace(array('http://', 'https://'), '', $site_url), |
|
90 | + 'wwwsiteurl' => $parts['scheme'].'://www.'.str_replace('www.', '', $parts['host']), |
|
91 | 91 | 'cdnurl' => $cdn_url, |
92 | 92 | 'imgopthost' => $imgopt_host, |
93 | 93 | 'subfolder' => '', |
94 | 94 | ]; |
95 | 95 | |
96 | - if ( AO_TEST_SUBFOLDER_INSTALL ) { |
|
96 | + if (AO_TEST_SUBFOLDER_INSTALL) { |
|
97 | 97 | $urls['subfolder'] = 'wordpress/'; |
98 | 98 | } |
99 | 99 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function setUp() |
108 | 108 | { |
109 | - $this->ao = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE ); |
|
109 | + $this->ao = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE); |
|
110 | 110 | |
111 | 111 | parent::setUp(); |
112 | 112 | } |
@@ -125,8 +125,8 @@ discard block |
||
125 | 125 | 'autoptimize_filter_css_inlinesize', |
126 | 126 | 'autoptimize_filter_css_fonts_cdn', |
127 | 127 | ); |
128 | - foreach ( $filter_tags as $filter_tag ) { |
|
129 | - remove_all_filters( $filter_tag ); |
|
128 | + foreach ($filter_tags as $filter_tag) { |
|
129 | + remove_all_filters($filter_tag); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | parent::tearDown(); |
@@ -252,20 +252,20 @@ discard block |
||
252 | 252 | protected function get_test_markup_output() |
253 | 253 | { |
254 | 254 | $key = 'default'; |
255 | - if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) { |
|
255 | + if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) { |
|
256 | 256 | $key = 'custom'; |
257 | 257 | } |
258 | 258 | |
259 | - $csspart = self::$flexible_url_parts_css[ $key ]; |
|
260 | - $jspart = self::$flexible_url_parts_js[ $key ]; |
|
259 | + $csspart = self::$flexible_url_parts_css[$key]; |
|
260 | + $jspart = self::$flexible_url_parts_js[$key]; |
|
261 | 261 | |
262 | 262 | $csshash = '863f587e89f100b0223ddccc0dabc57a'; |
263 | - if ( AO_TEST_SUBFOLDER_INSTALL ) { |
|
263 | + if (AO_TEST_SUBFOLDER_INSTALL) { |
|
264 | 264 | $csshash = '56398de576d59887e88e3011715250e0'; |
265 | 265 | } |
266 | 266 | |
267 | 267 | $urls = $this->get_urls(); |
268 | - $siteurl = $urls['siteurl']; |
|
268 | + $siteurl = $urls['siteurl']; |
|
269 | 269 | $cdnurl = $urls['cdnurl']; |
270 | 270 | $subfolder = $urls['subfolder']; |
271 | 271 | |
@@ -321,15 +321,15 @@ discard block |
||
321 | 321 | protected function get_test_markup_output_ms() |
322 | 322 | { |
323 | 323 | $key = 'multisite'; |
324 | - if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) { |
|
324 | + if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) { |
|
325 | 325 | $key = 'multisite_custom'; |
326 | 326 | } |
327 | 327 | |
328 | - $csspart = self::$flexible_url_parts_css[ $key ]; |
|
329 | - $jspart = self::$flexible_url_parts_js[ $key ]; |
|
328 | + $csspart = self::$flexible_url_parts_css[$key]; |
|
329 | + $jspart = self::$flexible_url_parts_js[$key]; |
|
330 | 330 | |
331 | 331 | $csshash = '863f587e89f100b0223ddccc0dabc57a'; |
332 | - if ( AO_TEST_SUBFOLDER_INSTALL ) { |
|
332 | + if (AO_TEST_SUBFOLDER_INSTALL) { |
|
333 | 333 | $csshash = '56398de576d59887e88e3011715250e0'; |
334 | 334 | } |
335 | 335 | |
@@ -390,15 +390,15 @@ discard block |
||
390 | 390 | protected function get_test_markup_output_inline_defer() |
391 | 391 | { |
392 | 392 | $key = 'default'; |
393 | - if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) { |
|
393 | + if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) { |
|
394 | 394 | $key = 'custom'; |
395 | 395 | } |
396 | 396 | |
397 | - $csspart = self::$flexible_url_parts_css[ $key ]; |
|
398 | - $jspart = self::$flexible_url_parts_js[ $key ]; |
|
397 | + $csspart = self::$flexible_url_parts_css[$key]; |
|
398 | + $jspart = self::$flexible_url_parts_js[$key]; |
|
399 | 399 | |
400 | 400 | $csshash = '863f587e89f100b0223ddccc0dabc57a'; |
401 | - if ( AO_TEST_SUBFOLDER_INSTALL ) { |
|
401 | + if (AO_TEST_SUBFOLDER_INSTALL) { |
|
402 | 402 | $csshash = '56398de576d59887e88e3011715250e0'; |
403 | 403 | } |
404 | 404 | |
@@ -459,15 +459,15 @@ discard block |
||
459 | 459 | protected function get_test_markup_output_inline_defer_ms() |
460 | 460 | { |
461 | 461 | $key = 'multisite'; |
462 | - if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) { |
|
462 | + if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) { |
|
463 | 463 | $key = 'multisite_custom'; |
464 | 464 | } |
465 | 465 | |
466 | - $csspart = self::$flexible_url_parts_css[ $key ]; |
|
467 | - $jspart = self::$flexible_url_parts_js[ $key ]; |
|
466 | + $csspart = self::$flexible_url_parts_css[$key]; |
|
467 | + $jspart = self::$flexible_url_parts_js[$key]; |
|
468 | 468 | |
469 | 469 | $csshash = '863f587e89f100b0223ddccc0dabc57a'; |
470 | - if ( AO_TEST_SUBFOLDER_INSTALL ) { |
|
470 | + if (AO_TEST_SUBFOLDER_INSTALL) { |
|
471 | 471 | $csshash = '56398de576d59887e88e3011715250e0'; |
472 | 472 | } |
473 | 473 | |
@@ -528,11 +528,11 @@ discard block |
||
528 | 528 | /** |
529 | 529 | * @dataProvider provider_test_rewrite_markup_with_cdn |
530 | 530 | */ |
531 | - function test_rewrite_markup_with_cdn( $input, $expected ) |
|
531 | + function test_rewrite_markup_with_cdn($input, $expected) |
|
532 | 532 | { |
533 | - $actual = $this->ao->end_buffering( $input ); |
|
533 | + $actual = $this->ao->end_buffering($input); |
|
534 | 534 | |
535 | - $this->assertEquals( $expected, $actual ); |
|
535 | + $this->assertEquals($expected, $actual); |
|
536 | 536 | } |
537 | 537 | |
538 | 538 | public function provider_test_rewrite_markup_with_cdn() |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | $this->get_test_markup(), |
545 | 545 | // Expected output. |
546 | 546 | // TODO/FIXME: This seemed like the fastest way to get MS crude test to pass... |
547 | - ( is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output() ), |
|
547 | + (is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output()), |
|
548 | 548 | ), |
549 | 549 | |
550 | 550 | ); |
@@ -604,12 +604,12 @@ discard block |
||
604 | 604 | } |
605 | 605 | CSS; |
606 | 606 | |
607 | - $instance = new autoptimizeStyles( $css_in ); |
|
608 | - $instance->setOption( 'cdn_url', $cdnurl ); |
|
607 | + $instance = new autoptimizeStyles($css_in); |
|
608 | + $instance->setOption('cdn_url', $cdnurl); |
|
609 | 609 | |
610 | - $css_actual = $instance->rewrite_assets( $css_in ); |
|
610 | + $css_actual = $instance->rewrite_assets($css_in); |
|
611 | 611 | |
612 | - $this->assertEquals( $css_expected, $css_actual ); |
|
612 | + $this->assertEquals($css_expected, $css_actual); |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | public function test_default_cssmin_minifier() |
@@ -643,21 +643,21 @@ discard block |
||
643 | 643 | .bg{background:url('img/something.svg')}.bg-no-quote{background:url(img/something.svg)}.bg-double-quotes{background:url("img/something.svg")}.whitespaces{background:url ("../../somewhere-else/svg.svg")}.host-relative{background:url("/img/something.svg")}.protocol-relative{background:url("//something/somewhere/example.png")}@font-face{font-family:'Roboto';font-style:normal;font-weight:100;src:url(../fonts/roboto-v15-latin-ext_latin-100.eot);src:local('Roboto Thin'),local('Roboto-Thin'),url(../fonts/roboto-v15-latin-ext_latin-100.eot?#iefix) format('embedded-opentype'),url(../fonts/roboto-v15-latin-ext_latin-100.woff2) format('woff2'),url(../fonts/roboto-v15-latin-ext_latin-100.woff) format('woff'),url(../fonts/roboto-v15-latin-ext_latin-100.ttf) format('truetype'),url(../fonts/roboto-v15-latin-ext_latin-100.svg#Roboto) format('svg')} |
644 | 644 | CSS; |
645 | 645 | |
646 | - $instance = new autoptimizeStyles( $css ); |
|
647 | - $minified = $instance->run_minifier_on( $css ); |
|
646 | + $instance = new autoptimizeStyles($css); |
|
647 | + $minified = $instance->run_minifier_on($css); |
|
648 | 648 | |
649 | - $this->assertEquals( $expected, $minified ); |
|
649 | + $this->assertEquals($expected, $minified); |
|
650 | 650 | } |
651 | 651 | |
652 | 652 | /** |
653 | 653 | * @dataProvider provider_test_should_aggregate_script_types |
654 | 654 | */ |
655 | - public function test_should_aggregate_script_types( $input, $expected ) |
|
655 | + public function test_should_aggregate_script_types($input, $expected) |
|
656 | 656 | { |
657 | - $instance = new autoptimizeScripts( '' ); |
|
658 | - $actual = $instance->should_aggregate( $input ); |
|
657 | + $instance = new autoptimizeScripts(''); |
|
658 | + $actual = $instance->should_aggregate($input); |
|
659 | 659 | |
660 | - $this->assertEquals( $expected, $actual ); |
|
660 | + $this->assertEquals($expected, $actual); |
|
661 | 661 | } |
662 | 662 | |
663 | 663 | public function provider_test_should_aggregate_script_types() |
@@ -719,11 +719,11 @@ discard block |
||
719 | 719 | /** |
720 | 720 | * @dataProvider provider_is_valid_buffer |
721 | 721 | */ |
722 | - public function test_valid_buffers( $input, $expected ) |
|
722 | + public function test_valid_buffers($input, $expected) |
|
723 | 723 | { |
724 | - $actual = $this->ao->is_valid_buffer( $input ); |
|
724 | + $actual = $this->ao->is_valid_buffer($input); |
|
725 | 725 | |
726 | - $this->assertEquals( $expected, $actual ); |
|
726 | + $this->assertEquals($expected, $actual); |
|
727 | 727 | } |
728 | 728 | |
729 | 729 | public function provider_is_valid_buffer() |
@@ -792,11 +792,11 @@ discard block |
||
792 | 792 | /** |
793 | 793 | * @dataProvider provider_is_amp_markup |
794 | 794 | */ |
795 | - public function test_autoptimize_is_amp_markup( $input, $expected ) |
|
795 | + public function test_autoptimize_is_amp_markup($input, $expected) |
|
796 | 796 | { |
797 | - $actual = autoptimizeMain::is_amp_markup( $input ); |
|
797 | + $actual = autoptimizeMain::is_amp_markup($input); |
|
798 | 798 | |
799 | - $this->assertEquals( $expected, $actual ); |
|
799 | + $this->assertEquals($expected, $actual); |
|
800 | 800 | } |
801 | 801 | |
802 | 802 | public function provider_is_amp_markup() |
@@ -827,31 +827,31 @@ discard block |
||
827 | 827 | public function test_skips_buffering_when_ao_noptimize_filter_is_true() |
828 | 828 | { |
829 | 829 | // True => disable autoptimize. |
830 | - add_filter( 'autoptimize_filter_noptimize', '__return_true' ); |
|
830 | + add_filter('autoptimize_filter_noptimize', '__return_true'); |
|
831 | 831 | |
832 | 832 | // Buffering should not run due to the above filter. |
833 | 833 | $expected = false; |
834 | - $actual = $this->ao->should_buffer( $doing_tests = true ); |
|
834 | + $actual = $this->ao->should_buffer($doing_tests = true); |
|
835 | 835 | |
836 | - $this->assertEquals( $expected, $actual ); |
|
836 | + $this->assertEquals($expected, $actual); |
|
837 | 837 | } |
838 | 838 | |
839 | 839 | public function test_does_buffering_when_ao_noptimize_filter_is_false() |
840 | 840 | { |
841 | 841 | // False => disable noptimize, aka, run normally (weird, yes...). |
842 | - add_filter( 'autoptimize_filter_noptimize', '__return_false' ); |
|
842 | + add_filter('autoptimize_filter_noptimize', '__return_false'); |
|
843 | 843 | |
844 | 844 | // Buffering should run because of above. |
845 | 845 | $expected = true; |
846 | - $actual = $this->ao->should_buffer( $doing_tests = true ); |
|
846 | + $actual = $this->ao->should_buffer($doing_tests = true); |
|
847 | 847 | |
848 | - $this->assertEquals( $expected, $actual ); |
|
848 | + $this->assertEquals($expected, $actual); |
|
849 | 849 | } |
850 | 850 | |
851 | 851 | public function test_ignores_ao_noptimize_qs_when_instructed() |
852 | 852 | { |
853 | 853 | // Should skip checking for the qs completely due to filter. |
854 | - add_filter( 'autoptimize_filter_honor_qs_noptimize', '__return_false' ); |
|
854 | + add_filter('autoptimize_filter_honor_qs_noptimize', '__return_false'); |
|
855 | 855 | |
856 | 856 | /** |
857 | 857 | * The above should then result in the "current" value being `false` |
@@ -862,23 +862,23 @@ discard block |
||
862 | 862 | */ |
863 | 863 | |
864 | 864 | $that = $this; // Makes it work on php 5.3! |
865 | - add_filter( 'autoptimize_filter_noptimize', function ( $current_value ) use ( $that ) { |
|
865 | + add_filter('autoptimize_filter_noptimize', function($current_value) use ($that) { |
|
866 | 866 | $expected = false; |
867 | - if ( defined( 'DONOTMINIFY' ) && DONOTMINIFY ) { |
|
867 | + if (defined('DONOTMINIFY') && DONOTMINIFY) { |
|
868 | 868 | $expected = true; |
869 | 869 | } |
870 | 870 | |
871 | - $that->assertEquals( $expected, $current_value ); |
|
871 | + $that->assertEquals($expected, $current_value); |
|
872 | 872 | }); |
873 | 873 | |
874 | - $this->ao->should_buffer( $doing_tests = true ); |
|
874 | + $this->ao->should_buffer($doing_tests = true); |
|
875 | 875 | } |
876 | 876 | |
877 | 877 | public function test_wpengine_cache_flush() |
878 | 878 | { |
879 | 879 | // Creating a mock so that we can get past class_exists() and method_exists() checks present |
880 | 880 | // in `autoptimizeCache::flushPageCache()`... |
881 | - $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload() |
|
881 | + $stub = $this->getMockBuilder('WpeCommon')->disableAutoload() |
|
882 | 882 | ->disableOriginalConstructor()->setMethods( |
883 | 883 | array( |
884 | 884 | 'purge_varnish_cache', |
@@ -887,9 +887,9 @@ discard block |
||
887 | 887 | ->getMock(); |
888 | 888 | |
889 | 889 | $that = $this; |
890 | - add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) { |
|
891 | - $expected_methods = array( 'purge_varnish_cache' ); |
|
892 | - $that->assertEquals( $methods, $expected_methods ); |
|
890 | + add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) { |
|
891 | + $expected_methods = array('purge_varnish_cache'); |
|
892 | + $that->assertEquals($methods, $expected_methods); |
|
893 | 893 | |
894 | 894 | return $methods; |
895 | 895 | }); |
@@ -903,7 +903,7 @@ discard block |
||
903 | 903 | public function test_wpengine_cache_flush_agressive() |
904 | 904 | { |
905 | 905 | // Creating a mock so that we can get past class_exists() and method_exists() checks `autoptimize_flush_pagecache()`... |
906 | - $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload() |
|
906 | + $stub = $this->getMockBuilder('WpeCommon')->disableAutoload() |
|
907 | 907 | ->disableOriginalConstructor()->setMethods( |
908 | 908 | array( |
909 | 909 | 'purge_varnish_cache', |
@@ -913,19 +913,19 @@ discard block |
||
913 | 913 | ) |
914 | 914 | ->getMock(); |
915 | 915 | |
916 | - add_filter( 'autoptimize_flush_wpengine_aggressive', function() { |
|
916 | + add_filter('autoptimize_flush_wpengine_aggressive', function() { |
|
917 | 917 | return true; |
918 | 918 | }); |
919 | 919 | |
920 | 920 | $that = $this; |
921 | - add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) { |
|
921 | + add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) { |
|
922 | 922 | $expected_methods = array( |
923 | 923 | 'purge_varnish_cache', |
924 | 924 | 'purge_memcached', |
925 | 925 | 'clear_maxcdn_cache', |
926 | 926 | ); |
927 | 927 | |
928 | - $that->assertEquals( $methods, $expected_methods ); |
|
928 | + $that->assertEquals($methods, $expected_methods); |
|
929 | 929 | |
930 | 930 | return $methods; |
931 | 931 | }); |
@@ -936,15 +936,15 @@ discard block |
||
936 | 936 | /** |
937 | 937 | * @dataProvider provider_test_url_replace_cdn |
938 | 938 | */ |
939 | - public function test_url_replace_cdn( $cdn_url, $input, $expected ) |
|
939 | + public function test_url_replace_cdn($cdn_url, $input, $expected) |
|
940 | 940 | { |
941 | - $mock = $this->getMockBuilder( 'autoptimizeBase' ) |
|
941 | + $mock = $this->getMockBuilder('autoptimizeBase') |
|
942 | 942 | ->disableOriginalConstructor() |
943 | 943 | ->getMockForAbstractClass(); |
944 | 944 | |
945 | 945 | $mock->cdn_url = $cdn_url; |
946 | - $actual = $mock->url_replace_cdn( $input ); |
|
947 | - $this->assertEquals( $expected, $actual ); |
|
946 | + $actual = $mock->url_replace_cdn($input); |
|
947 | + $this->assertEquals($expected, $actual); |
|
948 | 948 | } |
949 | 949 | |
950 | 950 | public function provider_test_url_replace_cdn() |
@@ -961,13 +961,13 @@ discard block |
||
961 | 961 | // CDN base url, url, expected result... |
962 | 962 | 'http://cdn-test.example.org', |
963 | 963 | '/a.jpg', |
964 | - 'http://cdn-test.example.org/' . $subfolder . 'a.jpg', |
|
964 | + 'http://cdn-test.example.org/'.$subfolder.'a.jpg', |
|
965 | 965 | ), |
966 | 966 | // Full link with a matching AUTOPTIMIZE_WP_SITE_URL gets properly replaced... |
967 | 967 | array( |
968 | 968 | 'http://cdn-test.example.org', |
969 | - $siteurl . '/wp-content/themes/something/example.svg', |
|
970 | - 'http://cdn-test.example.org/' . $subfolder . 'wp-content/themes/something/example.svg', |
|
969 | + $siteurl.'/wp-content/themes/something/example.svg', |
|
970 | + 'http://cdn-test.example.org/'.$subfolder.'wp-content/themes/something/example.svg', |
|
971 | 971 | ), |
972 | 972 | // Protocol-relative url with a "local" hostname that doesn't match example.org (AUTOPTIMIZE_WP_SITE_URL)... |
973 | 973 | array( |
@@ -978,59 +978,59 @@ discard block |
||
978 | 978 | // www.example.org does not match example.org (AUTOPTIMIZE_WP_SITE_URL) so it's left alone... |
979 | 979 | array( |
980 | 980 | 'http://cdn-test.example.org', |
981 | - $wwwsiteurl . '/wp-content/themes/something/example.svg', |
|
982 | - $wwwsiteurl . '/wp-content/themes/something/example.svg', |
|
981 | + $wwwsiteurl.'/wp-content/themes/something/example.svg', |
|
982 | + $wwwsiteurl.'/wp-content/themes/something/example.svg', |
|
983 | 983 | ), |
984 | 984 | // SSL cdn url + host-relative link... |
985 | 985 | array( |
986 | 986 | 'https://cdn.example.org', |
987 | 987 | '/a.jpg', |
988 | - 'https://cdn.example.org/' . $subfolder . 'a.jpg', |
|
988 | + 'https://cdn.example.org/'.$subfolder.'a.jpg', |
|
989 | 989 | ), |
990 | 990 | // SSL cdn url + http site url that matches AUTOPTIMIZE_WP_SITE_URL is properly replaced... |
991 | 991 | array( |
992 | 992 | 'https://cdn.example.org', |
993 | - $siteurl . '/wp-content/themes/something/example.svg', |
|
994 | - 'https://cdn.example.org/' . $subfolder . 'wp-content/themes/something/example.svg', |
|
993 | + $siteurl.'/wp-content/themes/something/example.svg', |
|
994 | + 'https://cdn.example.org/'.$subfolder.'wp-content/themes/something/example.svg', |
|
995 | 995 | ), |
996 | 996 | // Protocol-relative cdn url given with protocol relative link that matches AUTOPTIMIZE_WP_SITE_URL host... |
997 | 997 | array( |
998 | 998 | '//cdn.example.org', |
999 | - $protorelativesiteurl . '/something.jpg', |
|
1000 | - '//cdn.example.org/' . $subfolder . 'something.jpg', |
|
999 | + $protorelativesiteurl.'/something.jpg', |
|
1000 | + '//cdn.example.org/'.$subfolder.'something.jpg', |
|
1001 | 1001 | ), |
1002 | 1002 | // Protocol-relative cdn url given a http link that matches AUTOPTIMIZE_WP_SITE_URL host... |
1003 | 1003 | array( |
1004 | 1004 | '//cdn.example.org', |
1005 | - $siteurl . '/something.png', |
|
1006 | - '//cdn.example.org/' . $subfolder . 'something.png', |
|
1005 | + $siteurl.'/something.png', |
|
1006 | + '//cdn.example.org/'.$subfolder.'something.png', |
|
1007 | 1007 | ), |
1008 | 1008 | // Protocol-relative cdn url with a host-relative link... |
1009 | 1009 | array( |
1010 | 1010 | '//cdn.example.org', |
1011 | 1011 | '/a.jpg', |
1012 | - '//cdn.example.org/' . $subfolder . 'a.jpg', |
|
1012 | + '//cdn.example.org/'.$subfolder.'a.jpg', |
|
1013 | 1013 | ), |
1014 | 1014 | // Testing cdn urls with an explicit port number... |
1015 | 1015 | array( |
1016 | 1016 | 'http://cdn.com:8080', |
1017 | 1017 | '/a.jpg', |
1018 | - 'http://cdn.com:8080/' . $subfolder . 'a.jpg', |
|
1018 | + 'http://cdn.com:8080/'.$subfolder.'a.jpg', |
|
1019 | 1019 | ), |
1020 | 1020 | array( |
1021 | 1021 | '//cdn.com:4433', |
1022 | 1022 | '/a.jpg', |
1023 | - '//cdn.com:4433/' . $subfolder . 'a.jpg', |
|
1023 | + '//cdn.com:4433/'.$subfolder.'a.jpg', |
|
1024 | 1024 | ), |
1025 | 1025 | array( |
1026 | 1026 | '//cdn.com:4433', |
1027 | - $siteurl . '/something.jpg', |
|
1028 | - '//cdn.com:4433/' . $subfolder . 'something.jpg', |
|
1027 | + $siteurl.'/something.jpg', |
|
1028 | + '//cdn.com:4433/'.$subfolder.'something.jpg', |
|
1029 | 1029 | ), |
1030 | 1030 | array( |
1031 | 1031 | '//cdn.com:1234', |
1032 | - $protorelativesiteurl . '/something.jpg', |
|
1033 | - '//cdn.com:1234/' . $subfolder . 'something.jpg', |
|
1032 | + $protorelativesiteurl.'/something.jpg', |
|
1033 | + '//cdn.com:1234/'.$subfolder.'something.jpg', |
|
1034 | 1034 | ), |
1035 | 1035 | // Relative links should not be touched by url_replace_cdn()... |
1036 | 1036 | array( |
@@ -1055,8 +1055,8 @@ discard block |
||
1055 | 1055 | // even though they are really strange... |
1056 | 1056 | array( |
1057 | 1057 | $siteurl, // example.org or http://localhost or http://localhost/wordpress |
1058 | - $siteurl . '/something.jpg', |
|
1059 | - $siteurl . '/something.jpg', |
|
1058 | + $siteurl.'/something.jpg', |
|
1059 | + $siteurl.'/something.jpg', |
|
1060 | 1060 | ), |
1061 | 1061 | // These shouldn't really be changed, or even if replacements do |
1062 | 1062 | // happen, they shouldn't be destructive... |
@@ -1095,31 +1095,31 @@ discard block |
||
1095 | 1095 | $test_link = '/a.jpg'; |
1096 | 1096 | $cdn_url = '//cdn.example.org'; |
1097 | 1097 | |
1098 | - $with_ssl = function( $cdn ) { |
|
1098 | + $with_ssl = function($cdn) { |
|
1099 | 1099 | return ''; |
1100 | 1100 | }; |
1101 | 1101 | $expected_with_ssl = '/a.jpg'; |
1102 | 1102 | |
1103 | - $without_ssl = function( $cdn ) { |
|
1103 | + $without_ssl = function($cdn) { |
|
1104 | 1104 | return $cdn; |
1105 | 1105 | }; |
1106 | - $expected_without_ssl = '//cdn.example.org/' . $sub . 'a.jpg'; |
|
1106 | + $expected_without_ssl = '//cdn.example.org/'.$sub.'a.jpg'; |
|
1107 | 1107 | |
1108 | 1108 | // With a filter that returns something considered "empty", cdn replacement shouldn't occur... |
1109 | - add_filter( 'autoptimize_filter_base_cdnurl', $with_ssl ); |
|
1110 | - $mock = $this->getMockBuilder( 'autoptimizeBase' ) |
|
1109 | + add_filter('autoptimize_filter_base_cdnurl', $with_ssl); |
|
1110 | + $mock = $this->getMockBuilder('autoptimizeBase') |
|
1111 | 1111 | ->disableOriginalConstructor() |
1112 | 1112 | ->getMockForAbstractClass(); |
1113 | 1113 | |
1114 | 1114 | $mock->cdn_url = $cdn_url; |
1115 | - $actual_with_ssl = $mock->url_replace_cdn( $test_link ); |
|
1116 | - $this->assertEquals( $expected_with_ssl, $actual_with_ssl ); |
|
1117 | - remove_filter( 'autoptimize_filter_base_cdnurl', $with_ssl ); |
|
1115 | + $actual_with_ssl = $mock->url_replace_cdn($test_link); |
|
1116 | + $this->assertEquals($expected_with_ssl, $actual_with_ssl); |
|
1117 | + remove_filter('autoptimize_filter_base_cdnurl', $with_ssl); |
|
1118 | 1118 | |
1119 | 1119 | // With a filter that returns an actual cdn url, cdn replacement should occur. |
1120 | - add_filter( 'autoptimize_filter_base_cdnurl', $without_ssl ); |
|
1121 | - $actual_without_ssl = $mock->url_replace_cdn( $test_link ); |
|
1122 | - $this->assertEquals( $expected_without_ssl, $actual_without_ssl ); |
|
1120 | + add_filter('autoptimize_filter_base_cdnurl', $without_ssl); |
|
1121 | + $actual_without_ssl = $mock->url_replace_cdn($test_link); |
|
1122 | + $this->assertEquals($expected_without_ssl, $actual_without_ssl); |
|
1123 | 1123 | } |
1124 | 1124 | |
1125 | 1125 | public function provider_cssmin_issues() |
@@ -1158,11 +1158,11 @@ discard block |
||
1158 | 1158 | /** |
1159 | 1159 | * @dataProvider provider_cssmin_issues |
1160 | 1160 | */ |
1161 | - public function test_cssmin_issues( $input, $expected ) |
|
1161 | + public function test_cssmin_issues($input, $expected) |
|
1162 | 1162 | { |
1163 | - $minifier = new autoptimizeCSSmin( false ); // No need to raise limits for now. |
|
1164 | - $actual = $minifier->run( $input ); |
|
1165 | - $this->assertEquals( $expected, $actual ); |
|
1163 | + $minifier = new autoptimizeCSSmin(false); // No need to raise limits for now. |
|
1164 | + $actual = $minifier->run($input); |
|
1165 | + $this->assertEquals($expected, $actual); |
|
1166 | 1166 | } |
1167 | 1167 | |
1168 | 1168 | public function provider_getpath() |
@@ -1187,12 +1187,12 @@ discard block |
||
1187 | 1187 | // This file comes with core, so should exist... |
1188 | 1188 | array( |
1189 | 1189 | '/wp-includes/js/jquery/jquery.js', |
1190 | - WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.js', |
|
1190 | + WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.js', |
|
1191 | 1191 | ), |
1192 | 1192 | // This file comes with core as of 5.6, so should exist... |
1193 | 1193 | array( |
1194 | 1194 | '/wp-includes/js/jquery/jquery.min.js', |
1195 | - WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.min.js', |
|
1195 | + WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.min.js', |
|
1196 | 1196 | ), |
1197 | 1197 | // Empty $url should return false. |
1198 | 1198 | array( |
@@ -1217,12 +1217,12 @@ discard block |
||
1217 | 1217 | /** |
1218 | 1218 | * @dataProvider provider_getpath |
1219 | 1219 | */ |
1220 | - public function test_getpath( $input, $expected ) |
|
1220 | + public function test_getpath($input, $expected) |
|
1221 | 1221 | { |
1222 | - $mock = $this->getMockBuilder( 'autoptimizeBase' )->disableOriginalConstructor()->getMockForAbstractClass(); |
|
1222 | + $mock = $this->getMockBuilder('autoptimizeBase')->disableOriginalConstructor()->getMockForAbstractClass(); |
|
1223 | 1223 | |
1224 | - $actual = $mock->getpath( $input ); |
|
1225 | - $this->assertEquals( $expected, $actual ); |
|
1224 | + $actual = $mock->getpath($input); |
|
1225 | + $this->assertEquals($expected, $actual); |
|
1226 | 1226 | } |
1227 | 1227 | |
1228 | 1228 | /** |
@@ -1236,7 +1236,7 @@ discard block |
||
1236 | 1236 | |
1237 | 1237 | $protorelativesiteurl = $urls['prsiteurl']; |
1238 | 1238 | |
1239 | - $css_orig = <<<CSS |
|
1239 | + $css_orig = <<<CSS |
|
1240 | 1240 | header{background-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='90px' height='110px' viewBox='0 0 90 110'%3E%3Cstyle%3E.a%7Bstop-color:%23FFF;%7D.b%7Bstop-color:%23B2D235;%7D.c%7Bstop-color:%23BEE7FA;%7D.d%7Bfill:%23590C15;%7D%3C/style%3E%3ClinearGradient id='c' y2='135.4' gradientUnits='userSpaceOnUse' x2='209.1' gradientTransform='rotate(-1.467 -4082.888 7786.794)' y1='205.8' x1='262'%3E%3Cstop class='b' offset='0'/%3E%3Cstop class='b' offset='.48'/%3E%3Cstop stop-color='%23829D25' offset='1'/%3E%3C/linearGradient%3E%3Cpath stroke-width='.3' d='M77.3 45.4c-3-3.5-7.1-6.5-11.6-7.8-5.1-1.5-10-.1-14.9 1.5C52 35.4 54.3 29 60 24l-4.8-5.5c-3.4 3-5.8 6.3-7.5 9.4-1.7-4.3-4.1-8.4-7.5-12C33.4 8.6 24.3 4.7 15.1 4.2c-.2 9.3 3.1 18.6 9.9 25.9 5.2 5.6 11.8 9.2 18.7 10.8-2.5.2-4.9-.1-7.7-.9-5.2-1.4-10.5-2.8-15.8-1C10.6 42.3 4.5 51.9 4 61.7c-.5 11.6 3.8 23.8 9.9 33.5 3.9 6.3 9.6 13.7 17.7 13.4 3.8-.1 7-2.1 10.7-2.7 5.2-.8 9.1 1.2 14.1 1.8 16.4 2 24.4-23.6 26.4-35.9 1.2-9.1.8-19.1-5.5-26.4z' stroke='%233E6D1F' fill='url(%23c)'/%3E%3C/svg%3E")} |
1241 | 1241 | section.clipped.clippedTop {clip-path:url("#clipPolygonTop")} |
1242 | 1242 | section.clipped.clippedBottom {clip-path:url("#clipPolygonBottom")} |
@@ -1249,13 +1249,13 @@ discard block |
||
1249 | 1249 | .myimg {background-image: url($protorelativesiteurl/wp-content/themes/my-theme/images/under-left-leaf.png), url($protorelativesiteurl/wp-content/themes/my-theme/images/over-blue-bird.png), url($protorelativesiteurl/wp-content/themes/my-theme/images/under-top.png), url($protorelativesiteurl/wp-content/themes/my-theme/images/bg-top-grunge.png);} |
1250 | 1250 | CSS; |
1251 | 1251 | |
1252 | - $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig ); |
|
1253 | - $this->assertEquals( $css_expected, $fixurls_result ); |
|
1252 | + $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig); |
|
1253 | + $this->assertEquals($css_expected, $fixurls_result); |
|
1254 | 1254 | } |
1255 | 1255 | |
1256 | 1256 | public function test_background_datauri_sprites_with_fixurls() |
1257 | 1257 | { |
1258 | - $css_orig = <<<CSS |
|
1258 | + $css_orig = <<<CSS |
|
1259 | 1259 | .shadow { background:url(img/1x1.png) top center; } |
1260 | 1260 | .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; } |
1261 | 1261 | .shadow2 {background:url(img/1x1.png) top center} |
@@ -1307,27 +1307,27 @@ discard block |
||
1307 | 1307 | CSS; |
1308 | 1308 | |
1309 | 1309 | // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri. |
1310 | - add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) { |
|
1310 | + add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) { |
|
1311 | 1311 | return true; |
1312 | - }, 10, 2 ); |
|
1312 | + }, 10, 2); |
|
1313 | 1313 | |
1314 | 1314 | // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri. |
1315 | - add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) { |
|
1315 | + add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) { |
|
1316 | 1316 | $head = 'data:image/png;base64,'; |
1317 | 1317 | $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='; |
1318 | 1318 | |
1319 | - $result['full'] = $head . $data; |
|
1319 | + $result['full'] = $head.$data; |
|
1320 | 1320 | $result['base64data'] = $data; |
1321 | 1321 | return $result; |
1322 | - }, 10, 2 ); |
|
1322 | + }, 10, 2); |
|
1323 | 1323 | |
1324 | - $instance = new autoptimizeStyles( $css_orig ); |
|
1325 | - $instance->setOption( 'datauris', true ); |
|
1324 | + $instance = new autoptimizeStyles($css_orig); |
|
1325 | + $instance->setOption('datauris', true); |
|
1326 | 1326 | |
1327 | - $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig ); |
|
1328 | - $css_actual = $instance->rewrite_assets( $fixurls_result ); |
|
1327 | + $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig); |
|
1328 | + $css_actual = $instance->rewrite_assets($fixurls_result); |
|
1329 | 1329 | |
1330 | - $this->assertEquals( $css_expected, $css_actual ); |
|
1330 | + $this->assertEquals($css_expected, $css_actual); |
|
1331 | 1331 | } |
1332 | 1332 | |
1333 | 1333 | /** |
@@ -1347,7 +1347,7 @@ discard block |
||
1347 | 1347 | */ |
1348 | 1348 | public function test_background_datauri_sprites_without_fixurls() |
1349 | 1349 | { |
1350 | - $css_orig = <<<CSS |
|
1350 | + $css_orig = <<<CSS |
|
1351 | 1351 | .shadow { background:url(img/1x1.png) top center; } |
1352 | 1352 | .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; } |
1353 | 1353 | .shadow2 {background:url(img/1x1.png) top center} |
@@ -1391,24 +1391,24 @@ discard block |
||
1391 | 1391 | CSS; |
1392 | 1392 | |
1393 | 1393 | // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri. |
1394 | - add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) { |
|
1394 | + add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) { |
|
1395 | 1395 | return true; |
1396 | - }, 10, 2 ); |
|
1396 | + }, 10, 2); |
|
1397 | 1397 | |
1398 | 1398 | // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri. |
1399 | - add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) { |
|
1399 | + add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) { |
|
1400 | 1400 | $head = 'data:image/png;base64,'; |
1401 | 1401 | $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='; |
1402 | 1402 | |
1403 | - $result['full'] = $head . $data; |
|
1403 | + $result['full'] = $head.$data; |
|
1404 | 1404 | $result['base64data'] = $data; |
1405 | 1405 | return $result; |
1406 | - }, 10, 2 ); |
|
1406 | + }, 10, 2); |
|
1407 | 1407 | |
1408 | - $instance = new autoptimizeStyles( $css_orig ); |
|
1409 | - $instance->setOption( 'datauris', true ); |
|
1410 | - $css_actual = $instance->rewrite_assets( $css_orig ); |
|
1411 | - $this->assertEquals( $css_expected, $css_actual ); |
|
1408 | + $instance = new autoptimizeStyles($css_orig); |
|
1409 | + $instance->setOption('datauris', true); |
|
1410 | + $css_actual = $instance->rewrite_assets($css_orig); |
|
1411 | + $this->assertEquals($css_expected, $css_actual); |
|
1412 | 1412 | } |
1413 | 1413 | |
1414 | 1414 | /** |
@@ -1528,12 +1528,12 @@ discard block |
||
1528 | 1528 | CSS; |
1529 | 1529 | |
1530 | 1530 | // Test with fonts pointed to the CDN + cdn option is set. |
1531 | - add_filter( 'autoptimize_filter_css_fonts_cdn', '__return_true' ); |
|
1532 | - $instance = new autoptimizeStyles( $css_in ); |
|
1533 | - $instance->setOption( 'cdn_url', $cdnurl ); |
|
1534 | - $css_actual_fonts_cdn = $instance->rewrite_assets( $css_in ); |
|
1531 | + add_filter('autoptimize_filter_css_fonts_cdn', '__return_true'); |
|
1532 | + $instance = new autoptimizeStyles($css_in); |
|
1533 | + $instance->setOption('cdn_url', $cdnurl); |
|
1534 | + $css_actual_fonts_cdn = $instance->rewrite_assets($css_in); |
|
1535 | 1535 | |
1536 | - $this->assertEquals( $css_expected_fonts_cdn, $css_actual_fonts_cdn ); |
|
1536 | + $this->assertEquals($css_expected_fonts_cdn, $css_actual_fonts_cdn); |
|
1537 | 1537 | } |
1538 | 1538 | |
1539 | 1539 | /** |
@@ -1649,10 +1649,10 @@ discard block |
||
1649 | 1649 | } |
1650 | 1650 | CSS; |
1651 | 1651 | // Test without moving fonts to CDN, but cdn option is set. |
1652 | - $instance = new autoptimizeStyles( $css_in ); |
|
1653 | - $instance->setOption( 'cdn_url', $urls['cdnurl'] ); |
|
1654 | - $css_actual = $instance->rewrite_assets( $css_in ); |
|
1655 | - $this->assertEquals( $css_expected, $css_actual ); |
|
1652 | + $instance = new autoptimizeStyles($css_in); |
|
1653 | + $instance->setOption('cdn_url', $urls['cdnurl']); |
|
1654 | + $css_actual = $instance->rewrite_assets($css_in); |
|
1655 | + $this->assertEquals($css_expected, $css_actual); |
|
1656 | 1656 | } |
1657 | 1657 | |
1658 | 1658 | public function test_assets_regex_replaces_multi_bg_images() |
@@ -1673,16 +1673,16 @@ discard block |
||
1673 | 1673 | } |
1674 | 1674 | CSS; |
1675 | 1675 | |
1676 | - $instance = new autoptimizeStyles( $in ); |
|
1677 | - $instance->setOption( 'cdn_url', $cdnurl ); |
|
1678 | - $actual = $instance->rewrite_assets( $in ); |
|
1676 | + $instance = new autoptimizeStyles($in); |
|
1677 | + $instance->setOption('cdn_url', $cdnurl); |
|
1678 | + $actual = $instance->rewrite_assets($in); |
|
1679 | 1679 | |
1680 | - $this->assertEquals( $expected, $actual ); |
|
1680 | + $this->assertEquals($expected, $actual); |
|
1681 | 1681 | } |
1682 | 1682 | |
1683 | 1683 | public function test_at_supports_spacing_issue_110() |
1684 | 1684 | { |
1685 | - $in = <<<CSS |
|
1685 | + $in = <<<CSS |
|
1686 | 1686 | @supports (-webkit-filter: blur(3px)) or (filter: blur(3px)) { |
1687 | 1687 | .blur { |
1688 | 1688 | filter:blur(3px); |
@@ -1696,10 +1696,10 @@ discard block |
||
1696 | 1696 | @supports (-webkit-filter:blur(3px)) or (filter:blur(3px)){.blur{filter:blur(3px)}}@supports((position:-webkit-sticky) or (position:sticky)){.sticky{position:sticky}} |
1697 | 1697 | CSS; |
1698 | 1698 | |
1699 | - $instance = new autoptimizeStyles( $in ); |
|
1700 | - $actual = $instance->run_minifier_on( $in ); |
|
1699 | + $instance = new autoptimizeStyles($in); |
|
1700 | + $actual = $instance->run_minifier_on($in); |
|
1701 | 1701 | |
1702 | - $this->assertEquals( $expected, $actual ); |
|
1702 | + $this->assertEquals($expected, $actual); |
|
1703 | 1703 | } |
1704 | 1704 | |
1705 | 1705 | public function test_css_import_semicolon_url_issue_122() |
@@ -1715,18 +1715,18 @@ discard block |
||
1715 | 1715 | </style> |
1716 | 1716 | HTML; |
1717 | 1717 | |
1718 | - $expected = '<style media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css?a&b);@import url(' . $cdnurl . '/' . $sub . 'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->'; |
|
1718 | + $expected = '<style media="all">@import url('.$cdnurl.'/'.$sub.'foo.css?a&b);@import url('.$cdnurl.'/'.$sub.'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->'; |
|
1719 | 1719 | |
1720 | 1720 | $options = [ |
1721 | 1721 | 'autoptimizeStyles' => $this->getAoStylesDefaultOptions(), |
1722 | 1722 | ]; |
1723 | 1723 | |
1724 | - $instance = new autoptimizeStyles( $in ); |
|
1725 | - $instance->read( $options['autoptimizeStyles'] ); |
|
1724 | + $instance = new autoptimizeStyles($in); |
|
1725 | + $instance->read($options['autoptimizeStyles']); |
|
1726 | 1726 | $instance->minify(); |
1727 | 1727 | $instance->cache(); |
1728 | 1728 | $actual = $instance->getcontent(); |
1729 | - $this->assertEquals( $expected, $actual ); |
|
1729 | + $this->assertEquals($expected, $actual); |
|
1730 | 1730 | } |
1731 | 1731 | |
1732 | 1732 | public function test_fixurls_with_at_imports_and_media_queries() |
@@ -1736,10 +1736,10 @@ discard block |
||
1736 | 1736 | $subfolder = $urls['subfolder']; |
1737 | 1737 | |
1738 | 1738 | $in = '@import "foo.css"; @import "bar.css" (orientation:landscape);'; |
1739 | - $exp = '@import url(' . $prsiteurl . '/wp-content/themes/my-theme/foo.css); @import url(' . $prsiteurl . '/wp-content/themes/my-theme/bar.css) (orientation:landscape);'; |
|
1739 | + $exp = '@import url('.$prsiteurl.'/wp-content/themes/my-theme/foo.css); @import url('.$prsiteurl.'/wp-content/themes/my-theme/bar.css) (orientation:landscape);'; |
|
1740 | 1740 | |
1741 | - $actual = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $in ); |
|
1742 | - $this->assertEquals( $exp, $actual ); |
|
1741 | + $actual = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $in); |
|
1742 | + $this->assertEquals($exp, $actual); |
|
1743 | 1743 | } |
1744 | 1744 | |
1745 | 1745 | public function test_aostyles_at_imports_with_media_queries() |
@@ -1754,43 +1754,43 @@ discard block |
||
1754 | 1754 | </style> |
1755 | 1755 | HTML; |
1756 | 1756 | |
1757 | - $expected = '<style media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css);@import url(' . $cdnurl . '/' . $sub . 'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->'; |
|
1757 | + $expected = '<style media="all">@import url('.$cdnurl.'/'.$sub.'foo.css);@import url('.$cdnurl.'/'.$sub.'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->'; |
|
1758 | 1758 | |
1759 | 1759 | $options = [ |
1760 | 1760 | 'autoptimizeStyles' => $this->getAoStylesDefaultOptions(), |
1761 | 1761 | ]; |
1762 | 1762 | |
1763 | - $instance = new autoptimizeStyles( $in ); |
|
1764 | - $instance->read( $options['autoptimizeStyles'] ); |
|
1763 | + $instance = new autoptimizeStyles($in); |
|
1764 | + $instance->read($options['autoptimizeStyles']); |
|
1765 | 1765 | $instance->minify(); |
1766 | 1766 | $instance->cache(); |
1767 | 1767 | |
1768 | 1768 | $actual = $instance->getcontent(); |
1769 | - $this->assertEquals( $expected, $actual ); |
|
1769 | + $this->assertEquals($expected, $actual); |
|
1770 | 1770 | } |
1771 | 1771 | |
1772 | 1772 | public function test_cache_size_checker_hooked_by_default() |
1773 | 1773 | { |
1774 | - $this->assertNotEmpty( autoptimizeCacheChecker::SCHEDULE_HOOK ); |
|
1774 | + $this->assertNotEmpty(autoptimizeCacheChecker::SCHEDULE_HOOK); |
|
1775 | 1775 | |
1776 | 1776 | // No schedule, because it's only added when is_admin() is true. |
1777 | - $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) ); |
|
1777 | + $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK)); |
|
1778 | 1778 | |
1779 | 1779 | // Proving that setup() sets the schedule as needed. |
1780 | 1780 | $checker = new autoptimizeCacheChecker(); |
1781 | 1781 | $checker->setup(); |
1782 | - $this->assertEquals( 'twicedaily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) ); |
|
1782 | + $this->assertEquals('twicedaily', wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK)); |
|
1783 | 1783 | } |
1784 | 1784 | |
1785 | 1785 | public function test_cache_size_checker_disabled_with_filter() |
1786 | 1786 | { |
1787 | - add_filter( 'autoptimize_filter_cachecheck_do', '__return_false' ); |
|
1787 | + add_filter('autoptimize_filter_cachecheck_do', '__return_false'); |
|
1788 | 1788 | |
1789 | 1789 | $checker = new autoptimizeCacheChecker(); |
1790 | 1790 | $checker->setup(); |
1791 | - $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) ); |
|
1791 | + $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK)); |
|
1792 | 1792 | |
1793 | - remove_all_filters( 'autoptimize_filter_cachecheck_do' ); |
|
1793 | + remove_all_filters('autoptimize_filter_cachecheck_do'); |
|
1794 | 1794 | } |
1795 | 1795 | |
1796 | 1796 | public function test_is_start_buffering_hooked_properly() |
@@ -1803,12 +1803,12 @@ discard block |
||
1803 | 1803 | * https://www.theaveragedev.com/mocking-constants-in-tests/. |
1804 | 1804 | */ |
1805 | 1805 | |
1806 | - if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) { |
|
1806 | + if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
|
1807 | 1807 | $this->assertEquals( |
1808 | 1808 | autoptimizeMain::INIT_EARLIER_PRIORITY, |
1809 | - has_action( 'init', array( $instance, 'start_buffering' ) ) |
|
1809 | + has_action('init', array($instance, 'start_buffering')) |
|
1810 | 1810 | ); |
1811 | - $this->assertTrue( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ); |
|
1811 | + $this->assertTrue(!defined('AUTOPTIMIZE_HOOK_INTO')); |
|
1812 | 1812 | } |
1813 | 1813 | |
1814 | 1814 | /* |
@@ -1825,18 +1825,18 @@ discard block |
||
1825 | 1825 | |
1826 | 1826 | public function test_inline_and_defer_markup() |
1827 | 1827 | { |
1828 | - add_filter( 'autoptimize_filter_css_defer', '__return_true' ); |
|
1829 | - add_filter( 'autoptimize_filter_css_defer_inline', '__return_true' ); |
|
1828 | + add_filter('autoptimize_filter_css_defer', '__return_true'); |
|
1829 | + add_filter('autoptimize_filter_css_defer_inline', '__return_true'); |
|
1830 | 1830 | |
1831 | - $actual = $this->ao->end_buffering( $this->get_test_markup() ); |
|
1832 | - if ( is_multisite() ) { |
|
1833 | - $this->assertEquals( $this->get_test_markup_output_inline_defer_ms(), $actual ); |
|
1831 | + $actual = $this->ao->end_buffering($this->get_test_markup()); |
|
1832 | + if (is_multisite()) { |
|
1833 | + $this->assertEquals($this->get_test_markup_output_inline_defer_ms(), $actual); |
|
1834 | 1834 | } else { |
1835 | - $this->assertEquals( $this->get_test_markup_output_inline_defer(), $actual ); |
|
1835 | + $this->assertEquals($this->get_test_markup_output_inline_defer(), $actual); |
|
1836 | 1836 | } |
1837 | 1837 | |
1838 | - remove_all_filters( 'autoptimize_filter_css_defer' ); |
|
1839 | - remove_all_filters( 'autoptimize_filter_css_defer_inline' ); |
|
1838 | + remove_all_filters('autoptimize_filter_css_defer'); |
|
1839 | + remove_all_filters('autoptimize_filter_css_defer_inline'); |
|
1840 | 1840 | } |
1841 | 1841 | |
1842 | 1842 | public function test_js_aggregation_decision_and_dontaggregate_filter() |
@@ -1844,47 +1844,47 @@ discard block |
||
1844 | 1844 | $opts = $this->getAoScriptsDefaultOptions(); |
1845 | 1845 | |
1846 | 1846 | // Aggregating: true by default. |
1847 | - $scripts = new autoptimizeScripts( '' ); |
|
1848 | - $scripts->read( $opts ); |
|
1849 | - $this->assertTrue( $scripts->aggregating() ); |
|
1847 | + $scripts = new autoptimizeScripts(''); |
|
1848 | + $scripts->read($opts); |
|
1849 | + $this->assertTrue($scripts->aggregating()); |
|
1850 | 1850 | |
1851 | 1851 | // Aggregating: option=true (dontaggregate=false by default). |
1852 | 1852 | $opts['aggregate'] = true; |
1853 | - $scripts = new autoptimizeScripts( '' ); |
|
1854 | - $scripts->read( $opts ); |
|
1855 | - $this->assertTrue( $scripts->aggregating() ); |
|
1853 | + $scripts = new autoptimizeScripts(''); |
|
1854 | + $scripts->read($opts); |
|
1855 | + $this->assertTrue($scripts->aggregating()); |
|
1856 | 1856 | |
1857 | 1857 | // Aggregating: option=true, dontaggregate=false explicit. |
1858 | 1858 | $opts['aggregate'] = true; |
1859 | - add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' ); |
|
1860 | - $scripts = new autoptimizeScripts( '' ); |
|
1861 | - $scripts->read( $opts ); |
|
1862 | - $this->assertTrue( $scripts->aggregating() ); |
|
1863 | - remove_all_filters( 'autoptimize_filter_js_dontaggregate' ); |
|
1859 | + add_filter('autoptimize_filter_js_dontaggregate', '__return_false'); |
|
1860 | + $scripts = new autoptimizeScripts(''); |
|
1861 | + $scripts->read($opts); |
|
1862 | + $this->assertTrue($scripts->aggregating()); |
|
1863 | + remove_all_filters('autoptimize_filter_js_dontaggregate'); |
|
1864 | 1864 | |
1865 | 1865 | // Not aggregating: option=true, dontaggregate=true. |
1866 | 1866 | $opts['aggregate'] = true; |
1867 | - add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' ); |
|
1868 | - $scripts = new autoptimizeScripts( '' ); |
|
1869 | - $scripts->read( $opts ); |
|
1870 | - $this->assertFalse( $scripts->aggregating() ); |
|
1871 | - remove_all_filters( 'autoptimize_filter_js_dontaggregate' ); |
|
1867 | + add_filter('autoptimize_filter_js_dontaggregate', '__return_true'); |
|
1868 | + $scripts = new autoptimizeScripts(''); |
|
1869 | + $scripts->read($opts); |
|
1870 | + $this->assertFalse($scripts->aggregating()); |
|
1871 | + remove_all_filters('autoptimize_filter_js_dontaggregate'); |
|
1872 | 1872 | |
1873 | 1873 | // Not aggregating: option=false, dontaggregate=false. |
1874 | 1874 | $opts['aggregate'] = false; |
1875 | - add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' ); |
|
1876 | - $scripts = new autoptimizeScripts( '' ); |
|
1877 | - $scripts->read( $opts ); |
|
1878 | - $this->assertFalse( $scripts->aggregating() ); |
|
1879 | - remove_all_filters( 'autoptimize_filter_js_dontaggregate' ); |
|
1875 | + add_filter('autoptimize_filter_js_dontaggregate', '__return_false'); |
|
1876 | + $scripts = new autoptimizeScripts(''); |
|
1877 | + $scripts->read($opts); |
|
1878 | + $this->assertFalse($scripts->aggregating()); |
|
1879 | + remove_all_filters('autoptimize_filter_js_dontaggregate'); |
|
1880 | 1880 | |
1881 | 1881 | // Not aggregating: option=false, dontaggregate=true. |
1882 | 1882 | $opts['aggregate'] = false; |
1883 | - add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' ); |
|
1884 | - $scripts = new autoptimizeScripts( '' ); |
|
1885 | - $scripts->read( $opts ); |
|
1886 | - $this->assertFalse( $scripts->aggregating() ); |
|
1887 | - remove_all_filters( 'autoptimize_filter_js_dontaggregate' ); |
|
1883 | + add_filter('autoptimize_filter_js_dontaggregate', '__return_true'); |
|
1884 | + $scripts = new autoptimizeScripts(''); |
|
1885 | + $scripts->read($opts); |
|
1886 | + $this->assertFalse($scripts->aggregating()); |
|
1887 | + remove_all_filters('autoptimize_filter_js_dontaggregate'); |
|
1888 | 1888 | } |
1889 | 1889 | |
1890 | 1890 | public function test_css_aggregation_decision_and_dontaggregate_filter() |
@@ -1892,78 +1892,78 @@ discard block |
||
1892 | 1892 | $opts = $this->getAoStylesDefaultOptions(); |
1893 | 1893 | |
1894 | 1894 | // Aggregating: true by default. |
1895 | - $styles = new autoptimizeStyles( '' ); |
|
1896 | - $this->assertTrue( $styles->aggregating() ); |
|
1895 | + $styles = new autoptimizeStyles(''); |
|
1896 | + $this->assertTrue($styles->aggregating()); |
|
1897 | 1897 | |
1898 | 1898 | // Aggregating: option=true (dontaggregate=false by default). |
1899 | 1899 | $opts['aggregate'] = true; |
1900 | - $styles = new autoptimizeStyles( '' ); |
|
1901 | - $styles->read( $opts ); |
|
1902 | - $this->assertTrue( $styles->aggregating() ); |
|
1900 | + $styles = new autoptimizeStyles(''); |
|
1901 | + $styles->read($opts); |
|
1902 | + $this->assertTrue($styles->aggregating()); |
|
1903 | 1903 | |
1904 | 1904 | // Aggregating: option=true, dontaggregate=false explicit. |
1905 | 1905 | $opts['aggregate'] = true; |
1906 | - add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' ); |
|
1907 | - $styles = new autoptimizeStyles( '' ); |
|
1908 | - $styles->read( $opts ); |
|
1909 | - $this->assertTrue( $styles->aggregating() ); |
|
1910 | - remove_all_filters( 'autoptimize_filter_css_dontaggregate' ); |
|
1906 | + add_filter('autoptimize_filter_css_dontaggregate', '__return_false'); |
|
1907 | + $styles = new autoptimizeStyles(''); |
|
1908 | + $styles->read($opts); |
|
1909 | + $this->assertTrue($styles->aggregating()); |
|
1910 | + remove_all_filters('autoptimize_filter_css_dontaggregate'); |
|
1911 | 1911 | |
1912 | 1912 | // Not aggregating: option=true, dontaggregate=true. |
1913 | 1913 | $opts['aggregate'] = true; |
1914 | - add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' ); |
|
1915 | - $styles = new autoptimizeStyles( '' ); |
|
1916 | - $styles->read( $opts ); |
|
1917 | - $this->assertFalse( $styles->aggregating() ); |
|
1918 | - remove_all_filters( 'autoptimize_filter_css_dontaggregate' ); |
|
1914 | + add_filter('autoptimize_filter_css_dontaggregate', '__return_true'); |
|
1915 | + $styles = new autoptimizeStyles(''); |
|
1916 | + $styles->read($opts); |
|
1917 | + $this->assertFalse($styles->aggregating()); |
|
1918 | + remove_all_filters('autoptimize_filter_css_dontaggregate'); |
|
1919 | 1919 | |
1920 | 1920 | // Not aggregating: option=false, dontaggregate=false. |
1921 | 1921 | $opts['aggregate'] = false; |
1922 | - add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' ); |
|
1923 | - $styles = new autoptimizeStyles( '' ); |
|
1924 | - $styles->read( $opts ); |
|
1925 | - $this->assertFalse( $styles->aggregating() ); |
|
1926 | - remove_all_filters( 'autoptimize_filter_css_dontaggregate' ); |
|
1922 | + add_filter('autoptimize_filter_css_dontaggregate', '__return_false'); |
|
1923 | + $styles = new autoptimizeStyles(''); |
|
1924 | + $styles->read($opts); |
|
1925 | + $this->assertFalse($styles->aggregating()); |
|
1926 | + remove_all_filters('autoptimize_filter_css_dontaggregate'); |
|
1927 | 1927 | |
1928 | 1928 | // Not aggregating: option=false, dontaggregate=true. |
1929 | 1929 | $opts['aggregate'] = false; |
1930 | - add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' ); |
|
1931 | - $styles = new autoptimizeStyles( '' ); |
|
1932 | - $styles->read( $opts ); |
|
1933 | - $this->assertFalse( $styles->aggregating() ); |
|
1934 | - remove_all_filters( 'autoptimize_filter_css_dontaggregate' ); |
|
1930 | + add_filter('autoptimize_filter_css_dontaggregate', '__return_true'); |
|
1931 | + $styles = new autoptimizeStyles(''); |
|
1932 | + $styles->read($opts); |
|
1933 | + $this->assertFalse($styles->aggregating()); |
|
1934 | + remove_all_filters('autoptimize_filter_css_dontaggregate'); |
|
1935 | 1935 | } |
1936 | 1936 | |
1937 | 1937 | public function test_css_minify_single_with_cdning() |
1938 | 1938 | { |
1939 | - $pathname = dirname( __FILE__ ) . '/fixtures/minify-single.css'; |
|
1939 | + $pathname = dirname(__FILE__).'/fixtures/minify-single.css'; |
|
1940 | 1940 | $opts = $this->getAoStylesDefaultOptions(); |
1941 | - $styles = new autoptimizeStyles( '' ); |
|
1942 | - $styles->read( $opts ); |
|
1941 | + $styles = new autoptimizeStyles(''); |
|
1942 | + $styles->read($opts); |
|
1943 | 1943 | |
1944 | - $url = $styles->minify_single( $pathname, $cache_miss = true ); |
|
1944 | + $url = $styles->minify_single($pathname, $cache_miss = true); |
|
1945 | 1945 | |
1946 | 1946 | // Minified url filename + its pointed to cdn. |
1947 | - $this->assertContains( AUTOPTIMIZE_CACHE_CHILD_DIR, $url ); |
|
1948 | - $this->assertContains( '/autoptimize_single_', $url ); |
|
1949 | - $this->assertContains( $styles->cdn_url, $url ); |
|
1947 | + $this->assertContains(AUTOPTIMIZE_CACHE_CHILD_DIR, $url); |
|
1948 | + $this->assertContains('/autoptimize_single_', $url); |
|
1949 | + $this->assertContains($styles->cdn_url, $url); |
|
1950 | 1950 | |
1951 | 1951 | // Actual minified css contents are minified and cdn-ed. |
1952 | - $path = $styles->getpath( $url ); |
|
1953 | - $contents = file_get_contents( $path ); |
|
1954 | - $this->assertContains( $styles->cdn_url, $contents ); |
|
1955 | - $this->assertContains( '.bg{background:url(' . $styles->cdn_url, $contents ); |
|
1952 | + $path = $styles->getpath($url); |
|
1953 | + $contents = file_get_contents($path); |
|
1954 | + $this->assertContains($styles->cdn_url, $contents); |
|
1955 | + $this->assertContains('.bg{background:url('.$styles->cdn_url, $contents); |
|
1956 | 1956 | } |
1957 | 1957 | |
1958 | 1958 | public function test_ao_partners_instantiation_without_explicit_include() |
1959 | 1959 | { |
1960 | 1960 | $partners = new autoptimizePartners(); |
1961 | - $this->assertTrue( $partners instanceof autoptimizePartners ); |
|
1961 | + $this->assertTrue($partners instanceof autoptimizePartners); |
|
1962 | 1962 | } |
1963 | 1963 | |
1964 | 1964 | public function test_html_minify_keep_html_comments_inside_script_blocks() |
1965 | 1965 | { |
1966 | - $markup = <<<MARKUP |
|
1966 | + $markup = <<<MARKUP |
|
1967 | 1967 | <script> |
1968 | 1968 | <!-- End Support AJAX add to cart --> |
1969 | 1969 | var a = "b"; |
@@ -1993,23 +1993,23 @@ discard block |
||
1993 | 1993 | ], |
1994 | 1994 | ]; |
1995 | 1995 | |
1996 | - $instance = new autoptimizeHTML( $markup ); |
|
1997 | - $instance->read( $options['autoptimizeHTML'] ); |
|
1996 | + $instance = new autoptimizeHTML($markup); |
|
1997 | + $instance->read($options['autoptimizeHTML']); |
|
1998 | 1998 | $instance->minify(); |
1999 | 1999 | $actual = $instance->getcontent(); |
2000 | - $this->assertEquals( $expected, $actual ); |
|
2000 | + $this->assertEquals($expected, $actual); |
|
2001 | 2001 | |
2002 | - $instance = new autoptimizeHTML( $markup2 ); |
|
2003 | - $instance->read( $options['autoptimizeHTML'] ); |
|
2002 | + $instance = new autoptimizeHTML($markup2); |
|
2003 | + $instance->read($options['autoptimizeHTML']); |
|
2004 | 2004 | $instance->minify(); |
2005 | 2005 | $actual2 = $instance->getcontent(); |
2006 | - $this->assertEquals( $expected2, $actual2 ); |
|
2006 | + $this->assertEquals($expected2, $actual2); |
|
2007 | 2007 | } |
2008 | 2008 | |
2009 | 2009 | public function test_html_minify_remove_html_comments_inside_script_blocks() |
2010 | 2010 | { |
2011 | 2011 | // Default case, html comments removed (keepcomments = false). |
2012 | - $markup1 = <<<MARKUP |
|
2012 | + $markup1 = <<<MARKUP |
|
2013 | 2013 | <script> |
2014 | 2014 | var a = "b"; |
2015 | 2015 | <!-- End Support AJAX add to cart --> |
@@ -2020,7 +2020,7 @@ discard block |
||
2020 | 2020 | <!-- End Support AJAX add to cart</script> |
2021 | 2021 | MARKUP; |
2022 | 2022 | |
2023 | - $markup2 = <<<MARKUP |
|
2023 | + $markup2 = <<<MARKUP |
|
2024 | 2024 | <script> |
2025 | 2025 | <!-- End Support AJAX add to cart --> |
2026 | 2026 | var a = "b"; |
@@ -2037,17 +2037,17 @@ discard block |
||
2037 | 2037 | ], |
2038 | 2038 | ]; |
2039 | 2039 | |
2040 | - $instance = new autoptimizeHTML( $markup1 ); |
|
2041 | - $instance->read( $options['autoptimizeHTML'] ); |
|
2040 | + $instance = new autoptimizeHTML($markup1); |
|
2041 | + $instance->read($options['autoptimizeHTML']); |
|
2042 | 2042 | $instance->minify(); |
2043 | 2043 | $actual = $instance->getcontent(); |
2044 | - $this->assertEquals( $expected1, $actual ); |
|
2044 | + $this->assertEquals($expected1, $actual); |
|
2045 | 2045 | |
2046 | - $instance = new autoptimizeHTML( $markup2 ); |
|
2047 | - $instance->read( $options['autoptimizeHTML'] ); |
|
2046 | + $instance = new autoptimizeHTML($markup2); |
|
2047 | + $instance->read($options['autoptimizeHTML']); |
|
2048 | 2048 | $instance->minify(); |
2049 | 2049 | $actual2 = $instance->getcontent(); |
2050 | - $this->assertEquals( $expected2, $actual2 ); |
|
2050 | + $this->assertEquals($expected2, $actual2); |
|
2051 | 2051 | } |
2052 | 2052 | |
2053 | 2053 | public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern() |
@@ -2071,11 +2071,11 @@ discard block |
||
2071 | 2071 | ], |
2072 | 2072 | ]; |
2073 | 2073 | |
2074 | - $instance = new autoptimizeHTML( $markup ); |
|
2075 | - $instance->read( $options['autoptimizeHTML'] ); |
|
2074 | + $instance = new autoptimizeHTML($markup); |
|
2075 | + $instance->read($options['autoptimizeHTML']); |
|
2076 | 2076 | $instance->minify(); |
2077 | 2077 | $actual = $instance->getcontent(); |
2078 | - $this->assertEquals( $expected, $actual ); |
|
2078 | + $this->assertEquals($expected, $actual); |
|
2079 | 2079 | } |
2080 | 2080 | |
2081 | 2081 | public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern_untouched() |
@@ -2100,49 +2100,49 @@ discard block |
||
2100 | 2100 | ], |
2101 | 2101 | ]; |
2102 | 2102 | |
2103 | - $instance = new autoptimizeHTML( $markup ); |
|
2104 | - $instance->read( $options['autoptimizeHTML'] ); |
|
2103 | + $instance = new autoptimizeHTML($markup); |
|
2104 | + $instance->read($options['autoptimizeHTML']); |
|
2105 | 2105 | $instance->minify(); |
2106 | 2106 | $actual = $instance->getcontent(); |
2107 | - $this->assertEquals( $expected, $actual ); |
|
2107 | + $this->assertEquals($expected, $actual); |
|
2108 | 2108 | } |
2109 | 2109 | |
2110 | 2110 | public function test_utils_mbstring_availabilty_overriding() |
2111 | 2111 | { |
2112 | 2112 | $orig = autoptimizeUtils::mbstring_available(); |
2113 | - $opposite = ! $orig; |
|
2113 | + $opposite = !$orig; |
|
2114 | 2114 | |
2115 | - $this->assertSame( $orig, autoptimizeUtils::mbstring_available() ); |
|
2115 | + $this->assertSame($orig, autoptimizeUtils::mbstring_available()); |
|
2116 | 2116 | // Override works... |
2117 | - $this->assertSame( $opposite, autoptimizeUtils::mbstring_available( $opposite ) ); |
|
2117 | + $this->assertSame($opposite, autoptimizeUtils::mbstring_available($opposite)); |
|
2118 | 2118 | // And override remains cached as the last version. |
2119 | - $this->assertSame( $opposite, autoptimizeUtils::mbstring_available() ); |
|
2119 | + $this->assertSame($opposite, autoptimizeUtils::mbstring_available()); |
|
2120 | 2120 | } |
2121 | 2121 | |
2122 | 2122 | public function test_utils_mbstring_basics() |
2123 | 2123 | { |
2124 | 2124 | // Turn on mbstring usage. |
2125 | - autoptimizeUtils::mbstring_available( true ); |
|
2125 | + autoptimizeUtils::mbstring_available(true); |
|
2126 | 2126 | |
2127 | - $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'ASCII' ) ); |
|
2128 | - $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'CP850' ) ); |
|
2129 | - $this->assertSame( 3, autoptimizeUtils::strlen( '한국어' ) ); |
|
2127 | + $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'ASCII')); |
|
2128 | + $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'CP850')); |
|
2129 | + $this->assertSame(3, autoptimizeUtils::strlen('한국어')); |
|
2130 | 2130 | |
2131 | - $this->assertFalse( @autoptimizeUtils::strpos( 'abc', '' ) ); |
|
2132 | - $this->assertFalse( @autoptimizeUtils::strpos( 'abc', 'a', -1 ) ); |
|
2133 | - $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'd' ) ); |
|
2134 | - $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'a', 3 ) ); |
|
2135 | - $this->assertSame( 1, autoptimizeUtils::strpos( '한국어', '국' ) ); |
|
2131 | + $this->assertFalse(@autoptimizeUtils::strpos('abc', '')); |
|
2132 | + $this->assertFalse(@autoptimizeUtils::strpos('abc', 'a', -1)); |
|
2133 | + $this->assertFalse(autoptimizeUtils::strpos('abc', 'd')); |
|
2134 | + $this->assertFalse(autoptimizeUtils::strpos('abc', 'a', 3)); |
|
2135 | + $this->assertSame(1, autoptimizeUtils::strpos('한국어', '국')); |
|
2136 | 2136 | } |
2137 | 2137 | |
2138 | 2138 | /** |
2139 | 2139 | * @dataProvider provider_utils_substr_replace |
2140 | 2140 | */ |
2141 | - function test_utils_substr_replace_basics_mbstring( $s, $repl, $start, $len, $expected ) |
|
2141 | + function test_utils_substr_replace_basics_mbstring($s, $repl, $start, $len, $expected) |
|
2142 | 2142 | { |
2143 | 2143 | // Force mbstring code path... |
2144 | - autoptimizeUtils::mbstring_available( true ); |
|
2145 | - $this->assertEquals( $expected, autoptimizeUtils::substr_replace( $s, $repl, $start, $len ) ); |
|
2144 | + autoptimizeUtils::mbstring_available(true); |
|
2145 | + $this->assertEquals($expected, autoptimizeUtils::substr_replace($s, $repl, $start, $len)); |
|
2146 | 2146 | } |
2147 | 2147 | |
2148 | 2148 | public function provider_utils_substr_replace() |
@@ -2184,48 +2184,48 @@ discard block |
||
2184 | 2184 | |
2185 | 2185 | function test_mb_substr_replace_with_ascii_input_string() |
2186 | 2186 | { |
2187 | - autoptimizeUtils::mbstring_available( false ); |
|
2187 | + autoptimizeUtils::mbstring_available(false); |
|
2188 | 2188 | |
2189 | 2189 | $str = 'Ascii'; |
2190 | 2190 | |
2191 | - $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); |
|
2192 | - $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) ); |
|
2193 | - $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) ); |
|
2194 | - $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); |
|
2195 | - $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) ); |
|
2191 | + $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); |
|
2192 | + $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2)); |
|
2193 | + $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3)); |
|
2194 | + $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); |
|
2195 | + $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2)); |
|
2196 | 2196 | } |
2197 | 2197 | |
2198 | 2198 | function test_mb_substr_replace_with_utf8_input_string() |
2199 | 2199 | { |
2200 | - autoptimizeUtils::mbstring_available( true ); |
|
2200 | + autoptimizeUtils::mbstring_available(true); |
|
2201 | 2201 | |
2202 | 2202 | $str = 'âønæë'; |
2203 | 2203 | |
2204 | - $this->assertSame( 'âñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length. |
|
2205 | - $this->assertSame( 'ñnæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) ); |
|
2206 | - $this->assertSame( 'âøñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) ); |
|
2207 | - $this->assertSame( 'âøz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible... |
|
2208 | - $this->assertSame( 'âñæë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) ); |
|
2204 | + $this->assertSame('âñ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); // No length. |
|
2205 | + $this->assertSame('ñnæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2)); |
|
2206 | + $this->assertSame('âøñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3)); |
|
2207 | + $this->assertSame('âøz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible... |
|
2208 | + $this->assertSame('âñæë', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2)); |
|
2209 | 2209 | } |
2210 | 2210 | |
2211 | 2211 | function test_default_substr_replace_with_ascii_input_string() |
2212 | 2212 | { |
2213 | 2213 | // Disable mbstring which should fall ack to substr_replace... |
2214 | - autoptimizeUtils::mbstring_available( false ); |
|
2214 | + autoptimizeUtils::mbstring_available(false); |
|
2215 | 2215 | |
2216 | 2216 | $str = 'Ascii'; |
2217 | 2217 | |
2218 | - $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); |
|
2219 | - $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) ); |
|
2220 | - $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) ); |
|
2221 | - $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); |
|
2222 | - $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) ); |
|
2218 | + $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); |
|
2219 | + $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2)); |
|
2220 | + $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3)); |
|
2221 | + $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); |
|
2222 | + $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2)); |
|
2223 | 2223 | } |
2224 | 2224 | |
2225 | 2225 | function test_default_substr_replace_with_utf8_input_string() |
2226 | 2226 | { |
2227 | 2227 | // Disabling mbstring, falling back to substr_replace... |
2228 | - autoptimizeUtils::mbstring_available( false ); |
|
2228 | + autoptimizeUtils::mbstring_available(false); |
|
2229 | 2229 | |
2230 | 2230 | // This is really impossible to make work properly, since |
2231 | 2231 | // any start/len parameters we give are working with bytes instead |
@@ -2234,59 +2234,59 @@ discard block |
||
2234 | 2234 | |
2235 | 2235 | // $this->assertSame( '�ñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length. |
2236 | 2236 | // $this->assertSame( 'ñ�næë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) ); |
2237 | - $this->assertSame( 'ñønæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) ); |
|
2238 | - $this->assertSame( 'âñxæë', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) ); |
|
2239 | - $this->assertSame( 'âz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible... |
|
2237 | + $this->assertSame('ñønæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2)); |
|
2238 | + $this->assertSame('âñxæë', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3)); |
|
2239 | + $this->assertSame('âz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible... |
|
2240 | 2240 | } |
2241 | 2241 | |
2242 | 2242 | public function test_cache_fast_delete() |
2243 | 2243 | { |
2244 | - add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' ); |
|
2244 | + add_filter('autoptimize_filter_cache_clear_advanced', '__return_true'); |
|
2245 | 2245 | |
2246 | - $this->assertTrue( autoptimizeCache::clearall_actionless() ); |
|
2246 | + $this->assertTrue(autoptimizeCache::clearall_actionless()); |
|
2247 | 2247 | |
2248 | - remove_all_filters( 'autoptimize_filter_cache_clear_advanced' ); |
|
2248 | + remove_all_filters('autoptimize_filter_cache_clear_advanced'); |
|
2249 | 2249 | } |
2250 | 2250 | |
2251 | 2251 | public function test_delete_advanced_cache_clear_artifacts() |
2252 | 2252 | { |
2253 | - add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' ); |
|
2253 | + add_filter('autoptimize_filter_cache_clear_advanced', '__return_true'); |
|
2254 | 2254 | |
2255 | - $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() ); |
|
2255 | + $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts()); |
|
2256 | 2256 | |
2257 | - remove_all_filters( 'autoptimize_filter_cache_clear_advanced' ); |
|
2257 | + remove_all_filters('autoptimize_filter_cache_clear_advanced'); |
|
2258 | 2258 | } |
2259 | 2259 | |
2260 | 2260 | public function provider_canonicalization() |
2261 | 2261 | { |
2262 | 2262 | return array( |
2263 | - array( '../common', 'common' ), |
|
2264 | - array( '../what-does-this-mean/really?/', 'what-does-this-mean/really?/' ), |
|
2265 | - array( '../../what/where/how', 'what/where/how' ), |
|
2266 | - array( '/../more.dots.please/', '/more.dots.please/' ), |
|
2267 | - array( '/../../what/where/how', '/what/where/how' ), |
|
2268 | - array( '/a/b/c/../../../d/e/file.txt', '/d/e/file.txt' ), |
|
2269 | - array( 'a/b/../c', 'a/c' ), |
|
2270 | - array( './../../etc/passwd', './etc/passwd' ), |
|
2271 | - array( '/var/.////./user/./././..//.//../////../././.././test/////', '/test/' ), |
|
2272 | - array( '/var/user/./././.././../.././././test/', '/test/' ), |
|
2273 | - array( '/hello/0//how/../are/../you', '/hello/0/you' ), |
|
2274 | - array( '', '' ), |
|
2275 | - array( '.', '.' ), |
|
2276 | - array( '..', '..' ), |
|
2277 | - array( './..', './..' ), |
|
2278 | - array( '../.', '.' ), |
|
2263 | + array('../common', 'common'), |
|
2264 | + array('../what-does-this-mean/really?/', 'what-does-this-mean/really?/'), |
|
2265 | + array('../../what/where/how', 'what/where/how'), |
|
2266 | + array('/../more.dots.please/', '/more.dots.please/'), |
|
2267 | + array('/../../what/where/how', '/what/where/how'), |
|
2268 | + array('/a/b/c/../../../d/e/file.txt', '/d/e/file.txt'), |
|
2269 | + array('a/b/../c', 'a/c'), |
|
2270 | + array('./../../etc/passwd', './etc/passwd'), |
|
2271 | + array('/var/.////./user/./././..//.//../////../././.././test/////', '/test/'), |
|
2272 | + array('/var/user/./././.././../.././././test/', '/test/'), |
|
2273 | + array('/hello/0//how/../are/../you', '/hello/0/you'), |
|
2274 | + array('', ''), |
|
2275 | + array('.', '.'), |
|
2276 | + array('..', '..'), |
|
2277 | + array('./..', './..'), |
|
2278 | + array('../.', '.'), |
|
2279 | 2279 | // This might be debatable... |
2280 | - array( '../..', '..' ), |
|
2280 | + array('../..', '..'), |
|
2281 | 2281 | ); |
2282 | 2282 | } |
2283 | 2283 | |
2284 | 2284 | /** |
2285 | 2285 | * @dataProvider provider_canonicalization |
2286 | 2286 | */ |
2287 | - public function test_path_canonicalize( $path, $canonicalized ) |
|
2287 | + public function test_path_canonicalize($path, $canonicalized) |
|
2288 | 2288 | { |
2289 | - $this->assertSame( $canonicalized, autoptimizeUtils::path_canonicalize( $path ) ); |
|
2289 | + $this->assertSame($canonicalized, autoptimizeUtils::path_canonicalize($path)); |
|
2290 | 2290 | } |
2291 | 2291 | |
2292 | 2292 | /** |
@@ -2300,16 +2300,16 @@ discard block |
||
2300 | 2300 | public function test_autoptimize_filter_cdn_magic_path_check() |
2301 | 2301 | { |
2302 | 2302 | $cdnurl = 'http://cdn.example.org'; |
2303 | - add_filter( 'autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2 ); |
|
2303 | + add_filter('autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2); |
|
2304 | 2304 | |
2305 | 2305 | // Even when site is in a subfolder, the resulting cdn-rewritten url |
2306 | 2306 | // should not magically include it, due to the above filter. |
2307 | 2307 | // The second parameter is here to force a cache miss and re-run |
2308 | 2308 | // the filter since we're using the same cdn url all over the place, |
2309 | 2309 | // but want to prove different things with it. |
2310 | - $this->assertSame( $cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed( $cdnurl, true ) ); |
|
2310 | + $this->assertSame($cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed($cdnurl, true)); |
|
2311 | 2311 | |
2312 | - remove_all_filters( 'autoptimize_filter_cdn_magic_path_check' ); |
|
2312 | + remove_all_filters('autoptimize_filter_cdn_magic_path_check'); |
|
2313 | 2313 | } |
2314 | 2314 | |
2315 | 2315 | /** |
@@ -2334,9 +2334,9 @@ discard block |
||
2334 | 2334 | <img src='$imgopthost/client/q_glossy,ret_img,w_400,h_200/$siteurl/wp-content/image.jpg' width='400' height='200' srcset="$imgopthost/client/q_glossy,ret_img,w_300/$siteurl/wp-content/image-300X150.jpg 300w, $imgopthost/client/q_glossy,ret_img,w_600/$siteurl/wp-content/image-600X300.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" /> |
2335 | 2335 | MARKUP; |
2336 | 2336 | $instance = autoptimizeImages::instance(); |
2337 | - $instance->set_options( $opts ); |
|
2338 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2339 | - $this->assertEquals( $expected, $actual ); |
|
2337 | + $instance->set_options($opts); |
|
2338 | + $actual = $instance->filter_optimize_images($markup); |
|
2339 | + $this->assertEquals($expected, $actual); |
|
2340 | 2340 | } |
2341 | 2341 | |
2342 | 2342 | /** |
@@ -2364,9 +2364,9 @@ discard block |
||
2364 | 2364 | <img src='$siteurl/wp-content/excluded.jpg' width='400' height='200' srcset="$siteurl/wp-content/image-300X150.jpg 300w, $siteurl/wp-content/image-600X300.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" /> |
2365 | 2365 | MARKUP; |
2366 | 2366 | $instance = autoptimizeImages::instance(); |
2367 | - $instance->set_options( $opts ); |
|
2368 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2369 | - $this->assertEquals( $expected, $actual ); |
|
2367 | + $instance->set_options($opts); |
|
2368 | + $actual = $instance->filter_optimize_images($markup); |
|
2369 | + $this->assertEquals($expected, $actual); |
|
2370 | 2370 | } |
2371 | 2371 | |
2372 | 2372 | /** |
@@ -2391,9 +2391,9 @@ discard block |
||
2391 | 2391 | <picture><source srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture> |
2392 | 2392 | MARKUP; |
2393 | 2393 | $instance = autoptimizeImages::instance(); |
2394 | - $instance->set_options( $opts ); |
|
2395 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2396 | - $this->assertEquals( $expected, $actual ); |
|
2394 | + $instance->set_options($opts); |
|
2395 | + $actual = $instance->filter_optimize_images($markup); |
|
2396 | + $this->assertEquals($expected, $actual); |
|
2397 | 2397 | } |
2398 | 2398 | |
2399 | 2399 | /** |
@@ -2418,9 +2418,9 @@ discard block |
||
2418 | 2418 | <picture><source data-srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><noscript><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></noscript><img class="lazyload" src='$imgopthost/client/q_lqip,ret_wait/$siteurl/wp-content/image.jpg' data-src="https://cdn.shortpixel.ai/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture> |
2419 | 2419 | MARKUP; |
2420 | 2420 | $instance = autoptimizeImages::instance(); |
2421 | - $instance->set_options( $opts ); |
|
2422 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2423 | - $this->assertEquals( $expected, $actual ); |
|
2421 | + $instance->set_options($opts); |
|
2422 | + $actual = $instance->filter_optimize_images($markup); |
|
2423 | + $this->assertEquals($expected, $actual); |
|
2424 | 2424 | } |
2425 | 2425 | |
2426 | 2426 | /** |
@@ -2446,9 +2446,9 @@ discard block |
||
2446 | 2446 | MARKUP; |
2447 | 2447 | |
2448 | 2448 | $instance = autoptimizeImages::instance(); |
2449 | - $instance->set_options( $opts ); |
|
2450 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2451 | - $this->assertEquals( $expected, $actual ); |
|
2449 | + $instance->set_options($opts); |
|
2450 | + $actual = $instance->filter_optimize_images($markup); |
|
2451 | + $this->assertEquals($expected, $actual); |
|
2452 | 2452 | } |
2453 | 2453 | |
2454 | 2454 | /** |
@@ -2474,9 +2474,9 @@ discard block |
||
2474 | 2474 | MARKUP; |
2475 | 2475 | |
2476 | 2476 | $instance = autoptimizeImages::instance(); |
2477 | - $instance->set_options( $opts ); |
|
2478 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2479 | - $this->assertEquals( $expected, $actual ); |
|
2477 | + $instance->set_options($opts); |
|
2478 | + $actual = $instance->filter_optimize_images($markup); |
|
2479 | + $this->assertEquals($expected, $actual); |
|
2480 | 2480 | } |
2481 | 2481 | |
2482 | 2482 | /** |
@@ -2501,9 +2501,9 @@ discard block |
||
2501 | 2501 | MARKUP; |
2502 | 2502 | |
2503 | 2503 | $instance = autoptimizeImages::instance(); |
2504 | - $instance->set_options( $opts ); |
|
2505 | - $actual = $instance->filter_lazyload_images( $markup ); |
|
2506 | - $this->assertEquals( $expected, $actual ); |
|
2504 | + $instance->set_options($opts); |
|
2505 | + $actual = $instance->filter_lazyload_images($markup); |
|
2506 | + $this->assertEquals($expected, $actual); |
|
2507 | 2507 | } |
2508 | 2508 | |
2509 | 2509 | /** |
@@ -2528,9 +2528,9 @@ discard block |
||
2528 | 2528 | MARKUP; |
2529 | 2529 | |
2530 | 2530 | $instance = autoptimizeImages::instance(); |
2531 | - $instance->set_options( $opts ); |
|
2532 | - $actual = $instance->filter_lazyload_images( $markup ); |
|
2533 | - $this->assertEquals( $expected, $actual ); |
|
2531 | + $instance->set_options($opts); |
|
2532 | + $actual = $instance->filter_lazyload_images($markup); |
|
2533 | + $this->assertEquals($expected, $actual); |
|
2534 | 2534 | } |
2535 | 2535 | |
2536 | 2536 | /** |
@@ -2555,9 +2555,9 @@ discard block |
||
2555 | 2555 | MARKUP; |
2556 | 2556 | |
2557 | 2557 | $instance = autoptimizeImages::instance(); |
2558 | - $instance->set_options( $opts ); |
|
2559 | - $actual = $instance->filter_lazyload_images( $markup ); |
|
2560 | - $this->assertEquals( $expected, $actual ); |
|
2558 | + $instance->set_options($opts); |
|
2559 | + $actual = $instance->filter_lazyload_images($markup); |
|
2560 | + $this->assertEquals($expected, $actual); |
|
2561 | 2561 | } |
2562 | 2562 | |
2563 | 2563 | /** |
@@ -2576,11 +2576,11 @@ discard block |
||
2576 | 2576 | MARKUP; |
2577 | 2577 | |
2578 | 2578 | $instance = autoptimizeImages::instance(); |
2579 | - $instance->set_options( $opts ); |
|
2580 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2579 | + $instance->set_options($opts); |
|
2580 | + $actual = $instance->filter_optimize_images($markup); |
|
2581 | 2581 | |
2582 | 2582 | // Expecting $markup since replacement should not happen. |
2583 | - $this->assertEquals( $markup, $actual ); |
|
2583 | + $this->assertEquals($markup, $actual); |
|
2584 | 2584 | } |
2585 | 2585 | |
2586 | 2586 | /** |
@@ -2606,10 +2606,10 @@ discard block |
||
2606 | 2606 | MARKUP; |
2607 | 2607 | |
2608 | 2608 | $instance = autoptimizeImages::instance(); |
2609 | - $instance->set_options( $opts ); |
|
2610 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2609 | + $instance->set_options($opts); |
|
2610 | + $actual = $instance->filter_optimize_images($markup); |
|
2611 | 2611 | |
2612 | - $this->assertEquals( $expected, $actual ); |
|
2612 | + $this->assertEquals($expected, $actual); |
|
2613 | 2613 | } |
2614 | 2614 | |
2615 | 2615 | /** |
@@ -2619,8 +2619,8 @@ discard block |
||
2619 | 2619 | { |
2620 | 2620 | $urls = $this->get_urls(); |
2621 | 2621 | $siteurl = $urls['siteurl']; |
2622 | - $siteurlparsed = parse_url( $siteurl ); |
|
2623 | - $sitedomain = $siteurlparsed['scheme'] . '://' . $siteurlparsed['host']; |
|
2622 | + $siteurlparsed = parse_url($siteurl); |
|
2623 | + $sitedomain = $siteurlparsed['scheme'].'://'.$siteurlparsed['host']; |
|
2624 | 2624 | $imgopthost = $urls['imgopthost']; |
2625 | 2625 | $opts = autoptimizeImages::fetch_options(); |
2626 | 2626 | $opts['autoptimize_imgopt_checkbox_field_1'] = '1'; |
@@ -2635,10 +2635,10 @@ discard block |
||
2635 | 2635 | MARKUP; |
2636 | 2636 | |
2637 | 2637 | $instance = autoptimizeImages::instance(); |
2638 | - $instance->set_options( $opts ); |
|
2639 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2638 | + $instance->set_options($opts); |
|
2639 | + $actual = $instance->filter_optimize_images($markup); |
|
2640 | 2640 | |
2641 | - $this->assertEquals( $expected, $actual ); |
|
2641 | + $this->assertEquals($expected, $actual); |
|
2642 | 2642 | } |
2643 | 2643 | |
2644 | 2644 | /** |
@@ -2663,53 +2663,53 @@ discard block |
||
2663 | 2663 | MARKUP; |
2664 | 2664 | |
2665 | 2665 | $instance = autoptimizeImages::instance(); |
2666 | - $instance->set_options( $opts ); |
|
2667 | - $actual = $instance->filter_optimize_images( $markup ); |
|
2666 | + $instance->set_options($opts); |
|
2667 | + $actual = $instance->filter_optimize_images($markup); |
|
2668 | 2668 | |
2669 | - $this->assertEquals( $expected, $actual ); |
|
2669 | + $this->assertEquals($expected, $actual); |
|
2670 | 2670 | } |
2671 | 2671 | |
2672 | 2672 | /** |
2673 | 2673 | * @dataProvider provider_str_is_valid_regex |
2674 | 2674 | */ |
2675 | - public function test_str_is_valid_regex( $str, $expected ) |
|
2675 | + public function test_str_is_valid_regex($str, $expected) |
|
2676 | 2676 | { |
2677 | - $actual = autoptimizeUtils::str_is_valid_regex( $str ); |
|
2677 | + $actual = autoptimizeUtils::str_is_valid_regex($str); |
|
2678 | 2678 | |
2679 | - $this->assertEquals( $expected, $actual ); |
|
2679 | + $this->assertEquals($expected, $actual); |
|
2680 | 2680 | } |
2681 | 2681 | |
2682 | 2682 | public function provider_str_is_valid_regex() |
2683 | 2683 | { |
2684 | 2684 | return [ |
2685 | - [ '<!--[if', false ], |
|
2686 | - [ '<--[if', false ], |
|
2687 | - [ '/booya/i', true ], |
|
2688 | - [ '~Valid(Regular)Expression~', true ], |
|
2685 | + ['<!--[if', false], |
|
2686 | + ['<--[if', false], |
|
2687 | + ['/booya/i', true], |
|
2688 | + ['~Valid(Regular)Expression~', true], |
|
2689 | 2689 | ]; |
2690 | 2690 | } |
2691 | 2691 | |
2692 | 2692 | /** |
2693 | 2693 | * @dataProvider provider_protocol_relative_tests |
2694 | 2694 | */ |
2695 | - public function test_is_protocol_relative( $str, $expected ) |
|
2695 | + public function test_is_protocol_relative($str, $expected) |
|
2696 | 2696 | { |
2697 | - $actual = autoptimizeUtils::is_protocol_relative( $str ); |
|
2697 | + $actual = autoptimizeUtils::is_protocol_relative($str); |
|
2698 | 2698 | |
2699 | - $this->assertEquals( $expected, $actual ); |
|
2699 | + $this->assertEquals($expected, $actual); |
|
2700 | 2700 | } |
2701 | 2701 | |
2702 | 2702 | public function provider_protocol_relative_tests() |
2703 | 2703 | { |
2704 | 2704 | return [ |
2705 | - [ '//something-that-might-be-an-url-but-isnt-really', true ], |
|
2706 | - [ '', false ], |
|
2707 | - [ null, false ], |
|
2708 | - [ 'booya/i', false ], |
|
2709 | - [ '/root-relative', false ], |
|
2710 | - [ 'http://what.ever/', false ], |
|
2711 | - [ 'https://booya.kasha', false ], |
|
2712 | - [ '1/', false ], |
|
2705 | + ['//something-that-might-be-an-url-but-isnt-really', true], |
|
2706 | + ['', false], |
|
2707 | + [null, false], |
|
2708 | + ['booya/i', false], |
|
2709 | + ['/root-relative', false], |
|
2710 | + ['http://what.ever/', false], |
|
2711 | + ['https://booya.kasha', false], |
|
2712 | + ['1/', false], |
|
2713 | 2713 | ]; |
2714 | 2714 | } |
2715 | 2715 | |
@@ -2724,38 +2724,38 @@ discard block |
||
2724 | 2724 | |
2725 | 2725 | $expected = 'img.centered,.aligncenter{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}'; |
2726 | 2726 | |
2727 | - $instance = new autoptimizeStyles( $css ); |
|
2728 | - $minified = $instance->run_minifier_on( $css ); |
|
2727 | + $instance = new autoptimizeStyles($css); |
|
2728 | + $minified = $instance->run_minifier_on($css); |
|
2729 | 2729 | |
2730 | - $this->assertEquals( $expected, $minified ); |
|
2730 | + $this->assertEquals($expected, $minified); |
|
2731 | 2731 | } |
2732 | 2732 | |
2733 | 2733 | public function test_css_font_names_mangling() |
2734 | 2734 | { |
2735 | 2735 | // Properly quoted font names dont get mangled. |
2736 | 2736 | $css = 'h2{font-family:"Archivo Black"}'; |
2737 | - $instance = new autoptimizeStyles( $css ); |
|
2738 | - $actual = $instance->run_minifier_on( $css ); |
|
2739 | - $this->assertEquals( $css, $actual ); |
|
2737 | + $instance = new autoptimizeStyles($css); |
|
2738 | + $actual = $instance->run_minifier_on($css); |
|
2739 | + $this->assertEquals($css, $actual); |
|
2740 | 2740 | |
2741 | 2741 | // When not quoted, 'Black' used to become '#000', but not anymore :) ... |
2742 | 2742 | $css_unquoted = 'h2{font-family:Archivo Black;}'; |
2743 | 2743 | $expected = 'h2{font-family:Archivo Black}'; |
2744 | - $instance = new autoptimizeStyles( $css_unquoted ); |
|
2745 | - $actual = $instance->run_minifier_on( $css_unquoted ); |
|
2746 | - $this->assertEquals( $expected, $actual ); |
|
2744 | + $instance = new autoptimizeStyles($css_unquoted); |
|
2745 | + $actual = $instance->run_minifier_on($css_unquoted); |
|
2746 | + $this->assertEquals($expected, $actual); |
|
2747 | 2747 | |
2748 | 2748 | $css_unquoted = 'h1{font:italic 1.2em Fira White,serif}'; |
2749 | - $instance = new autoptimizeStyles( $css_unquoted ); |
|
2750 | - $actual = $instance->run_minifier_on( $css_unquoted ); |
|
2751 | - $this->assertEquals( $css_unquoted, $actual ); |
|
2749 | + $instance = new autoptimizeStyles($css_unquoted); |
|
2750 | + $actual = $instance->run_minifier_on($css_unquoted); |
|
2751 | + $this->assertEquals($css_unquoted, $actual); |
|
2752 | 2752 | } |
2753 | 2753 | |
2754 | 2754 | public function test_is_plugin_active_utils_wrapper() |
2755 | 2755 | { |
2756 | 2756 | // Our plugin is loaded via "muplugins_loaded" filter in tests/bootstrap.php. |
2757 | - $this->assertFalse( autoptimizeUtils::is_plugin_active( 'autoptimize/autoptimize.php' ) ); |
|
2758 | - $this->assertFalse( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) ); |
|
2757 | + $this->assertFalse(autoptimizeUtils::is_plugin_active('autoptimize/autoptimize.php')); |
|
2758 | + $this->assertFalse(autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php')); |
|
2759 | 2759 | } |
2760 | 2760 | |
2761 | 2761 | public function test_jsminphp_string_literal_minification() |
@@ -2769,8 +2769,8 @@ discard block |
||
2769 | 2769 | $expected = '`line |
2770 | 2770 | break`+`he llo`;foo`hel( \'\');lo`;`he\nl\`lo`;(`he${one + two}`)'; |
2771 | 2771 | |
2772 | - $actual = JSMin::minify( $js ); |
|
2773 | - $this->assertEquals( $expected, $actual ); |
|
2772 | + $actual = JSMin::minify($js); |
|
2773 | + $this->assertEquals($expected, $actual); |
|
2774 | 2774 | } |
2775 | 2775 | |
2776 | 2776 | /** |
@@ -2790,9 +2790,9 @@ discard block |
||
2790 | 2790 | MARKUP; |
2791 | 2791 | |
2792 | 2792 | $instance = autoptimizeExtra::instance(); |
2793 | - $instance->set_options( $opts ); |
|
2794 | - $actual = $instance->filter_preload( $markup ); |
|
2795 | - $this->assertEquals( $expected, $actual ); |
|
2793 | + $instance->set_options($opts); |
|
2794 | + $actual = $instance->filter_preload($markup); |
|
2795 | + $this->assertEquals($expected, $actual); |
|
2796 | 2796 | } |
2797 | 2797 | |
2798 | 2798 | /** |
@@ -2812,9 +2812,9 @@ discard block |
||
2812 | 2812 | MARKUP; |
2813 | 2813 | |
2814 | 2814 | $instance = autoptimizeExtra::instance(); |
2815 | - $instance->set_options( $opts ); |
|
2816 | - $actual = $instance->filter_preload( $markup ); |
|
2817 | - $this->assertEquals( $expected, $actual ); |
|
2815 | + $instance->set_options($opts); |
|
2816 | + $actual = $instance->filter_preload($markup); |
|
2817 | + $this->assertEquals($expected, $actual); |
|
2818 | 2818 | } |
2819 | 2819 | |
2820 | 2820 | /** |
@@ -2834,9 +2834,9 @@ discard block |
||
2834 | 2834 | MARKUP; |
2835 | 2835 | |
2836 | 2836 | $instance = autoptimizeExtra::instance(); |
2837 | - $instance->set_options( $opts ); |
|
2838 | - $actual = $instance->filter_optimize_google_fonts( $markup ); |
|
2839 | - $this->assertEquals( $expected, $actual ); |
|
2837 | + $instance->set_options($opts); |
|
2838 | + $actual = $instance->filter_optimize_google_fonts($markup); |
|
2839 | + $this->assertEquals($expected, $actual); |
|
2840 | 2840 | } |
2841 | 2841 | |
2842 | 2842 | /** |
@@ -2844,19 +2844,19 @@ discard block |
||
2844 | 2844 | */ |
2845 | 2845 | public function test_network_no_site_settings() |
2846 | 2846 | { |
2847 | - if ( is_multisite() ) { |
|
2848 | - define( 'TEST_MULTISITE_FORCE_AO_ON_NETWORK', true ); |
|
2847 | + if (is_multisite()) { |
|
2848 | + define('TEST_MULTISITE_FORCE_AO_ON_NETWORK', true); |
|
2849 | 2849 | // set options through WordPress core methods. |
2850 | - update_option( 'autoptimize_js_exclude', 'site' ); |
|
2851 | - update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' ); |
|
2852 | - update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', '' ); |
|
2850 | + update_option('autoptimize_js_exclude', 'site'); |
|
2851 | + update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network'); |
|
2852 | + update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', ''); |
|
2853 | 2853 | |
2854 | 2854 | // and then try fetching them through optionwrapper. |
2855 | 2855 | $expected = 'network'; |
2856 | - $actual = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' ); |
|
2857 | - $this->assertEquals( $expected, $actual ); |
|
2856 | + $actual = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude'); |
|
2857 | + $this->assertEquals($expected, $actual); |
|
2858 | 2858 | } else { |
2859 | - $this->assertEquals( 1, 1 ); // just to ensure this isn't marked as a risky test. |
|
2859 | + $this->assertEquals(1, 1); // just to ensure this isn't marked as a risky test. |
|
2860 | 2860 | } |
2861 | 2861 | } |
2862 | 2862 | |
@@ -2865,19 +2865,19 @@ discard block |
||
2865 | 2865 | */ |
2866 | 2866 | public function test_network_per_site_settings() |
2867 | 2867 | { |
2868 | - if ( is_multisite() ) { |
|
2868 | + if (is_multisite()) { |
|
2869 | 2869 | // define of TEST_MULTISITE_FORCE_AO_ON_NETWORK not needed, done in previous test. |
2870 | 2870 | // set options through WordPress core methods. |
2871 | - update_option( 'autoptimize_js_exclude', 'site' ); |
|
2872 | - update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' ); |
|
2873 | - update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', 'on' ); |
|
2871 | + update_option('autoptimize_js_exclude', 'site'); |
|
2872 | + update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network'); |
|
2873 | + update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', 'on'); |
|
2874 | 2874 | |
2875 | 2875 | // and then try fetching them through optionwrapper. |
2876 | 2876 | $expected = 'site'; |
2877 | - $actual = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' ); |
|
2878 | - $this->assertEquals( $expected, $actual ); |
|
2877 | + $actual = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude'); |
|
2878 | + $this->assertEquals($expected, $actual); |
|
2879 | 2879 | } else { |
2880 | - $this->assertEquals( 1, 1 ); // just to ensure this isn't marked as a risky test. |
|
2880 | + $this->assertEquals(1, 1); // just to ensure this isn't marked as a risky test. |
|
2881 | 2881 | } |
2882 | 2882 | } |
2883 | 2883 | } |