Completed
Push — master ( a3ebdc...98ed08 )
by frank
56:55
created
classes/autoptimizeUtils.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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_strlen( $haystack, $needle, $offset, $encoding );
47
+        if (self::mbstring_available()) {
48
+            return (null === $encoding) ? \mb_strpos($haystack, $needle, $offset) : \mb_strlen($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
 block discarded – undo
62 62
      * @return int Number of charcters 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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 = ( '/' === $url{1} ); // second char is `/`.
269
+        if (!empty($url)) {
270
+            $result = ('/' === $url{1} ); // second char is `/`.
271 271
         }
272 272
 
273 273
         return $result;
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     /**
@@ -305,15 +305,15 @@  discard block
 block discarded – undo
305 305
      *
306 306
      * @return none if $return_result is false (default), array if $return_result is true.
307 307
      */
308
-    public static function check_service_availability( $return_result = false )
308
+    public static function check_service_availability($return_result = false)
309 309
     {
310
-        $service_availability_resp = wp_remote_get( 'https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
311
-        if ( ! is_wp_error( $service_availability_resp ) ) {
312
-            if ( '200' == wp_remote_retrieve_response_code( $service_availability_resp ) ) {
313
-                $availabilities = json_decode( wp_remote_retrieve_body( $service_availability_resp ), true );
314
-                if ( is_array( $availabilities ) ) {
315
-                    update_option( 'autoptimize_service_availablity', $availabilities );
316
-                    if ( $return_result ) {
310
+        $service_availability_resp = wp_remote_get('https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver='.AUTOPTIMIZE_PLUGIN_VERSION);
311
+        if (!is_wp_error($service_availability_resp)) {
312
+            if ('200' == wp_remote_retrieve_response_code($service_availability_resp)) {
313
+                $availabilities = json_decode(wp_remote_retrieve_body($service_availability_resp), true);
314
+                if (is_array($availabilities)) {
315
+                    update_option('autoptimize_service_availablity', $availabilities);
316
+                    if ($return_result) {
317 317
                         return $availabilities;
318 318
                     }
319 319
                 }
@@ -328,10 +328,10 @@  discard block
 block discarded – undo
328 328
      *
329 329
      * @return bool
330 330
      */
331
-    public static function str_is_valid_regex( $string )
331
+    public static function str_is_valid_regex($string)
332 332
     {
333
-        set_error_handler( function() {}, E_WARNING );
334
-        $is_regex = ( false !== preg_match( $string, '' ) );
333
+        set_error_handler(function() {}, E_WARNING);
334
+        $is_regex = (false !== preg_match($string, ''));
335 335
         restore_error_handler();
336 336
 
337 337
         return $is_regex;
Please login to merge, or discard this patch.
tests/test-ao.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -128,6 +128,9 @@
 block discarded – undo
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'];
Please login to merge, or discard this patch.
Spacing   +376 added lines, -376 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
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,16 +28,16 @@  discard block
 block discarded – undo
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' ),
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 41
         ];
42 42
     }
43 43
 
@@ -46,13 +46,13 @@  discard block
 block discarded – undo
46 46
         $conf = autoptimizeConfig::instance();
47 47
 
48 48
         return [
49
-            'aggregate'      => $conf->get( 'autoptimize_js_aggregate' ),
50
-            'justhead'       => $conf->get( 'autoptimize_js_justhead' ),
51
-            'forcehead'      => $conf->get( 'autoptimize_js_forcehead' ),
52
-            'trycatch'       => $conf->get( 'autoptimize_js_trycatch' ),
53
-            'js_exclude'     => $conf->get( 'autoptimize_js_exclude' ),
54
-            'cdn_url'        => $conf->get( 'autoptimize_cdn_url' ),
55
-            'include_inline' => $conf->get( 'autoptimize_js_include_inline' ),
49
+            'aggregate'      => $conf->get('autoptimize_js_aggregate'),
50
+            'justhead'       => $conf->get('autoptimize_js_justhead'),
51
+            'forcehead'      => $conf->get('autoptimize_js_forcehead'),
52
+            'trycatch'       => $conf->get('autoptimize_js_trycatch'),
53
+            'js_exclude'     => $conf->get('autoptimize_js_exclude'),
54
+            'cdn_url'        => $conf->get('autoptimize_cdn_url'),
55
+            'include_inline' => $conf->get('autoptimize_js_include_inline'),
56 56
         ];
57 57
     }
58 58
 
@@ -62,34 +62,34 @@  discard block
 block discarded – undo
62 62
     protected function get_urls()
63 63
     {
64 64
         static $site_url = null;
65
-        if ( null === $site_url ) {
65
+        if (null === $site_url) {
66 66
             $site_url = site_url();
67 67
         }
68 68
 
69 69
         static $cdn_url = null;
70
-        if ( null === $cdn_url ) {
71
-            $cdn_url = get_option( 'autoptimize_cdn_url' );
70
+        if (null === $cdn_url) {
71
+            $cdn_url = get_option('autoptimize_cdn_url');
72 72
         }
73 73
 
74 74
         static $imgopt_host = null;
75
-        if ( null === $imgopt_host ) {
76
-            $imgopt_host = rtrim( autoptimizeExtra::get_imgopt_host_wrapper(), '/' );
75
+        if (null === $imgopt_host) {
76
+            $imgopt_host = rtrim(autoptimizeExtra::get_imgopt_host_wrapper(), '/');
77 77
         }
78 78
 
79 79
         static $urls = [];
80 80
 
81
-        if ( empty( $urls ) ) {
81
+        if (empty($urls)) {
82 82
             $parts = autoptimizeUtils::get_ao_wp_site_url_parts();
83 83
             $urls  = [
84 84
                 'siteurl'    => $site_url,
85
-                'prsiteurl'  => '//' . str_replace( array( 'http://', 'https://' ), '', $site_url ),
86
-                'wwwsiteurl' => $parts['scheme'] . '://www.' . str_replace( 'www.', '', $parts['host'] ),
85
+                'prsiteurl'  => '//'.str_replace(array('http://', 'https://'), '', $site_url),
86
+                'wwwsiteurl' => $parts['scheme'].'://www.'.str_replace('www.', '', $parts['host']),
87 87
                 'cdnurl'     => $cdn_url,
88 88
                 'imgopthost' => $imgopt_host,
89 89
                 'subfolder'  => '',
90 90
             ];
91 91
 
92
-            if ( AO_TEST_SUBFOLDER_INSTALL ) {
92
+            if (AO_TEST_SUBFOLDER_INSTALL) {
93 93
                 $urls['subfolder'] = 'wordpress/';
94 94
             }
95 95
         }
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
      */
103 103
     public function setUp()
104 104
     {
105
-        $this->ao = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE );
105
+        $this->ao = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE);
106 106
 
107 107
         parent::setUp();
108 108
     }
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
             'autoptimize_filter_css_inlinesize',
122 122
             'autoptimize_filter_css_fonts_cdn',
123 123
         );
124
-        foreach ( $filter_tags as $filter_tag ) {
125
-            remove_all_filters( $filter_tag );
124
+        foreach ($filter_tags as $filter_tag) {
125
+            remove_all_filters($filter_tag);
126 126
         }
127 127
 
128 128
         parent::tearDown();
@@ -246,15 +246,15 @@  discard block
 block discarded – undo
246 246
     protected function get_test_markup_output()
247 247
     {
248 248
         $key = 'default';
249
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
249
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
250 250
             $key = 'custom';
251 251
         }
252 252
 
253
-        $csspart = self::$flexible_url_parts_css[ $key ];
254
-        $jspart  = self::$flexible_url_parts_js[ $key ];
253
+        $csspart = self::$flexible_url_parts_css[$key];
254
+        $jspart  = self::$flexible_url_parts_js[$key];
255 255
 
256 256
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
257
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
257
+        if (AO_TEST_SUBFOLDER_INSTALL) {
258 258
             $csshash = '56398de576d59887e88e3011715250e0';
259 259
         }
260 260
 
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
313 313
     protected function get_test_markup_output_ms()
314 314
     {
315 315
         $key = 'multisite';
316
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
316
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
317 317
             $key = 'multisite_custom';
318 318
         }
319 319
 
320
-        $csspart = self::$flexible_url_parts_css[ $key ];
321
-        $jspart  = self::$flexible_url_parts_js[ $key ];
320
+        $csspart = self::$flexible_url_parts_css[$key];
321
+        $jspart  = self::$flexible_url_parts_js[$key];
322 322
 
323 323
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
324
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
324
+        if (AO_TEST_SUBFOLDER_INSTALL) {
325 325
             $csshash = '56398de576d59887e88e3011715250e0';
326 326
         }
327 327
 
@@ -380,15 +380,15 @@  discard block
 block discarded – undo
380 380
     protected function get_test_markup_output_inline_defer()
381 381
     {
382 382
         $key = 'default';
383
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
383
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
384 384
             $key = 'custom';
385 385
         }
386 386
 
387
-        $csspart = self::$flexible_url_parts_css[ $key ];
388
-        $jspart  = self::$flexible_url_parts_js[ $key ];
387
+        $csspart = self::$flexible_url_parts_css[$key];
388
+        $jspart  = self::$flexible_url_parts_js[$key];
389 389
 
390 390
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
391
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
391
+        if (AO_TEST_SUBFOLDER_INSTALL) {
392 392
             $csshash = '56398de576d59887e88e3011715250e0';
393 393
         }
394 394
 
@@ -447,15 +447,15 @@  discard block
 block discarded – undo
447 447
     protected function get_test_markup_output_inline_defer_ms()
448 448
     {
449 449
         $key = 'multisite';
450
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
450
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
451 451
             $key = 'multisite_custom';
452 452
         }
453 453
 
454
-        $csspart = self::$flexible_url_parts_css[ $key ];
455
-        $jspart  = self::$flexible_url_parts_js[ $key ];
454
+        $csspart = self::$flexible_url_parts_css[$key];
455
+        $jspart  = self::$flexible_url_parts_js[$key];
456 456
 
457 457
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
458
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
458
+        if (AO_TEST_SUBFOLDER_INSTALL) {
459 459
             $csshash = '56398de576d59887e88e3011715250e0';
460 460
         }
461 461
 
@@ -514,11 +514,11 @@  discard block
 block discarded – undo
514 514
     /**
515 515
      * @dataProvider provider_test_rewrite_markup_with_cdn
516 516
      */
517
-    function test_rewrite_markup_with_cdn( $input, $expected )
517
+    function test_rewrite_markup_with_cdn($input, $expected)
518 518
     {
519
-        $actual = $this->ao->end_buffering( $input );
519
+        $actual = $this->ao->end_buffering($input);
520 520
 
521
-        $this->assertEquals( $expected, $actual );
521
+        $this->assertEquals($expected, $actual);
522 522
     }
523 523
 
524 524
     public function provider_test_rewrite_markup_with_cdn()
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
                 $this->get_test_markup(),
531 531
                 // Expected output.
532 532
                 // TODO/FIXME: This seemed like the fastest way to get MS crude test to pass...
533
-                ( is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output() ),
533
+                (is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output()),
534 534
             ),
535 535
 
536 536
         );
@@ -590,12 +590,12 @@  discard block
 block discarded – undo
590 590
 }
591 591
 CSS;
592 592
 
593
-        $instance = new autoptimizeStyles( $css_in );
594
-        $instance->setOption( 'cdn_url', $cdnurl );
593
+        $instance = new autoptimizeStyles($css_in);
594
+        $instance->setOption('cdn_url', $cdnurl);
595 595
 
596
-        $css_actual = $instance->rewrite_assets( $css_in );
596
+        $css_actual = $instance->rewrite_assets($css_in);
597 597
 
598
-        $this->assertEquals( $css_expected, $css_actual );
598
+        $this->assertEquals($css_expected, $css_actual);
599 599
     }
600 600
 
601 601
     public function test_default_cssmin_minifier()
@@ -629,22 +629,22 @@  discard block
 block discarded – undo
629 629
 .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')}
630 630
 CSS;
631 631
 
632
-        $instance = new autoptimizeStyles( $css );
633
-        $minified = $instance->run_minifier_on( $css );
632
+        $instance = new autoptimizeStyles($css);
633
+        $minified = $instance->run_minifier_on($css);
634 634
 
635
-        $this->assertEquals( $expected, $minified );
635
+        $this->assertEquals($expected, $minified);
636 636
     }
637 637
 
638 638
     /**
639 639
      * @dataProvider provider_test_should_aggregate_script_types
640 640
      * @covers autoptimizeScripts::should_aggregate
641 641
      */
642
-    public function test_should_aggregate_script_types( $input, $expected )
642
+    public function test_should_aggregate_script_types($input, $expected)
643 643
     {
644
-        $instance = new autoptimizeScripts( '' );
645
-        $actual   = $instance->should_aggregate( $input );
644
+        $instance = new autoptimizeScripts('');
645
+        $actual   = $instance->should_aggregate($input);
646 646
 
647
-        $this->assertEquals( $expected, $actual );
647
+        $this->assertEquals($expected, $actual);
648 648
     }
649 649
 
650 650
     public function provider_test_should_aggregate_script_types()
@@ -707,11 +707,11 @@  discard block
 block discarded – undo
707 707
      * @dataProvider provider_is_valid_buffer
708 708
      * @covers autoptimizeMain::is_valid_buffer
709 709
      */
710
-    public function test_valid_buffers( $input, $expected )
710
+    public function test_valid_buffers($input, $expected)
711 711
     {
712
-        $actual = $this->ao->is_valid_buffer( $input );
712
+        $actual = $this->ao->is_valid_buffer($input);
713 713
 
714
-        $this->assertEquals( $expected, $actual );
714
+        $this->assertEquals($expected, $actual);
715 715
     }
716 716
 
717 717
     public function provider_is_valid_buffer()
@@ -774,11 +774,11 @@  discard block
 block discarded – undo
774 774
      * @dataProvider provider_is_amp_markup
775 775
      * @covers autoptimizeMain::is_amp_markup
776 776
      */
777
-    public function test_autoptimize_is_amp_markup( $input, $expected )
777
+    public function test_autoptimize_is_amp_markup($input, $expected)
778 778
     {
779
-        $actual = autoptimizeMain::is_amp_markup( $input );
779
+        $actual = autoptimizeMain::is_amp_markup($input);
780 780
 
781
-        $this->assertEquals( $expected, $actual );
781
+        $this->assertEquals($expected, $actual);
782 782
     }
783 783
 
784 784
     public function provider_is_amp_markup()
@@ -809,31 +809,31 @@  discard block
 block discarded – undo
809 809
     public function test_skips_buffering_when_ao_noptimize_filter_is_true()
810 810
     {
811 811
         // True => disable autoptimize.
812
-        add_filter( 'autoptimize_filter_noptimize', '__return_true' );
812
+        add_filter('autoptimize_filter_noptimize', '__return_true');
813 813
 
814 814
         // Buffering should not run due to the above filter.
815 815
         $expected = false;
816
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
816
+        $actual   = $this->ao->should_buffer($doing_tests = true);
817 817
 
818
-        $this->assertEquals( $expected, $actual );
818
+        $this->assertEquals($expected, $actual);
819 819
     }
820 820
 
821 821
     public function test_does_buffering_when_ao_noptimize_filter_is_false()
822 822
     {
823 823
         // False => disable noptimize, aka, run normally (weird, yes...).
824
-        add_filter( 'autoptimize_filter_noptimize', '__return_false' );
824
+        add_filter('autoptimize_filter_noptimize', '__return_false');
825 825
 
826 826
         // Buffering should run because of above.
827 827
         $expected = true;
828
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
828
+        $actual   = $this->ao->should_buffer($doing_tests = true);
829 829
 
830
-        $this->assertEquals( $expected, $actual );
830
+        $this->assertEquals($expected, $actual);
831 831
     }
832 832
 
833 833
     public function test_ignores_ao_noptimize_qs_when_instructed()
834 834
     {
835 835
         // Should skip checking for the qs completely due to filter.
836
-        add_filter( 'autoptimize_filter_honor_qs_noptimize', '__return_false' );
836
+        add_filter('autoptimize_filter_honor_qs_noptimize', '__return_false');
837 837
 
838 838
         /**
839 839
          * The above should then result in the "current" value being `false`
@@ -844,23 +844,23 @@  discard block
 block discarded – undo
844 844
          */
845 845
 
846 846
         $that = $this; // Makes it work on php 5.3!
847
-        add_filter( 'autoptimize_filter_noptimize', function ( $current_value ) use ( $that ) {
847
+        add_filter('autoptimize_filter_noptimize', function($current_value) use ($that) {
848 848
             $expected = false;
849
-            if ( defined( 'DONOTMINIFY' ) && DONOTMINIFY ) {
849
+            if (defined('DONOTMINIFY') && DONOTMINIFY) {
850 850
                 $expected = true;
851 851
             }
852 852
 
853
-            $that->assertEquals( $expected, $current_value );
853
+            $that->assertEquals($expected, $current_value);
854 854
         });
855 855
 
856
-        $this->ao->should_buffer( $doing_tests = true );
856
+        $this->ao->should_buffer($doing_tests = true);
857 857
     }
858 858
 
859 859
     public function test_wpengine_cache_flush()
860 860
     {
861 861
         // Creating a mock so that we can get past class_exists() and method_exists() checks present
862 862
         // in `autoptimizeCache::flushPageCache()`...
863
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
863
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
864 864
                 ->disableOriginalConstructor()->setMethods(
865 865
                     array(
866 866
                         'purge_varnish_cache',
@@ -869,9 +869,9 @@  discard block
 block discarded – undo
869 869
                 ->getMock();
870 870
 
871 871
         $that = $this;
872
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
873
-            $expected_methods = array( 'purge_varnish_cache' );
874
-            $that->assertEquals( $methods, $expected_methods );
872
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
873
+            $expected_methods = array('purge_varnish_cache');
874
+            $that->assertEquals($methods, $expected_methods);
875 875
 
876 876
             return $methods;
877 877
         });
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
     public function test_wpengine_cache_flush_agressive()
886 886
     {
887 887
         // Creating a mock so that we can get past class_exists() and method_exists() checks `autoptimize_flush_pagecache()`...
888
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
888
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
889 889
                 ->disableOriginalConstructor()->setMethods(
890 890
                     array(
891 891
                         'purge_varnish_cache',
@@ -895,19 +895,19 @@  discard block
 block discarded – undo
895 895
                 )
896 896
                 ->getMock();
897 897
 
898
-        add_filter( 'autoptimize_flush_wpengine_aggressive', function() {
898
+        add_filter('autoptimize_flush_wpengine_aggressive', function() {
899 899
             return true;
900 900
         });
901 901
 
902 902
         $that = $this;
903
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
903
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
904 904
             $expected_methods = array(
905 905
                 'purge_varnish_cache',
906 906
                 'purge_memcached',
907 907
                 'clear_maxcdn_cache',
908 908
             );
909 909
 
910
-            $that->assertEquals( $methods, $expected_methods );
910
+            $that->assertEquals($methods, $expected_methods);
911 911
 
912 912
             return $methods;
913 913
         });
@@ -919,15 +919,15 @@  discard block
 block discarded – undo
919 919
      * @dataProvider provider_test_url_replace_cdn
920 920
      * @covers autoptimizeBase::url_replace_cdn
921 921
      */
922
-    public function test_url_replace_cdn( $cdn_url, $input, $expected )
922
+    public function test_url_replace_cdn($cdn_url, $input, $expected)
923 923
     {
924
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
924
+        $mock = $this->getMockBuilder('autoptimizeBase')
925 925
                 ->disableOriginalConstructor()
926 926
                 ->getMockForAbstractClass();
927 927
 
928 928
         $mock->cdn_url = $cdn_url;
929
-        $actual        = $mock->url_replace_cdn( $input );
930
-        $this->assertEquals( $expected, $actual );
929
+        $actual        = $mock->url_replace_cdn($input);
930
+        $this->assertEquals($expected, $actual);
931 931
     }
932 932
 
933 933
     public function provider_test_url_replace_cdn()
@@ -944,13 +944,13 @@  discard block
 block discarded – undo
944 944
                 // CDN base url, url, expected result...
945 945
                 'http://cdn-test.example.org',
946 946
                 '/a.jpg',
947
-                'http://cdn-test.example.org/' . $subfolder . 'a.jpg',
947
+                'http://cdn-test.example.org/'.$subfolder.'a.jpg',
948 948
             ),
949 949
             // Full link with a matching AUTOPTIMIZE_WP_SITE_URL gets properly replaced...
950 950
             array(
951 951
                 'http://cdn-test.example.org',
952
-                $siteurl . '/wp-content/themes/something/example.svg',
953
-                'http://cdn-test.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
952
+                $siteurl.'/wp-content/themes/something/example.svg',
953
+                'http://cdn-test.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
954 954
             ),
955 955
             // Protocol-relative url with a "local" hostname that doesn't match example.org (AUTOPTIMIZE_WP_SITE_URL)...
956 956
             array(
@@ -961,59 +961,59 @@  discard block
 block discarded – undo
961 961
             // www.example.org does not match example.org (AUTOPTIMIZE_WP_SITE_URL) so it's left alone...
962 962
             array(
963 963
                 'http://cdn-test.example.org',
964
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
965
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
964
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
965
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
966 966
             ),
967 967
             // SSL cdn url + host-relative link...
968 968
             array(
969 969
                 'https://cdn.example.org',
970 970
                 '/a.jpg',
971
-                'https://cdn.example.org/' . $subfolder . 'a.jpg',
971
+                'https://cdn.example.org/'.$subfolder.'a.jpg',
972 972
             ),
973 973
             // SSL cdn url + http site url that matches AUTOPTIMIZE_WP_SITE_URL is properly replaced...
974 974
             array(
975 975
                 'https://cdn.example.org',
976
-                $siteurl . '/wp-content/themes/something/example.svg',
977
-                'https://cdn.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
976
+                $siteurl.'/wp-content/themes/something/example.svg',
977
+                'https://cdn.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
978 978
             ),
979 979
             // Protocol-relative cdn url given with protocol relative link that matches AUTOPTIMIZE_WP_SITE_URL host...
980 980
             array(
981 981
                 '//cdn.example.org',
982
-                $protorelativesiteurl . '/something.jpg',
983
-                '//cdn.example.org/' . $subfolder . 'something.jpg',
982
+                $protorelativesiteurl.'/something.jpg',
983
+                '//cdn.example.org/'.$subfolder.'something.jpg',
984 984
             ),
985 985
             // Protocol-relative cdn url given a http link that matches AUTOPTIMIZE_WP_SITE_URL host...
986 986
             array(
987 987
                 '//cdn.example.org',
988
-                $siteurl . '/something.png',
989
-                '//cdn.example.org/' . $subfolder . 'something.png',
988
+                $siteurl.'/something.png',
989
+                '//cdn.example.org/'.$subfolder.'something.png',
990 990
             ),
991 991
             // Protocol-relative cdn url with a host-relative link...
992 992
             array(
993 993
                 '//cdn.example.org',
994 994
                 '/a.jpg',
995
-                '//cdn.example.org/' . $subfolder . 'a.jpg',
995
+                '//cdn.example.org/'.$subfolder.'a.jpg',
996 996
             ),
997 997
             // Testing cdn urls with an explicit port number...
998 998
             array(
999 999
                 'http://cdn.com:8080',
1000 1000
                 '/a.jpg',
1001
-                'http://cdn.com:8080/' . $subfolder . 'a.jpg',
1001
+                'http://cdn.com:8080/'.$subfolder.'a.jpg',
1002 1002
             ),
1003 1003
             array(
1004 1004
                 '//cdn.com:4433',
1005 1005
                 '/a.jpg',
1006
-                '//cdn.com:4433/' . $subfolder . 'a.jpg',
1006
+                '//cdn.com:4433/'.$subfolder.'a.jpg',
1007 1007
             ),
1008 1008
             array(
1009 1009
                 '//cdn.com:4433',
1010
-                $siteurl . '/something.jpg',
1011
-                '//cdn.com:4433/' . $subfolder . 'something.jpg',
1010
+                $siteurl.'/something.jpg',
1011
+                '//cdn.com:4433/'.$subfolder.'something.jpg',
1012 1012
             ),
1013 1013
             array(
1014 1014
                 '//cdn.com:1234',
1015
-                $protorelativesiteurl . '/something.jpg',
1016
-                '//cdn.com:1234/' . $subfolder . 'something.jpg',
1015
+                $protorelativesiteurl.'/something.jpg',
1016
+                '//cdn.com:1234/'.$subfolder.'something.jpg',
1017 1017
             ),
1018 1018
             // Relative links should not be touched by url_replace_cdn()...
1019 1019
             array(
@@ -1038,8 +1038,8 @@  discard block
 block discarded – undo
1038 1038
             // even though they are really strange...
1039 1039
             array(
1040 1040
                 $siteurl, // example.org or http://localhost or http://localhost/wordpress
1041
-                $siteurl . '/something.jpg',
1042
-                $siteurl . '/something.jpg',
1041
+                $siteurl.'/something.jpg',
1042
+                $siteurl.'/something.jpg',
1043 1043
             ),
1044 1044
             // These shouldn't really be changed, or even if replacements do
1045 1045
             // happen, they shouldn't be destructive...
@@ -1078,31 +1078,31 @@  discard block
 block discarded – undo
1078 1078
         $test_link = '/a.jpg';
1079 1079
         $cdn_url   = '//cdn.example.org';
1080 1080
 
1081
-        $with_ssl = function( $cdn ) {
1081
+        $with_ssl = function($cdn) {
1082 1082
             return '';
1083 1083
         };
1084 1084
         $expected_with_ssl = '/a.jpg';
1085 1085
 
1086
-        $without_ssl = function( $cdn ) {
1086
+        $without_ssl = function($cdn) {
1087 1087
             return $cdn;
1088 1088
         };
1089
-        $expected_without_ssl = '//cdn.example.org/' . $sub . 'a.jpg';
1089
+        $expected_without_ssl = '//cdn.example.org/'.$sub.'a.jpg';
1090 1090
 
1091 1091
         // With a filter that returns something considered "empty", cdn replacement shouldn't occur...
1092
-        add_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
1093
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
1092
+        add_filter('autoptimize_filter_base_cdnurl', $with_ssl);
1093
+        $mock = $this->getMockBuilder('autoptimizeBase')
1094 1094
                 ->disableOriginalConstructor()
1095 1095
                 ->getMockForAbstractClass();
1096 1096
 
1097 1097
         $mock->cdn_url   = $cdn_url;
1098
-        $actual_with_ssl = $mock->url_replace_cdn( $test_link );
1099
-        $this->assertEquals( $expected_with_ssl, $actual_with_ssl );
1100
-        remove_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
1098
+        $actual_with_ssl = $mock->url_replace_cdn($test_link);
1099
+        $this->assertEquals($expected_with_ssl, $actual_with_ssl);
1100
+        remove_filter('autoptimize_filter_base_cdnurl', $with_ssl);
1101 1101
 
1102 1102
         // With a filter that returns an actual cdn url, cdn replacement should occur.
1103
-        add_filter( 'autoptimize_filter_base_cdnurl', $without_ssl );
1104
-        $actual_without_ssl = $mock->url_replace_cdn( $test_link );
1105
-        $this->assertEquals( $expected_without_ssl, $actual_without_ssl );
1103
+        add_filter('autoptimize_filter_base_cdnurl', $without_ssl);
1104
+        $actual_without_ssl = $mock->url_replace_cdn($test_link);
1105
+        $this->assertEquals($expected_without_ssl, $actual_without_ssl);
1106 1106
     }
1107 1107
 
1108 1108
     public function provider_cssmin_issues()
@@ -1141,11 +1141,11 @@  discard block
 block discarded – undo
1141 1141
     /**
1142 1142
      * @dataProvider provider_cssmin_issues
1143 1143
      */
1144
-    public function test_cssmin_issues( $input, $expected )
1144
+    public function test_cssmin_issues($input, $expected)
1145 1145
     {
1146
-        $minifier = new autoptimizeCSSmin( false ); // No need to raise limits for now.
1147
-        $actual   = $minifier->run( $input );
1148
-        $this->assertEquals( $expected, $actual );
1146
+        $minifier = new autoptimizeCSSmin(false); // No need to raise limits for now.
1147
+        $actual   = $minifier->run($input);
1148
+        $this->assertEquals($expected, $actual);
1149 1149
     }
1150 1150
 
1151 1151
     public function provider_getpath()
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
             // This file comes with core, so should exist...
1171 1171
             array(
1172 1172
                 '/wp-includes/js/jquery/jquery.js',
1173
-                WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.js',
1173
+                WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.js',
1174 1174
             ),
1175 1175
             // Empty $url should return false.
1176 1176
             array(
@@ -1196,12 +1196,12 @@  discard block
 block discarded – undo
1196 1196
      * @dataProvider provider_getpath
1197 1197
      * @covers autoptimizeBase::getpath
1198 1198
      */
1199
-    public function test_getpath( $input, $expected )
1199
+    public function test_getpath($input, $expected)
1200 1200
     {
1201
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )->disableOriginalConstructor()->getMockForAbstractClass();
1201
+        $mock = $this->getMockBuilder('autoptimizeBase')->disableOriginalConstructor()->getMockForAbstractClass();
1202 1202
 
1203
-        $actual = $mock->getpath( $input );
1204
-        $this->assertEquals( $expected, $actual );
1203
+        $actual = $mock->getpath($input);
1204
+        $this->assertEquals($expected, $actual);
1205 1205
     }
1206 1206
 
1207 1207
     /**
@@ -1215,7 +1215,7 @@  discard block
 block discarded – undo
1215 1215
 
1216 1216
         $protorelativesiteurl = $urls['prsiteurl'];
1217 1217
 
1218
-        $css_orig     = <<<CSS
1218
+        $css_orig = <<<CSS
1219 1219
 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")}
1220 1220
 section.clipped.clippedTop {clip-path:url("#clipPolygonTop")}
1221 1221
 section.clipped.clippedBottom {clip-path:url("#clipPolygonBottom")}
@@ -1228,13 +1228,13 @@  discard block
 block discarded – undo
1228 1228
 .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);}
1229 1229
 CSS;
1230 1230
 
1231
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
1232
-        $this->assertEquals( $css_expected, $fixurls_result );
1231
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
1232
+        $this->assertEquals($css_expected, $fixurls_result);
1233 1233
     }
1234 1234
 
1235 1235
     public function test_background_datauri_sprites_with_fixurls()
1236 1236
     {
1237
-        $css_orig     = <<<CSS
1237
+        $css_orig = <<<CSS
1238 1238
 .shadow { background:url(img/1x1.png) top center; }
1239 1239
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
1240 1240
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1286,27 +1286,27 @@  discard block
 block discarded – undo
1286 1286
 CSS;
1287 1287
 
1288 1288
         // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri.
1289
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
1289
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
1290 1290
             return true;
1291
-        }, 10, 2 );
1291
+        }, 10, 2);
1292 1292
 
1293 1293
         // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri.
1294
-        add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) {
1294
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
1295 1295
             $head = 'data:image/png;base64,';
1296 1296
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
1297 1297
 
1298
-            $result['full']       = $head . $data;
1298
+            $result['full']       = $head.$data;
1299 1299
             $result['base64data'] = $data;
1300 1300
             return $result;
1301
-        }, 10, 2 );
1301
+        }, 10, 2);
1302 1302
 
1303
-        $instance = new autoptimizeStyles( $css_orig );
1304
-        $instance->setOption( 'datauris', true );
1303
+        $instance = new autoptimizeStyles($css_orig);
1304
+        $instance->setOption('datauris', true);
1305 1305
 
1306
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
1307
-        $css_actual     = $instance->rewrite_assets( $fixurls_result );
1306
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
1307
+        $css_actual     = $instance->rewrite_assets($fixurls_result);
1308 1308
 
1309
-        $this->assertEquals( $css_expected, $css_actual );
1309
+        $this->assertEquals($css_expected, $css_actual);
1310 1310
     }
1311 1311
 
1312 1312
     /**
@@ -1326,7 +1326,7 @@  discard block
 block discarded – undo
1326 1326
      */
1327 1327
     public function test_background_datauri_sprites_without_fixurls()
1328 1328
     {
1329
-        $css_orig     = <<<CSS
1329
+        $css_orig = <<<CSS
1330 1330
 .shadow { background:url(img/1x1.png) top center; }
1331 1331
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
1332 1332
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1370,24 +1370,24 @@  discard block
 block discarded – undo
1370 1370
 CSS;
1371 1371
 
1372 1372
         // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri.
1373
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
1373
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
1374 1374
             return true;
1375
-        }, 10, 2 );
1375
+        }, 10, 2);
1376 1376
 
1377 1377
         // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri.
1378
-        add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) {
1378
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
1379 1379
             $head = 'data:image/png;base64,';
1380 1380
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
1381 1381
 
1382
-            $result['full']       = $head . $data;
1382
+            $result['full']       = $head.$data;
1383 1383
             $result['base64data'] = $data;
1384 1384
             return $result;
1385
-        }, 10, 2 );
1385
+        }, 10, 2);
1386 1386
 
1387
-        $instance = new autoptimizeStyles( $css_orig );
1388
-        $instance->setOption( 'datauris', true );
1389
-        $css_actual = $instance->rewrite_assets( $css_orig );
1390
-        $this->assertEquals( $css_expected, $css_actual );
1387
+        $instance = new autoptimizeStyles($css_orig);
1388
+        $instance->setOption('datauris', true);
1389
+        $css_actual = $instance->rewrite_assets($css_orig);
1390
+        $this->assertEquals($css_expected, $css_actual);
1391 1391
     }
1392 1392
 
1393 1393
     /**
@@ -1507,12 +1507,12 @@  discard block
 block discarded – undo
1507 1507
 CSS;
1508 1508
 
1509 1509
         // Test with fonts pointed to the CDN + cdn option is set.
1510
-        add_filter( 'autoptimize_filter_css_fonts_cdn', '__return_true' );
1511
-        $instance = new autoptimizeStyles( $css_in );
1512
-        $instance->setOption( 'cdn_url', $cdnurl );
1513
-        $css_actual_fonts_cdn = $instance->rewrite_assets( $css_in );
1510
+        add_filter('autoptimize_filter_css_fonts_cdn', '__return_true');
1511
+        $instance = new autoptimizeStyles($css_in);
1512
+        $instance->setOption('cdn_url', $cdnurl);
1513
+        $css_actual_fonts_cdn = $instance->rewrite_assets($css_in);
1514 1514
 
1515
-        $this->assertEquals( $css_expected_fonts_cdn, $css_actual_fonts_cdn );
1515
+        $this->assertEquals($css_expected_fonts_cdn, $css_actual_fonts_cdn);
1516 1516
     }
1517 1517
 
1518 1518
     /**
@@ -1628,10 +1628,10 @@  discard block
 block discarded – undo
1628 1628
 }
1629 1629
 CSS;
1630 1630
         // Test without moving fonts to CDN, but cdn option is set.
1631
-        $instance = new autoptimizeStyles( $css_in );
1632
-        $instance->setOption( 'cdn_url', $urls['cdnurl'] );
1633
-        $css_actual = $instance->rewrite_assets( $css_in );
1634
-        $this->assertEquals( $css_expected, $css_actual );
1631
+        $instance = new autoptimizeStyles($css_in);
1632
+        $instance->setOption('cdn_url', $urls['cdnurl']);
1633
+        $css_actual = $instance->rewrite_assets($css_in);
1634
+        $this->assertEquals($css_expected, $css_actual);
1635 1635
     }
1636 1636
 
1637 1637
     public function test_assets_regex_replaces_multi_bg_images()
@@ -1652,16 +1652,16 @@  discard block
 block discarded – undo
1652 1652
 }
1653 1653
 CSS;
1654 1654
 
1655
-        $instance = new autoptimizeStyles( $in );
1656
-        $instance->setOption( 'cdn_url', $cdnurl );
1657
-        $actual = $instance->rewrite_assets( $in );
1655
+        $instance = new autoptimizeStyles($in);
1656
+        $instance->setOption('cdn_url', $cdnurl);
1657
+        $actual = $instance->rewrite_assets($in);
1658 1658
 
1659
-        $this->assertEquals( $expected, $actual );
1659
+        $this->assertEquals($expected, $actual);
1660 1660
     }
1661 1661
 
1662 1662
     public function test_at_supports_spacing_issue_110()
1663 1663
     {
1664
-        $in       = <<<CSS
1664
+        $in = <<<CSS
1665 1665
 @supports (-webkit-filter: blur(3px)) or (filter: blur(3px)) {
1666 1666
     .blur {
1667 1667
         filter:blur(3px);
@@ -1675,10 +1675,10 @@  discard block
 block discarded – undo
1675 1675
 @supports (-webkit-filter:blur(3px)) or (filter:blur(3px)){.blur{filter:blur(3px)}}@supports((position:-webkit-sticky) or (position:sticky)){.sticky{position:sticky}}
1676 1676
 CSS;
1677 1677
 
1678
-        $instance = new autoptimizeStyles( $in );
1679
-        $actual   = $instance->run_minifier_on( $in );
1678
+        $instance = new autoptimizeStyles($in);
1679
+        $actual   = $instance->run_minifier_on($in);
1680 1680
 
1681
-        $this->assertEquals( $expected, $actual );
1681
+        $this->assertEquals($expected, $actual);
1682 1682
     }
1683 1683
 
1684 1684
     public function test_css_import_semicolon_url_issue_122()
@@ -1694,18 +1694,18 @@  discard block
 block discarded – undo
1694 1694
 </style>
1695 1695
 HTML;
1696 1696
 
1697
-        $expected = '<style type="text/css" media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css?a&#038;b);@import url(' . $cdnurl . '/' . $sub . 'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
1697
+        $expected = '<style type="text/css" media="all">@import url('.$cdnurl.'/'.$sub.'foo.css?a&#038;b);@import url('.$cdnurl.'/'.$sub.'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
1698 1698
 
1699 1699
         $options = [
1700 1700
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
1701 1701
         ];
1702 1702
 
1703
-        $instance = new autoptimizeStyles( $in );
1704
-        $instance->read( $options['autoptimizeStyles'] );
1703
+        $instance = new autoptimizeStyles($in);
1704
+        $instance->read($options['autoptimizeStyles']);
1705 1705
         $instance->minify();
1706 1706
         $instance->cache();
1707 1707
         $actual = $instance->getcontent();
1708
-        $this->assertEquals( $expected, $actual );
1708
+        $this->assertEquals($expected, $actual);
1709 1709
     }
1710 1710
 
1711 1711
     public function test_fixurls_with_at_imports_and_media_queries()
@@ -1715,10 +1715,10 @@  discard block
 block discarded – undo
1715 1715
         $subfolder = $urls['subfolder'];
1716 1716
 
1717 1717
         $in  = '@import "foo.css"; @import "bar.css" (orientation:landscape);';
1718
-        $exp = '@import url(' . $prsiteurl . '/wp-content/themes/my-theme/foo.css); @import url(' . $prsiteurl . '/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
1718
+        $exp = '@import url('.$prsiteurl.'/wp-content/themes/my-theme/foo.css); @import url('.$prsiteurl.'/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
1719 1719
 
1720
-        $actual = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $in );
1721
-        $this->assertEquals( $exp, $actual );
1720
+        $actual = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $in);
1721
+        $this->assertEquals($exp, $actual);
1722 1722
     }
1723 1723
 
1724 1724
     public function test_aostyles_at_imports_with_media_queries()
@@ -1733,43 +1733,43 @@  discard block
 block discarded – undo
1733 1733
 </style>
1734 1734
 HTML;
1735 1735
 
1736
-        $expected = '<style type="text/css" 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-->';
1736
+        $expected = '<style type="text/css" 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-->';
1737 1737
 
1738 1738
         $options = [
1739 1739
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
1740 1740
         ];
1741 1741
 
1742
-        $instance = new autoptimizeStyles( $in );
1743
-        $instance->read( $options['autoptimizeStyles'] );
1742
+        $instance = new autoptimizeStyles($in);
1743
+        $instance->read($options['autoptimizeStyles']);
1744 1744
         $instance->minify();
1745 1745
         $instance->cache();
1746 1746
 
1747 1747
         $actual = $instance->getcontent();
1748
-        $this->assertEquals( $expected, $actual );
1748
+        $this->assertEquals($expected, $actual);
1749 1749
     }
1750 1750
 
1751 1751
     public function test_cache_size_checker_hooked_by_default()
1752 1752
     {
1753
-        $this->assertNotEmpty( autoptimizeCacheChecker::SCHEDULE_HOOK );
1753
+        $this->assertNotEmpty(autoptimizeCacheChecker::SCHEDULE_HOOK);
1754 1754
 
1755 1755
         // No schedule, because it's only added when is_admin() is true.
1756
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1756
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1757 1757
 
1758 1758
         // Proving that setup() sets the schedule as needed.
1759 1759
         $checker = new autoptimizeCacheChecker();
1760 1760
         $checker->setup();
1761
-        $this->assertEquals( 'daily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1761
+        $this->assertEquals('daily', wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1762 1762
     }
1763 1763
 
1764 1764
     public function test_cache_size_checker_disabled_with_filter()
1765 1765
     {
1766
-        add_filter( 'autoptimize_filter_cachecheck_do', '__return_false' );
1766
+        add_filter('autoptimize_filter_cachecheck_do', '__return_false');
1767 1767
 
1768 1768
         $checker = new autoptimizeCacheChecker();
1769 1769
         $checker->setup();
1770
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1770
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1771 1771
 
1772
-        remove_all_filters( 'autoptimize_filter_cachecheck_do' );
1772
+        remove_all_filters('autoptimize_filter_cachecheck_do');
1773 1773
     }
1774 1774
 
1775 1775
     public function test_is_start_buffering_hooked_properly()
@@ -1782,12 +1782,12 @@  discard block
 block discarded – undo
1782 1782
          * https://www.theaveragedev.com/mocking-constants-in-tests/.
1783 1783
          */
1784 1784
 
1785
-        if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
1785
+        if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
1786 1786
             $this->assertEquals(
1787 1787
                 autoptimizeMain::INIT_EARLIER_PRIORITY,
1788
-                has_action( 'init', array( $instance, 'start_buffering' ) )
1788
+                has_action('init', array($instance, 'start_buffering'))
1789 1789
             );
1790
-            $this->assertTrue( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) );
1790
+            $this->assertTrue(!defined('AUTOPTIMIZE_HOOK_INTO'));
1791 1791
         }
1792 1792
 
1793 1793
         /*
@@ -1804,18 +1804,18 @@  discard block
 block discarded – undo
1804 1804
 
1805 1805
     public function test_inline_and_defer_markup()
1806 1806
     {
1807
-        add_filter( 'autoptimize_filter_css_defer', '__return_true' );
1808
-        add_filter( 'autoptimize_filter_css_defer_inline', '__return_true' );
1807
+        add_filter('autoptimize_filter_css_defer', '__return_true');
1808
+        add_filter('autoptimize_filter_css_defer_inline', '__return_true');
1809 1809
 
1810
-        $actual = $this->ao->end_buffering( $this->get_test_markup() );
1811
-        if ( is_multisite() ) {
1812
-            $this->assertEquals( $this->get_test_markup_output_inline_defer_ms(), $actual );
1810
+        $actual = $this->ao->end_buffering($this->get_test_markup());
1811
+        if (is_multisite()) {
1812
+            $this->assertEquals($this->get_test_markup_output_inline_defer_ms(), $actual);
1813 1813
         } else {
1814
-            $this->assertEquals( $this->get_test_markup_output_inline_defer(), $actual );
1814
+            $this->assertEquals($this->get_test_markup_output_inline_defer(), $actual);
1815 1815
         }
1816 1816
 
1817
-        remove_all_filters( 'autoptimize_filter_css_defer' );
1818
-        remove_all_filters( 'autoptimize_filter_css_defer_inline' );
1817
+        remove_all_filters('autoptimize_filter_css_defer');
1818
+        remove_all_filters('autoptimize_filter_css_defer_inline');
1819 1819
     }
1820 1820
 
1821 1821
     public function test_js_aggregation_decision_and_dontaggregate_filter()
@@ -1823,47 +1823,47 @@  discard block
 block discarded – undo
1823 1823
         $opts = $this->getAoScriptsDefaultOptions();
1824 1824
 
1825 1825
         // Aggregating: true by default.
1826
-        $scripts = new autoptimizeScripts( '' );
1827
-        $scripts->read( $opts );
1828
-        $this->assertTrue( $scripts->aggregating() );
1826
+        $scripts = new autoptimizeScripts('');
1827
+        $scripts->read($opts);
1828
+        $this->assertTrue($scripts->aggregating());
1829 1829
 
1830 1830
         // Aggregating: option=true (dontaggregate=false by default).
1831 1831
         $opts['aggregate'] = true;
1832
-        $scripts           = new autoptimizeScripts( '' );
1833
-        $scripts->read( $opts );
1834
-        $this->assertTrue( $scripts->aggregating() );
1832
+        $scripts           = new autoptimizeScripts('');
1833
+        $scripts->read($opts);
1834
+        $this->assertTrue($scripts->aggregating());
1835 1835
 
1836 1836
         // Aggregating: option=true, dontaggregate=false explicit.
1837 1837
         $opts['aggregate'] = true;
1838
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
1839
-        $scripts = new autoptimizeScripts( '' );
1840
-        $scripts->read( $opts );
1841
-        $this->assertTrue( $scripts->aggregating() );
1842
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1838
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
1839
+        $scripts = new autoptimizeScripts('');
1840
+        $scripts->read($opts);
1841
+        $this->assertTrue($scripts->aggregating());
1842
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1843 1843
 
1844 1844
         // Not aggregating: option=true, dontaggregate=true.
1845 1845
         $opts['aggregate'] = true;
1846
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
1847
-        $scripts = new autoptimizeScripts( '' );
1848
-        $scripts->read( $opts );
1849
-        $this->assertFalse( $scripts->aggregating() );
1850
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1846
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
1847
+        $scripts = new autoptimizeScripts('');
1848
+        $scripts->read($opts);
1849
+        $this->assertFalse($scripts->aggregating());
1850
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1851 1851
 
1852 1852
         // Not aggregating: option=false, dontaggregate=false.
1853 1853
         $opts['aggregate'] = false;
1854
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
1855
-        $scripts = new autoptimizeScripts( '' );
1856
-        $scripts->read( $opts );
1857
-        $this->assertFalse( $scripts->aggregating() );
1858
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1854
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
1855
+        $scripts = new autoptimizeScripts('');
1856
+        $scripts->read($opts);
1857
+        $this->assertFalse($scripts->aggregating());
1858
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1859 1859
 
1860 1860
         // Not aggregating: option=false, dontaggregate=true.
1861 1861
         $opts['aggregate'] = false;
1862
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
1863
-        $scripts = new autoptimizeScripts( '' );
1864
-        $scripts->read( $opts );
1865
-        $this->assertFalse( $scripts->aggregating() );
1866
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1862
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
1863
+        $scripts = new autoptimizeScripts('');
1864
+        $scripts->read($opts);
1865
+        $this->assertFalse($scripts->aggregating());
1866
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1867 1867
     }
1868 1868
 
1869 1869
     public function test_css_aggregation_decision_and_dontaggregate_filter()
@@ -1871,78 +1871,78 @@  discard block
 block discarded – undo
1871 1871
         $opts = $this->getAoStylesDefaultOptions();
1872 1872
 
1873 1873
         // Aggregating: true by default.
1874
-        $styles = new autoptimizeStyles( '' );
1875
-        $this->assertTrue( $styles->aggregating() );
1874
+        $styles = new autoptimizeStyles('');
1875
+        $this->assertTrue($styles->aggregating());
1876 1876
 
1877 1877
         // Aggregating: option=true (dontaggregate=false by default).
1878 1878
         $opts['aggregate'] = true;
1879
-        $styles            = new autoptimizeStyles( '' );
1880
-        $styles->read( $opts );
1881
-        $this->assertTrue( $styles->aggregating() );
1879
+        $styles            = new autoptimizeStyles('');
1880
+        $styles->read($opts);
1881
+        $this->assertTrue($styles->aggregating());
1882 1882
 
1883 1883
         // Aggregating: option=true, dontaggregate=false explicit.
1884 1884
         $opts['aggregate'] = true;
1885
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
1886
-        $styles = new autoptimizeStyles( '' );
1887
-        $styles->read( $opts );
1888
-        $this->assertTrue( $styles->aggregating() );
1889
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1885
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
1886
+        $styles = new autoptimizeStyles('');
1887
+        $styles->read($opts);
1888
+        $this->assertTrue($styles->aggregating());
1889
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1890 1890
 
1891 1891
         // Not aggregating: option=true, dontaggregate=true.
1892 1892
         $opts['aggregate'] = true;
1893
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
1894
-        $styles = new autoptimizeStyles( '' );
1895
-        $styles->read( $opts );
1896
-        $this->assertFalse( $styles->aggregating() );
1897
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1893
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
1894
+        $styles = new autoptimizeStyles('');
1895
+        $styles->read($opts);
1896
+        $this->assertFalse($styles->aggregating());
1897
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1898 1898
 
1899 1899
         // Not aggregating: option=false, dontaggregate=false.
1900 1900
         $opts['aggregate'] = false;
1901
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
1902
-        $styles = new autoptimizeStyles( '' );
1903
-        $styles->read( $opts );
1904
-        $this->assertFalse( $styles->aggregating() );
1905
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1901
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
1902
+        $styles = new autoptimizeStyles('');
1903
+        $styles->read($opts);
1904
+        $this->assertFalse($styles->aggregating());
1905
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1906 1906
 
1907 1907
         // Not aggregating: option=false, dontaggregate=true.
1908 1908
         $opts['aggregate'] = false;
1909
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
1910
-        $styles = new autoptimizeStyles( '' );
1911
-        $styles->read( $opts );
1912
-        $this->assertFalse( $styles->aggregating() );
1913
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1909
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
1910
+        $styles = new autoptimizeStyles('');
1911
+        $styles->read($opts);
1912
+        $this->assertFalse($styles->aggregating());
1913
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1914 1914
     }
1915 1915
 
1916 1916
     public function test_css_minify_single_with_cdning()
1917 1917
     {
1918
-        $pathname = dirname( __FILE__ ) . '/fixtures/minify-single.css';
1918
+        $pathname = dirname(__FILE__).'/fixtures/minify-single.css';
1919 1919
         $opts     = $this->getAoStylesDefaultOptions();
1920
-        $styles   = new autoptimizeStyles( '' );
1921
-        $styles->read( $opts );
1920
+        $styles   = new autoptimizeStyles('');
1921
+        $styles->read($opts);
1922 1922
 
1923
-        $url = $styles->minify_single( $pathname, $cache_miss = true );
1923
+        $url = $styles->minify_single($pathname, $cache_miss = true);
1924 1924
 
1925 1925
         // Minified url filename + its pointed to cdn.
1926
-        $this->assertContains( AUTOPTIMIZE_CACHE_CHILD_DIR, $url );
1927
-        $this->assertContains( '/autoptimize_single_', $url );
1928
-        $this->assertContains( $styles->cdn_url, $url );
1926
+        $this->assertContains(AUTOPTIMIZE_CACHE_CHILD_DIR, $url);
1927
+        $this->assertContains('/autoptimize_single_', $url);
1928
+        $this->assertContains($styles->cdn_url, $url);
1929 1929
 
1930 1930
         // Actual minified css contents are minified and cdn-ed.
1931
-        $path     = $styles->getpath( $url );
1932
-        $contents = file_get_contents( $path );
1933
-        $this->assertContains( $styles->cdn_url, $contents );
1934
-        $this->assertContains( '.bg{background:url(' . $styles->cdn_url, $contents );
1931
+        $path     = $styles->getpath($url);
1932
+        $contents = file_get_contents($path);
1933
+        $this->assertContains($styles->cdn_url, $contents);
1934
+        $this->assertContains('.bg{background:url('.$styles->cdn_url, $contents);
1935 1935
     }
1936 1936
 
1937 1937
     public function test_ao_partners_instantiation_without_explicit_include()
1938 1938
     {
1939 1939
         $partners = new autoptimizePartners();
1940
-        $this->assertTrue( $partners instanceof autoptimizePartners );
1940
+        $this->assertTrue($partners instanceof autoptimizePartners);
1941 1941
     }
1942 1942
 
1943 1943
     public function test_html_minify_keep_html_comments_inside_script_blocks()
1944 1944
     {
1945
-        $markup   = <<<MARKUP
1945
+        $markup = <<<MARKUP
1946 1946
 <script>
1947 1947
 <!-- End Support AJAX add to cart -->
1948 1948
 var a = "b";
@@ -1972,23 +1972,23 @@  discard block
 block discarded – undo
1972 1972
             ],
1973 1973
         ];
1974 1974
 
1975
-        $instance = new autoptimizeHTML( $markup );
1976
-        $instance->read( $options['autoptimizeHTML'] );
1975
+        $instance = new autoptimizeHTML($markup);
1976
+        $instance->read($options['autoptimizeHTML']);
1977 1977
         $instance->minify();
1978 1978
         $actual = $instance->getcontent();
1979
-        $this->assertEquals( $expected, $actual );
1979
+        $this->assertEquals($expected, $actual);
1980 1980
 
1981
-        $instance = new autoptimizeHTML( $markup2 );
1982
-        $instance->read( $options['autoptimizeHTML'] );
1981
+        $instance = new autoptimizeHTML($markup2);
1982
+        $instance->read($options['autoptimizeHTML']);
1983 1983
         $instance->minify();
1984 1984
         $actual2 = $instance->getcontent();
1985
-        $this->assertEquals( $expected2, $actual2 );
1985
+        $this->assertEquals($expected2, $actual2);
1986 1986
     }
1987 1987
 
1988 1988
     public function test_html_minify_remove_html_comments_inside_script_blocks()
1989 1989
     {
1990 1990
         // Default case, html comments removed (keepcomments = false).
1991
-        $markup1   = <<<MARKUP
1991
+        $markup1 = <<<MARKUP
1992 1992
 <script>
1993 1993
 var a = "b";
1994 1994
 <!-- End Support AJAX add to cart -->
@@ -1999,7 +1999,7 @@  discard block
 block discarded – undo
1999 1999
 <!-- End Support AJAX add to cart</script>
2000 2000
 MARKUP;
2001 2001
 
2002
-        $markup2   = <<<MARKUP
2002
+        $markup2 = <<<MARKUP
2003 2003
 <script>
2004 2004
 <!-- End Support AJAX add to cart -->
2005 2005
 var a = "b";
@@ -2016,17 +2016,17 @@  discard block
 block discarded – undo
2016 2016
             ],
2017 2017
         ];
2018 2018
 
2019
-        $instance = new autoptimizeHTML( $markup1 );
2020
-        $instance->read( $options['autoptimizeHTML'] );
2019
+        $instance = new autoptimizeHTML($markup1);
2020
+        $instance->read($options['autoptimizeHTML']);
2021 2021
         $instance->minify();
2022 2022
         $actual = $instance->getcontent();
2023
-        $this->assertEquals( $expected1, $actual );
2023
+        $this->assertEquals($expected1, $actual);
2024 2024
 
2025
-        $instance = new autoptimizeHTML( $markup2 );
2026
-        $instance->read( $options['autoptimizeHTML'] );
2025
+        $instance = new autoptimizeHTML($markup2);
2026
+        $instance->read($options['autoptimizeHTML']);
2027 2027
         $instance->minify();
2028 2028
         $actual2 = $instance->getcontent();
2029
-        $this->assertEquals( $expected2, $actual2 );
2029
+        $this->assertEquals($expected2, $actual2);
2030 2030
     }
2031 2031
 
2032 2032
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern()
@@ -2050,11 +2050,11 @@  discard block
 block discarded – undo
2050 2050
             ],
2051 2051
         ];
2052 2052
 
2053
-        $instance = new autoptimizeHTML( $markup );
2054
-        $instance->read( $options['autoptimizeHTML'] );
2053
+        $instance = new autoptimizeHTML($markup);
2054
+        $instance->read($options['autoptimizeHTML']);
2055 2055
         $instance->minify();
2056 2056
         $actual = $instance->getcontent();
2057
-        $this->assertEquals( $expected, $actual );
2057
+        $this->assertEquals($expected, $actual);
2058 2058
     }
2059 2059
 
2060 2060
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern_untouched()
@@ -2079,49 +2079,49 @@  discard block
 block discarded – undo
2079 2079
             ],
2080 2080
         ];
2081 2081
 
2082
-        $instance = new autoptimizeHTML( $markup );
2083
-        $instance->read( $options['autoptimizeHTML'] );
2082
+        $instance = new autoptimizeHTML($markup);
2083
+        $instance->read($options['autoptimizeHTML']);
2084 2084
         $instance->minify();
2085 2085
         $actual = $instance->getcontent();
2086
-        $this->assertEquals( $expected, $actual );
2086
+        $this->assertEquals($expected, $actual);
2087 2087
     }
2088 2088
 
2089 2089
     public function test_utils_mbstring_availabilty_overriding()
2090 2090
     {
2091 2091
         $orig     = autoptimizeUtils::mbstring_available();
2092
-        $opposite = ! $orig;
2092
+        $opposite = !$orig;
2093 2093
 
2094
-        $this->assertSame( $orig, autoptimizeUtils::mbstring_available() );
2094
+        $this->assertSame($orig, autoptimizeUtils::mbstring_available());
2095 2095
         // Override works...
2096
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available( $opposite ) );
2096
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available($opposite));
2097 2097
         // And override remains cached as the last version.
2098
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available() );
2098
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available());
2099 2099
     }
2100 2100
 
2101 2101
     public function test_utils_mbstring_basics()
2102 2102
     {
2103 2103
         // Turn on mbstring usage.
2104
-        autoptimizeUtils::mbstring_available( true );
2104
+        autoptimizeUtils::mbstring_available(true);
2105 2105
 
2106
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'ASCII' ) );
2107
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'CP850' ) );
2108
-        $this->assertSame( 3, autoptimizeUtils::strlen( '한국어' ) );
2106
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'ASCII'));
2107
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'CP850'));
2108
+        $this->assertSame(3, autoptimizeUtils::strlen('한국어'));
2109 2109
 
2110
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', '' ) );
2111
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', 'a', -1 ) );
2112
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'd' ) );
2113
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'a', 3 ) );
2114
-        $this->assertSame( 1, autoptimizeUtils::strpos( '한국어', '국' ) );
2110
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', ''));
2111
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', 'a', -1));
2112
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'd'));
2113
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'a', 3));
2114
+        $this->assertSame(1, autoptimizeUtils::strpos('한국어', '국'));
2115 2115
     }
2116 2116
 
2117 2117
     /**
2118 2118
      * @dataProvider provider_utils_substr_replace
2119 2119
      */
2120
-    function test_utils_substr_replace_basics_mbstring( $s, $repl, $start, $len, $expected )
2120
+    function test_utils_substr_replace_basics_mbstring($s, $repl, $start, $len, $expected)
2121 2121
     {
2122 2122
         // Force mbstring code path...
2123
-        autoptimizeUtils::mbstring_available( true );
2124
-        $this->assertEquals( $expected, autoptimizeUtils::substr_replace( $s, $repl, $start, $len ) );
2123
+        autoptimizeUtils::mbstring_available(true);
2124
+        $this->assertEquals($expected, autoptimizeUtils::substr_replace($s, $repl, $start, $len));
2125 2125
     }
2126 2126
 
2127 2127
     public function provider_utils_substr_replace()
@@ -2163,48 +2163,48 @@  discard block
 block discarded – undo
2163 2163
 
2164 2164
     function test_mb_substr_replace_with_ascii_input_string()
2165 2165
     {
2166
-        autoptimizeUtils::mbstring_available( false );
2166
+        autoptimizeUtils::mbstring_available(false);
2167 2167
 
2168 2168
         $str = 'Ascii';
2169 2169
 
2170
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
2171
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2172
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2173
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
2174
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2170
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
2171
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2172
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2173
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
2174
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2175 2175
     }
2176 2176
 
2177 2177
     function test_mb_substr_replace_with_utf8_input_string()
2178 2178
     {
2179
-        autoptimizeUtils::mbstring_available( true );
2179
+        autoptimizeUtils::mbstring_available(true);
2180 2180
 
2181 2181
         $str = 'âønæë';
2182 2182
 
2183
-        $this->assertSame( 'âñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
2184
-        $this->assertSame( 'ñnæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2185
-        $this->assertSame( 'âøñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2186
-        $this->assertSame( 'âøz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
2187
-        $this->assertSame( 'âñæë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2183
+        $this->assertSame('âñ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); // No length.
2184
+        $this->assertSame('ñnæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2185
+        $this->assertSame('âøñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2186
+        $this->assertSame('âøz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
2187
+        $this->assertSame('âñæë', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2188 2188
     }
2189 2189
 
2190 2190
     function test_default_substr_replace_with_ascii_input_string()
2191 2191
     {
2192 2192
         // Disable mbstring which should fall ack to substr_replace...
2193
-        autoptimizeUtils::mbstring_available( false );
2193
+        autoptimizeUtils::mbstring_available(false);
2194 2194
 
2195 2195
         $str = 'Ascii';
2196 2196
 
2197
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
2198
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2199
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2200
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
2201
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2197
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
2198
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2199
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2200
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
2201
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2202 2202
     }
2203 2203
 
2204 2204
     function test_default_substr_replace_with_utf8_input_string()
2205 2205
     {
2206 2206
         // Disabling mbstring, falling back to substr_replace...
2207
-        autoptimizeUtils::mbstring_available( false );
2207
+        autoptimizeUtils::mbstring_available(false);
2208 2208
 
2209 2209
         // This is really impossible to make work properly, since
2210 2210
         // any start/len parameters we give are working with bytes instead
@@ -2213,55 +2213,55 @@  discard block
 block discarded – undo
2213 2213
 
2214 2214
         // $this->assertSame( '�ñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
2215 2215
         // $this->assertSame( 'ñ�næë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2216
-        $this->assertSame( 'ñønæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2217
-        $this->assertSame( 'âñxæë', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2218
-        $this->assertSame( 'âz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
2216
+        $this->assertSame('ñønæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2217
+        $this->assertSame('âñxæë', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2218
+        $this->assertSame('âz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
2219 2219
     }
2220 2220
 
2221 2221
     public function test_cache_fast_delete()
2222 2222
     {
2223
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
2223
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
2224 2224
 
2225 2225
         autoptimizeCache::clearall_actionless();
2226 2226
 
2227
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
2227
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
2228 2228
     }
2229 2229
 
2230 2230
     public function test_delete_advanced_cache_clear_artifacts()
2231 2231
     {
2232
-        $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() );
2232
+        $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts());
2233 2233
     }
2234 2234
 
2235 2235
     public function provider_canonicalization()
2236 2236
     {
2237 2237
         return array(
2238
-            array( '../common', 'common' ),
2239
-            array( '../what-does-this-mean/really?/', 'what-does-this-mean/really?/' ),
2240
-            array( '../../what/where/how', 'what/where/how' ),
2241
-            array( '/../more.dots.please/', '/more.dots.please/' ),
2242
-            array( '/../../what/where/how', '/what/where/how' ),
2243
-            array( '/a/b/c/../../../d/e/file.txt', '/d/e/file.txt' ),
2244
-            array( 'a/b/../c', 'a/c' ),
2245
-            array( './../../etc/passwd', './etc/passwd' ),
2246
-            array( '/var/.////./user/./././..//.//../////../././.././test/////', '/test/' ),
2247
-            array( '/var/user/./././.././../.././././test/', '/test/' ),
2248
-            array( '/hello/0//how/../are/../you', '/hello/0/you' ),
2249
-            array( '', '' ),
2250
-            array( '.', '.' ),
2251
-            array( '..', '..' ),
2252
-            array( './..', './..' ),
2253
-            array( '../.', '.' ),
2238
+            array('../common', 'common'),
2239
+            array('../what-does-this-mean/really?/', 'what-does-this-mean/really?/'),
2240
+            array('../../what/where/how', 'what/where/how'),
2241
+            array('/../more.dots.please/', '/more.dots.please/'),
2242
+            array('/../../what/where/how', '/what/where/how'),
2243
+            array('/a/b/c/../../../d/e/file.txt', '/d/e/file.txt'),
2244
+            array('a/b/../c', 'a/c'),
2245
+            array('./../../etc/passwd', './etc/passwd'),
2246
+            array('/var/.////./user/./././..//.//../////../././.././test/////', '/test/'),
2247
+            array('/var/user/./././.././../.././././test/', '/test/'),
2248
+            array('/hello/0//how/../are/../you', '/hello/0/you'),
2249
+            array('', ''),
2250
+            array('.', '.'),
2251
+            array('..', '..'),
2252
+            array('./..', './..'),
2253
+            array('../.', '.'),
2254 2254
             // This might be debatable...
2255
-            array( '../..', '..' ),
2255
+            array('../..', '..'),
2256 2256
         );
2257 2257
     }
2258 2258
 
2259 2259
     /**
2260 2260
      * @dataProvider provider_canonicalization
2261 2261
      */
2262
-    public function test_path_canonicalize( $path, $canonicalized )
2262
+    public function test_path_canonicalize($path, $canonicalized)
2263 2263
     {
2264
-        $this->assertSame( $canonicalized, autoptimizeUtils::path_canonicalize( $path ) );
2264
+        $this->assertSame($canonicalized, autoptimizeUtils::path_canonicalize($path));
2265 2265
     }
2266 2266
 
2267 2267
     /**
@@ -2275,16 +2275,16 @@  discard block
 block discarded – undo
2275 2275
     public function test_autoptimize_filter_cdn_magic_path_check()
2276 2276
     {
2277 2277
         $cdnurl = 'http://cdn.example.org';
2278
-        add_filter( 'autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2 );
2278
+        add_filter('autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2);
2279 2279
 
2280 2280
         // Even when site is in a subfolder, the resulting cdn-rewritten url
2281 2281
         // should not magically include it, due to the above filter.
2282 2282
         // The second parameter is here to force a cache miss and re-run
2283 2283
         // the filter since we're using the same cdn url all over the place,
2284 2284
         // but want to prove different things with it.
2285
-        $this->assertSame( $cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed( $cdnurl, true ) );
2285
+        $this->assertSame($cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed($cdnurl, true));
2286 2286
 
2287
-        remove_all_filters( 'autoptimize_filter_cdn_magic_path_check' );
2287
+        remove_all_filters('autoptimize_filter_cdn_magic_path_check');
2288 2288
     }
2289 2289
 
2290 2290
     /**
@@ -2307,8 +2307,8 @@  discard block
 block discarded – undo
2307 2307
 MARKUP;
2308 2308
 
2309 2309
         $instance = new autoptimizeExtra();
2310
-        $actual = $instance->filter_optimize_images( $markup );
2311
-        $this->assertEquals( $expected, $actual );
2310
+        $actual = $instance->filter_optimize_images($markup);
2311
+        $this->assertEquals($expected, $actual);
2312 2312
     }
2313 2313
 
2314 2314
     /**
@@ -2329,8 +2329,8 @@  discard block
 block discarded – undo
2329 2329
 MARKUP;
2330 2330
 
2331 2331
         $instance = new autoptimizeExtra();
2332
-        $actual = $instance->filter_optimize_images( $markup );
2333
-        $this->assertEquals( $expected, $actual );
2332
+        $actual = $instance->filter_optimize_images($markup);
2333
+        $this->assertEquals($expected, $actual);
2334 2334
     }
2335 2335
 
2336 2336
     /**
@@ -2353,8 +2353,8 @@  discard block
 block discarded – undo
2353 2353
 MARKUP;
2354 2354
 
2355 2355
         $instance = new autoptimizeExtra();
2356
-        $actual = $instance->filter_optimize_images( $markup );
2357
-        $this->assertEquals( $expected, $actual );
2356
+        $actual = $instance->filter_optimize_images($markup);
2357
+        $this->assertEquals($expected, $actual);
2358 2358
     }
2359 2359
 
2360 2360
     /**
@@ -2364,7 +2364,7 @@  discard block
 block discarded – undo
2364 2364
     {
2365 2365
         $actual = autoptimizeUtils::str_is_valid_regex($str);
2366 2366
 
2367
-        $this->assertEquals( $expected, $actual );
2367
+        $this->assertEquals($expected, $actual);
2368 2368
     }
2369 2369
 
2370 2370
     public function provider_str_is_valid_regex()
@@ -2380,11 +2380,11 @@  discard block
 block discarded – undo
2380 2380
     /**
2381 2381
      * @dataProvider provider_protocol_relative_tests
2382 2382
      */
2383
-    public function test_is_protocol_relative( $str, $expected )
2383
+    public function test_is_protocol_relative($str, $expected)
2384 2384
     {
2385
-        $actual = autoptimizeUtils::is_protocol_relative( $str );
2385
+        $actual = autoptimizeUtils::is_protocol_relative($str);
2386 2386
 
2387
-        $this->assertEquals( $expected, $actual );
2387
+        $this->assertEquals($expected, $actual);
2388 2388
     }
2389 2389
 
2390 2390
     public function provider_protocol_relative_tests()
@@ -2411,30 +2411,30 @@  discard block
 block discarded – undo
2411 2411
 
2412 2412
         $expected = 'img.centered,.aligncenter{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}';
2413 2413
 
2414
-        $instance = new autoptimizeStyles( $css );
2415
-        $minified = $instance->run_minifier_on( $css );
2414
+        $instance = new autoptimizeStyles($css);
2415
+        $minified = $instance->run_minifier_on($css);
2416 2416
 
2417
-        $this->assertEquals( $expected, $minified );
2417
+        $this->assertEquals($expected, $minified);
2418 2418
     }
2419 2419
 
2420 2420
     public function test_css_font_names_mangling()
2421 2421
     {
2422 2422
         // Properly quoted font names dont get mangled.
2423 2423
         $css      = 'h2{font-family:"Archivo Black"}';
2424
-        $instance = new autoptimizeStyles( $css );
2425
-        $actual   = $instance->run_minifier_on( $css );
2426
-        $this->assertEquals( $css, $actual );
2424
+        $instance = new autoptimizeStyles($css);
2425
+        $actual   = $instance->run_minifier_on($css);
2426
+        $this->assertEquals($css, $actual);
2427 2427
 
2428 2428
         // When not quoted, 'Black' used to become '#000', but not anymore... :)
2429 2429
         $css_unquoted = 'h2{font-family:Archivo Black;}';
2430 2430
         $expected     = 'h2{font-family:Archivo Black}';
2431
-        $instance     = new autoptimizeStyles( $css_unquoted );
2432
-        $actual       = $instance->run_minifier_on( $css_unquoted );
2433
-        $this->assertEquals( $expected, $actual );
2431
+        $instance     = new autoptimizeStyles($css_unquoted);
2432
+        $actual       = $instance->run_minifier_on($css_unquoted);
2433
+        $this->assertEquals($expected, $actual);
2434 2434
 
2435 2435
         $css_unquoted = 'h1{font:italic 1.2em Fira White,serif}';
2436
-        $instance     = new autoptimizeStyles( $css_unquoted );
2437
-        $actual       = $instance->run_minifier_on( $css_unquoted );
2438
-        $this->assertEquals( $css_unquoted, $actual );
2436
+        $instance     = new autoptimizeStyles($css_unquoted);
2437
+        $actual       = $instance->run_minifier_on($css_unquoted);
2438
+        $this->assertEquals($css_unquoted, $actual);
2439 2439
     }
2440 2440
 }
Please login to merge, or discard this patch.
classes/external/php/yui-php-cssmin-bundled/Minifier.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
     public function __construct($raisePhpLimits = true)
73 73
     {
74 74
         $this->raisePhpLimits = (bool) $raisePhpLimits;
75
-        $this->memoryLimit = 128 * 1048576; // 128MB in bytes
76
-        $this->pcreBacktrackLimit = 1000 * 1000;
77
-        $this->pcreRecursionLimit = 500 * 1000;
75
+        $this->memoryLimit = 128*1048576; // 128MB in bytes
76
+        $this->pcreBacktrackLimit = 1000*1000;
77
+        $this->pcreRecursionLimit = 500*1000;
78 78
         $this->hexToNamedColorsMap = Colors::getHexToNamedMap();
79 79
         $this->namedToHexColorsMap = Colors::getNamedToHexMap();
80 80
         $this->namedToHexColorsRegex = sprintf(
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
      */
177 177
     private function setShortenZeroValuesRegexes()
178 178
     {
179
-        $zeroRegex = '0'. $this->unitsGroupRegex;
180
-        $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) ';
179
+        $zeroRegex = '0'.$this->unitsGroupRegex;
180
+        $numOrPosRegex = '('.$this->numRegex.'|top|left|bottom|right|center) ';
181 181
         $oneZeroSafeProperties = array(
182 182
             '(?:line-)?height',
183 183
             '(?:(?:min|max)-)?width',
@@ -195,14 +195,14 @@  discard block
 block discarded – undo
195 195
         );
196 196
 
197 197
         // First zero regex
198
-        $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si';
198
+        $regex = '/(^|;)('.implode('|', $oneZeroSafeProperties).'):%s/Si';
199 199
         $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex);
200 200
 
201 201
         // Multiple zeroes regexes
202 202
         $regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si';
203
-        $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex);
204
-        $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex);
205
-        $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex);
203
+        $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex.$zeroRegex);
204
+        $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$zeroRegex);
205
+        $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$numOrPosRegex.$zeroRegex);
206 206
     }
207 207
 
208 208
     /**
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
             $dataStartIndex = $matchStartIndex + 4; // url( length
390 390
             $searchOffset = $matchStartIndex + strlen($m[0][0]);
391 391
             $terminator = $m[1][0]; // ', " or empty (not quoted)
392
-            $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S';
392
+            $terminatorRegex = '/(?<!\\\\)'.(strlen($terminator) === 0 ? '' : $terminator.'\s*').'(\))/S';
393 393
 
394 394
             $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
395 395
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
                     $token = preg_replace('/\s+/S', '', $token);
405 405
                 }
406 406
 
407
-                $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
407
+                $ret .= 'url('.$this->registerPreservedToken(trim($token)).')';
408 408
             // No end terminator found, re-add the whole match. Should we throw/warn here?
409 409
             } else {
410 410
                 $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
      */
426 426
     private function processCommentsCallback($matches)
427 427
     {
428
-        return '/*'. $this->registerCommentToken($matches[1]) .'*/';
428
+        return '/*'.$this->registerCommentToken($matches[1]).'*/';
429 429
     }
430 430
 
431 431
     /**
@@ -435,7 +435,7 @@  discard block
 block discarded – undo
435 435
      */
436 436
     private function processOldIeSpecificMatrixDefinitionCallback($matches)
437 437
     {
438
-        return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')';
438
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$this->registerPreservedToken($matches[1]).')';
439 439
     }
440 440
 
441 441
     /**
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
         // minify alpha opacity in filter strings
459 459
         $match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match);
460 460
 
461
-        return $quote . $this->registerPreservedToken($match) . $quote;
461
+        return $quote.$this->registerPreservedToken($match).$quote;
462 462
     }
463 463
 
464 464
     /**
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
      */
470 470
     private function processImportUnquotedUrlAtRulesCallback($matches)
471 471
     {
472
-        return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2];
472
+        return '@import url('.$this->registerPreservedToken($matches[1]).')'.$matches[2];
473 473
     }
474 474
 
475 475
     /**
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
     private function processComments($css)
481 481
     {
482 482
         foreach ($this->comments as $commentId => $comment) {
483
-            $commentIdString = '/*'. $commentId .'*/';
483
+            $commentIdString = '/*'.$commentId.'*/';
484 484
 
485 485
             // ! in the first position of the comment means preserve
486 486
             // so push to the preserved tokens keeping the !
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
             $blockEndPos = strpos($css, '}', $blockStartPos);
532 532
             // When ending curly brace is missing, let's
533 533
             // behave like there was one at the end of the block...
534
-            if ( false === $blockEndPos ) {
534
+            if (false === $blockEndPos) {
535 535
                 $blockEndPos = strlen($css) - 1;
536 536
             }
537 537
             $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
             } else {
544 544
                 $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
545 545
                 $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
546
-                $ret .= '{'. $ruleBodyToken .'}';
546
+                $ret .= '{'.$ruleBodyToken.'}';
547 547
                 $searchOffset = $blockEndPos + 1;
548 548
             }
549 549
 
@@ -643,8 +643,8 @@  discard block
 block discarded – undo
643 643
         $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body);
644 644
 
645 645
         // shorten ms to s
646
-        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) {
647
-            return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s';
646
+        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function($matches) {
647
+            return $matches[1].$matches[2].((int) $matches[3]/1000).'s';
648 648
         }, $body);
649 649
 
650 650
         // Remove leading zeros from integer and float numbers.
@@ -756,13 +756,13 @@  discard block
 block discarded – undo
756 756
         $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css);
757 757
 
758 758
         // Retain space for special IE6 cases
759
-        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) {
760
-            return ':first-'. strtolower($matches[1]) .' '. $matches[2];
759
+        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function($matches) {
760
+            return ':first-'.strtolower($matches[1]).' '.$matches[2];
761 761
         }, $css);
762 762
 
763 763
         // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1)
764 764
         // Add token to add the "/" back in later
765
-        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
765
+        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
766 766
 
767 767
         // Remove empty rule blocks up to 2 levels deep.
768 768
         $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css);
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
         }
811 811
 
812 812
         // @import handling
813
-        $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) {
813
+        $css = preg_replace_callback($this->importRegex, function($matches) use (&$imports) {
814 814
             // Keep all @import at-rules found for later
815 815
             $imports .= $matches[0];
816 816
             // Delete all @import at-rules
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
         }, $css);
819 819
 
820 820
         // @namespace handling
821
-        $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) {
821
+        $css = preg_replace_callback($this->namespaceRegex, function($matches) use (&$namespaces) {
822 822
             // Keep all @namespace at-rules found for later
823 823
             $namespaces .= $matches[0];
824 824
             // Delete all @namespace at-rules
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
         // 1. @charset first
830 830
         // 2. @imports below @charset
831 831
         // 3. @namespaces below @imports
832
-        $css = $charset . $imports . $namespaces . $css;
832
+        $css = $charset.$imports.$namespaces.$css;
833 833
 
834 834
         return $css;
835 835
     }
@@ -883,10 +883,10 @@  discard block
 block discarded – undo
883 883
         // Restore space after rgb() or hsl() function in some cases such as:
884 884
         // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
885 885
         if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
886
-            $terminator = ' '. $terminator;
886
+            $terminator = ' '.$terminator;
887 887
         }
888 888
 
889
-        return '#'. implode('', $hexColors) . $terminator;
889
+        return '#'.implode('', $hexColors).$terminator;
890 890
     }
891 891
 
892 892
     /**
@@ -900,16 +900,16 @@  discard block
 block discarded – undo
900 900
 
901 901
         // Shorten suitable 6 chars HEX colors
902 902
         if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) {
903
-            $hex = $m[1] . $m[2] . $m[3];
903
+            $hex = $m[1].$m[2].$m[3];
904 904
         }
905 905
 
906 906
         // Lowercase
907
-        $hex = '#'. strtolower($hex);
907
+        $hex = '#'.strtolower($hex);
908 908
 
909 909
         // Replace Hex colors with shorter color names
910 910
         $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex;
911 911
 
912
-        return $color . $matches[2];
912
+        return $color.$matches[2];
913 913
     }
914 914
 
915 915
     /**
@@ -920,7 +920,7 @@  discard block
 block discarded – undo
920 920
      */
921 921
     private function shortenNamedColorsCallback($matches)
922 922
     {
923
-        return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3];
923
+        return $matches[1].$this->namedToHexColorsMap[strtolower($matches[2])].$matches[3];
924 924
     }
925 925
 
926 926
     /**
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -3,50 +3,50 @@  discard block
 block discarded – undo
3 3
  * WP tests bootstrap.
4 4
  */
5 5
 
6
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
7
-if ( ! $_tests_dir ) {
8
-    $tmp_dir = getenv( 'TMPDIR' );
9
-    if ( ! empty( $tmp_dir ) ) {
10
-        $_tests_dir = rtrim( $tmp_dir, '/' ) . '/wordpress-tests-lib';
11
-        if ( ! is_dir( $_tests_dir ) ) {
6
+$_tests_dir = getenv('WP_TESTS_DIR');
7
+if (!$_tests_dir) {
8
+    $tmp_dir = getenv('TMPDIR');
9
+    if (!empty($tmp_dir)) {
10
+        $_tests_dir = rtrim($tmp_dir, '/').'/wordpress-tests-lib';
11
+        if (!is_dir($_tests_dir)) {
12 12
             $_tests_dir = null;
13 13
         }
14 14
     }
15 15
 }
16 16
 
17
-if ( ! $_tests_dir ) {
17
+if (!$_tests_dir) {
18 18
     $_tests_dir = '/tmp/wordpress-tests-lib';
19 19
 }
20 20
 
21
-require_once $_tests_dir . '/includes/functions.php';
21
+require_once $_tests_dir.'/includes/functions.php';
22 22
 
23 23
 function _manually_load_plugin() {
24
-    define( 'AUTOPTIMIZE_INIT_EARLIER', true );
24
+    define('AUTOPTIMIZE_INIT_EARLIER', true);
25 25
 
26 26
     // For overriding cache dirs and whatnot. Kinda works if you keep a few things in mind.
27
-    if ( getenv('CUSTOM_CONSTANTS' ) ) {
28
-        define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/' );
29
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
30
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
27
+    if (getenv('CUSTOM_CONSTANTS')) {
28
+        define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/');
29
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
30
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
31 31
             $blog_id   = get_current_blog_id();
32
-            $pathname .= $blog_id . '/';
32
+            $pathname .= $blog_id.'/';
33 33
         }
34
-        define( 'AUTOPTIMIZE_CACHE_DIR', $pathname );
34
+        define('AUTOPTIMIZE_CACHE_DIR', $pathname);
35 35
 
36 36
         $custom_site_url = 'http://localhost/wordpress';
37
-        define( 'AUTOPTIMIZE_WP_SITE_URL', $custom_site_url );
38
-        add_filter( 'site_url', function( $url, $path, $scheme, $blog_id ) use ( $custom_site_url ) {
37
+        define('AUTOPTIMIZE_WP_SITE_URL', $custom_site_url);
38
+        add_filter('site_url', function($url, $path, $scheme, $blog_id) use ($custom_site_url) {
39 39
             return $custom_site_url;
40
-        }, 10, 4 );
41
-        add_filter( 'content_url', function( $url, $path ) use ( $custom_site_url ) {
42
-            return $custom_site_url . '/wp-content';
43
-        }, 10, 2 );
44
-        define( 'AO_TEST_SUBFOLDER_INSTALL', true );
40
+        }, 10, 4);
41
+        add_filter('content_url', function($url, $path) use ($custom_site_url) {
42
+            return $custom_site_url.'/wp-content';
43
+        }, 10, 2);
44
+        define('AO_TEST_SUBFOLDER_INSTALL', true);
45 45
 
46
-        define( 'CUSTOM_CONSTANTS_USED', true );
46
+        define('CUSTOM_CONSTANTS_USED', true);
47 47
     } else {
48
-        define( 'CUSTOM_CONSTANTS_USED', false );
49
-        define( 'AO_TEST_SUBFOLDER_INSTALL', false );
48
+        define('CUSTOM_CONSTANTS_USED', false);
49
+        define('AO_TEST_SUBFOLDER_INSTALL', false);
50 50
     }
51 51
 
52 52
     /*
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
54 54
     update_option( 'active_plugins', $active_plugins );
55 55
     */
56 56
 
57
-    update_option( 'autoptimize_js', 1 );
58
-    update_option( 'autoptimize_css', 1 );
59
-    update_option( 'autoptimize_html', 0 );
60
-    update_option( 'autoptimize_cdn_url', 'http://cdn.example.org' );
61
-    update_option( 'autoptimize_cache_nogzip', 1 );
57
+    update_option('autoptimize_js', 1);
58
+    update_option('autoptimize_css', 1);
59
+    update_option('autoptimize_html', 0);
60
+    update_option('autoptimize_cdn_url', 'http://cdn.example.org');
61
+    update_option('autoptimize_cache_nogzip', 1);
62 62
 
63
-    add_filter( 'autoptimize_css_include_inline', function( $include_inline ) {
63
+    add_filter('autoptimize_css_include_inline', function($include_inline) {
64 64
         return true;
65 65
     });
66 66
 
67
-    require dirname( dirname( __FILE__ ) ) . '/autoptimize.php';
67
+    require dirname(dirname(__FILE__)).'/autoptimize.php';
68 68
 }
69
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
69
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
70 70
 
71
-require $_tests_dir . '/includes/bootstrap.php';
71
+require $_tests_dir.'/includes/bootstrap.php';
Please login to merge, or discard this patch.
php/persist-admin-notices-dismissal/persist-admin-notices-dismissal.php 2 patches
Indentation   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -29,131 +29,131 @@
 block discarded – undo
29 29
  * Exit if called directly.
30 30
  */
31 31
 if ( ! defined( 'ABSPATH' ) ) {
32
-	die;
32
+    die;
33 33
 }
34 34
 
35 35
 if ( ! class_exists( 'PAnD' ) ) {
36 36
 
37
-	/**
38
-	 * Class PAnD
39
-	 */
40
-	class PAnD {
41
-
42
-		/**
43
-		 * Init hooks.
44
-		 */
45
-		public static function init() {
46
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
47
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
48
-		}
49
-
50
-		/**
51
-		 * Enqueue javascript and variables.
52
-		 */
53
-		public static function load_script() {
54
-
55
-			if ( is_customize_preview() ) {
56
-				return;
57
-			}
58
-
59
-			wp_enqueue_script(
60
-				'dismissible-notices',
61
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
62
-				array( 'jquery', 'common' ),
63
-				false,
64
-				true
65
-			);
66
-
67
-			wp_localize_script(
68
-				'dismissible-notices',
69
-				'dismissible_notice',
70
-				array(
71
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
72
-				)
73
-			);
74
-		}
75
-
76
-		/**
77
-		 * Handles Ajax request to persist notices dismissal.
78
-		 * Uses check_ajax_referer to verify nonce.
79
-		 */
80
-		public static function dismiss_admin_notice() {
81
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
82
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
83
-
84
-			if ( 'forever' != $dismissible_length ) {
85
-				// If $dismissible_length is not an integer default to 1
86
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
87
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
88
-			}
89
-
90
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
91
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
92
-			wp_die();
93
-		}
94
-
95
-		/**
96
-		 * Is admin notice active?
97
-		 *
98
-		 * @param string $arg data-dismissible content of notice.
99
-		 *
100
-		 * @return bool
101
-		 */
102
-		public static function is_admin_notice_active( $arg ) {
103
-			$array       = explode( '-', $arg );
104
-			$length      = array_pop( $array );
105
-			$option_name = implode( '-', $array );
106
-			$db_record   = self::get_admin_notice_cache( $option_name );
107
-			if ( 'forever' == $db_record ) {
108
-				return false;
109
-			} elseif ( absint( $db_record ) >= time() ) {
110
-				return false;
111
-			} else {
112
-				return true;
113
-			}
114
-		}
115
-
116
-		/**
117
-		 * Returns admin notice cached timeout.
118
-		 *
119
-		 * @access public
120
-		 *
121
-		 * @param string|bool $id admin notice name or false.
122
-		 *
123
-		 * @return array|bool The timeout. False if expired.
124
-		 */
125
-		public static function get_admin_notice_cache( $id = false ) {
126
-			if ( ! $id ) {
127
-				return false;
128
-			}
129
-			$cache_key = 'pand-' . md5( $id );
130
-			$timeout   = get_site_option( $cache_key );
131
-			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
132
-
133
-			if ( empty( $timeout ) || time() > $timeout ) {
134
-				return false;
135
-			}
136
-
137
-			return $timeout;
138
-		}
139
-
140
-		/**
141
-		 * Sets admin notice timeout in site option.
142
-		 *
143
-		 * @access public
144
-		 *
145
-		 * @param string      $id       Data Identifier.
146
-		 * @param string|bool $timeout  Timeout for admin notice.
147
-		 *
148
-		 * @return bool
149
-		 */
150
-		public static function set_admin_notice_cache( $id, $timeout ) {
151
-			$cache_key = 'pand-' . md5( $id );
152
-			update_site_option( $cache_key, $timeout );
153
-
154
-			return true;
155
-		}
156
-
157
-	}
37
+    /**
38
+     * Class PAnD
39
+     */
40
+    class PAnD {
41
+
42
+        /**
43
+         * Init hooks.
44
+         */
45
+        public static function init() {
46
+            add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
47
+            add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
48
+        }
49
+
50
+        /**
51
+         * Enqueue javascript and variables.
52
+         */
53
+        public static function load_script() {
54
+
55
+            if ( is_customize_preview() ) {
56
+                return;
57
+            }
58
+
59
+            wp_enqueue_script(
60
+                'dismissible-notices',
61
+                plugins_url( 'dismiss-notice.js', __FILE__ ),
62
+                array( 'jquery', 'common' ),
63
+                false,
64
+                true
65
+            );
66
+
67
+            wp_localize_script(
68
+                'dismissible-notices',
69
+                'dismissible_notice',
70
+                array(
71
+                    'nonce' => wp_create_nonce( 'dismissible-notice' ),
72
+                )
73
+            );
74
+        }
75
+
76
+        /**
77
+         * Handles Ajax request to persist notices dismissal.
78
+         * Uses check_ajax_referer to verify nonce.
79
+         */
80
+        public static function dismiss_admin_notice() {
81
+            $option_name        = sanitize_text_field( $_POST['option_name'] );
82
+            $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
83
+
84
+            if ( 'forever' != $dismissible_length ) {
85
+                // If $dismissible_length is not an integer default to 1
86
+                $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
87
+                $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
88
+            }
89
+
90
+            check_ajax_referer( 'dismissible-notice', 'nonce' );
91
+            self::set_admin_notice_cache( $option_name, $dismissible_length );
92
+            wp_die();
93
+        }
94
+
95
+        /**
96
+         * Is admin notice active?
97
+         *
98
+         * @param string $arg data-dismissible content of notice.
99
+         *
100
+         * @return bool
101
+         */
102
+        public static function is_admin_notice_active( $arg ) {
103
+            $array       = explode( '-', $arg );
104
+            $length      = array_pop( $array );
105
+            $option_name = implode( '-', $array );
106
+            $db_record   = self::get_admin_notice_cache( $option_name );
107
+            if ( 'forever' == $db_record ) {
108
+                return false;
109
+            } elseif ( absint( $db_record ) >= time() ) {
110
+                return false;
111
+            } else {
112
+                return true;
113
+            }
114
+        }
115
+
116
+        /**
117
+         * Returns admin notice cached timeout.
118
+         *
119
+         * @access public
120
+         *
121
+         * @param string|bool $id admin notice name or false.
122
+         *
123
+         * @return array|bool The timeout. False if expired.
124
+         */
125
+        public static function get_admin_notice_cache( $id = false ) {
126
+            if ( ! $id ) {
127
+                return false;
128
+            }
129
+            $cache_key = 'pand-' . md5( $id );
130
+            $timeout   = get_site_option( $cache_key );
131
+            $timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
132
+
133
+            if ( empty( $timeout ) || time() > $timeout ) {
134
+                return false;
135
+            }
136
+
137
+            return $timeout;
138
+        }
139
+
140
+        /**
141
+         * Sets admin notice timeout in site option.
142
+         *
143
+         * @access public
144
+         *
145
+         * @param string      $id       Data Identifier.
146
+         * @param string|bool $timeout  Timeout for admin notice.
147
+         *
148
+         * @return bool
149
+         */
150
+        public static function set_admin_notice_cache( $id, $timeout ) {
151
+            $cache_key = 'pand-' . md5( $id );
152
+            update_site_option( $cache_key, $timeout );
153
+
154
+            return true;
155
+        }
156
+
157
+    }
158 158
 
159 159
 }
Please login to merge, or discard this patch.
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
 /**
29 29
  * Exit if called directly.
30 30
  */
31
-if ( ! defined( 'ABSPATH' ) ) {
31
+if (!defined('ABSPATH')) {
32 32
 	die;
33 33
 }
34 34
 
35
-if ( ! class_exists( 'PAnD' ) ) {
35
+if (!class_exists('PAnD')) {
36 36
 
37 37
 	/**
38 38
 	 * Class PAnD
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 		 * Init hooks.
44 44
 		 */
45 45
 		public static function init() {
46
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
47
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
46
+			add_action('admin_enqueue_scripts', array(__CLASS__, 'load_script'));
47
+			add_action('wp_ajax_dismiss_admin_notice', array(__CLASS__, 'dismiss_admin_notice'));
48 48
 		}
49 49
 
50 50
 		/**
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
 		 */
53 53
 		public static function load_script() {
54 54
 
55
-			if ( is_customize_preview() ) {
55
+			if (is_customize_preview()) {
56 56
 				return;
57 57
 			}
58 58
 
59 59
 			wp_enqueue_script(
60 60
 				'dismissible-notices',
61
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
62
-				array( 'jquery', 'common' ),
61
+				plugins_url('dismiss-notice.js', __FILE__),
62
+				array('jquery', 'common'),
63 63
 				false,
64 64
 				true
65 65
 			);
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 				'dismissible-notices',
69 69
 				'dismissible_notice',
70 70
 				array(
71
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
71
+					'nonce' => wp_create_nonce('dismissible-notice'),
72 72
 				)
73 73
 			);
74 74
 		}
@@ -78,17 +78,17 @@  discard block
 block discarded – undo
78 78
 		 * Uses check_ajax_referer to verify nonce.
79 79
 		 */
80 80
 		public static function dismiss_admin_notice() {
81
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
82
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
81
+			$option_name        = sanitize_text_field($_POST['option_name']);
82
+			$dismissible_length = sanitize_text_field($_POST['dismissible_length']);
83 83
 
84
-			if ( 'forever' != $dismissible_length ) {
84
+			if ('forever' != $dismissible_length) {
85 85
 				// If $dismissible_length is not an integer default to 1
86
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
87
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
86
+				$dismissible_length = (0 == absint($dismissible_length)) ? 1 : $dismissible_length;
87
+				$dismissible_length = strtotime(absint($dismissible_length).' days');
88 88
 			}
89 89
 
90
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
91
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
90
+			check_ajax_referer('dismissible-notice', 'nonce');
91
+			self::set_admin_notice_cache($option_name, $dismissible_length);
92 92
 			wp_die();
93 93
 		}
94 94
 
@@ -99,14 +99,14 @@  discard block
 block discarded – undo
99 99
 		 *
100 100
 		 * @return bool
101 101
 		 */
102
-		public static function is_admin_notice_active( $arg ) {
103
-			$array       = explode( '-', $arg );
104
-			$length      = array_pop( $array );
105
-			$option_name = implode( '-', $array );
106
-			$db_record   = self::get_admin_notice_cache( $option_name );
107
-			if ( 'forever' == $db_record ) {
102
+		public static function is_admin_notice_active($arg) {
103
+			$array       = explode('-', $arg);
104
+			$length      = array_pop($array);
105
+			$option_name = implode('-', $array);
106
+			$db_record   = self::get_admin_notice_cache($option_name);
107
+			if ('forever' == $db_record) {
108 108
 				return false;
109
-			} elseif ( absint( $db_record ) >= time() ) {
109
+			} elseif (absint($db_record) >= time()) {
110 110
 				return false;
111 111
 			} else {
112 112
 				return true;
@@ -122,15 +122,15 @@  discard block
 block discarded – undo
122 122
 		 *
123 123
 		 * @return array|bool The timeout. False if expired.
124 124
 		 */
125
-		public static function get_admin_notice_cache( $id = false ) {
126
-			if ( ! $id ) {
125
+		public static function get_admin_notice_cache($id = false) {
126
+			if (!$id) {
127 127
 				return false;
128 128
 			}
129
-			$cache_key = 'pand-' . md5( $id );
130
-			$timeout   = get_site_option( $cache_key );
129
+			$cache_key = 'pand-'.md5($id);
130
+			$timeout   = get_site_option($cache_key);
131 131
 			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
132 132
 
133
-			if ( empty( $timeout ) || time() > $timeout ) {
133
+			if (empty($timeout) || time() > $timeout) {
134 134
 				return false;
135 135
 			}
136 136
 
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
 		 *
148 148
 		 * @return bool
149 149
 		 */
150
-		public static function set_admin_notice_cache( $id, $timeout ) {
151
-			$cache_key = 'pand-' . md5( $id );
152
-			update_site_option( $cache_key, $timeout );
150
+		public static function set_admin_notice_cache($id, $timeout) {
151
+			$cache_key = 'pand-'.md5($id);
152
+			update_site_option($cache_key, $timeout);
153 153
 
154 154
 			return true;
155 155
 		}
Please login to merge, or discard this patch.