Completed
Push — master ( 278c49...8e92fc )
by frank
01:56
created
classes/autoptimizeCLI.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@  discard block
 block discarded – undo
3 3
  * WP-CLI commands for Autoptimize.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
10 10
 // This is a WP-CLI command, so bail if it's not available.
11
-if ( ! defined( 'WP_CLI' ) ) {
11
+if (!defined('WP_CLI')) {
12 12
     return;
13 13
 }
14 14
 
@@ -24,11 +24,11 @@  discard block
 block discarded – undo
24 24
      *
25 25
      * @return void
26 26
      */
27
-    public function clear( $args, $args_assoc ) {
28
-        WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
27
+    public function clear($args, $args_assoc) {
28
+        WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize'));
29 29
         autoptimizeCache::clearall();
30
-        WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
30
+        WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize'));
31 31
     }
32 32
 }
33 33
 
34
-WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' );
34
+WP_CLI::add_command('autoptimize', 'autoptimizeCLI');
Please login to merge, or discard this patch.
classes/autoptimizePartners.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * addons and/or affiliate services.
5 5
  */
6 6
 
7
-if ( ! defined( 'ABSPATH' ) ) {
7
+if (!defined('ABSPATH')) {
8 8
     exit;
9 9
 }
10 10
 
@@ -17,64 +17,64 @@  discard block
 block discarded – undo
17 17
 
18 18
     public function run()
19 19
     {
20
-        if ( $this->enabled() ) {
21
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_partner_tabs' ), 10, 1 );
20
+        if ($this->enabled()) {
21
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_partner_tabs'), 10, 1);
22 22
         }
23
-        add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
23
+        add_action('admin_menu', array($this, 'add_admin_menu'));
24 24
     }
25 25
 
26 26
     protected function enabled()
27 27
     {
28
-        return apply_filters( 'autoptimize_filter_show_partner_tabs', true );
28
+        return apply_filters('autoptimize_filter_show_partner_tabs', true);
29 29
     }
30 30
 
31
-    public function add_partner_tabs( $in )
31
+    public function add_partner_tabs($in)
32 32
     {
33
-        $in = array_merge( $in, array(
34
-            'ao_partners' => __( 'Optimize More!', 'autoptimize' ),
35
-        ) );
33
+        $in = array_merge($in, array(
34
+            'ao_partners' => __('Optimize More!', 'autoptimize'),
35
+        ));
36 36
 
37 37
         return $in;
38 38
     }
39 39
 
40 40
     public function add_admin_menu()
41 41
     {
42
-        if ( $this->enabled() ) {
43
-            add_submenu_page( null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array( $this, 'ao_partners_page' ) );
42
+        if ($this->enabled()) {
43
+            add_submenu_page(null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array($this, 'ao_partners_page'));
44 44
         }
45 45
     }
46 46
 
47 47
     protected function get_ao_partner_feed_markup()
48 48
     {
49
-        $no_feed_text = __( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
49
+        $no_feed_text = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
50 50
         $output       = '';
51
-        if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) {
52
-            $rss      = fetch_feed( 'http://feeds.feedburner.com/OptimizingMattersDownloads' );
51
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
52
+            $rss      = fetch_feed('http://feeds.feedburner.com/OptimizingMattersDownloads');
53 53
             $maxitems = 0;
54 54
 
55
-            if ( ! is_wp_error( $rss ) ) {
56
-                $maxitems  = $rss->get_item_quantity( 20 );
57
-                $rss_items = $rss->get_items( 0, $maxitems );
55
+            if (!is_wp_error($rss)) {
56
+                $maxitems  = $rss->get_item_quantity(20);
57
+                $rss_items = $rss->get_items(0, $maxitems);
58 58
             }
59 59
 
60
-            if ( 0 == $maxitems ) {
60
+            if (0 == $maxitems) {
61 61
                 $output .= $no_feed_text;
62 62
             } else {
63 63
                 $output .= '<ul>';
64
-                foreach ( $rss_items as $item ) {
65
-                    $item_url  = esc_url( $item->get_permalink() );
64
+                foreach ($rss_items as $item) {
65
+                    $item_url  = esc_url($item->get_permalink());
66 66
                     $enclosure = $item->get_enclosure();
67 67
 
68 68
                     $output .= '<li class="itemDetail">';
69
-                    $output .= '<h3 class="itemTitle"><a href="' . $item_url . '" target="_blank">' . esc_html( $item->get_title() ) . '</a></h3>';
69
+                    $output .= '<h3 class="itemTitle"><a href="'.$item_url.'" target="_blank">'.esc_html($item->get_title()).'</a></h3>';
70 70
 
71
-                    if ( $enclosure && ( false !== strpos( $enclosure->get_type(), 'image' ) ) ) {
72
-                        $img_url = esc_url( $enclosure->get_link() );
73
-                        $output .= '<div class="itemImage"><a href="' . $item_url . '" target="_blank"><img src="' . $img_url . '"></a></div>';
71
+                    if ($enclosure && (false !== strpos($enclosure->get_type(), 'image'))) {
72
+                        $img_url = esc_url($enclosure->get_link());
73
+                        $output .= '<div class="itemImage"><a href="'.$item_url.'" target="_blank"><img src="'.$img_url.'"></a></div>';
74 74
                     }
75 75
 
76
-                    $output .= '<div class="itemDescription">' . wp_kses_post( $item->get_description() ) . '</div>';
77
-                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="' . $item_url . '" target="_blank">' . __( 'More info', 'autoptimize' ) . '</a></div></div>';
76
+                    $output .= '<div class="itemDescription">'.wp_kses_post($item->get_description()).'</div>';
77
+                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="'.$item_url.'" target="_blank">'.__('More info', 'autoptimize').'</a></div></div>';
78 78
                     $output .= '</li>';
79 79
                 }
80 80
                 $output .= '</ul>';
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
     }
134 134
     </style>
135 135
     <div class="wrap">
136
-        <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
136
+        <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
137 137
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
138
-        <?php echo '<h2>' . __( "These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize' ) . '</h2>'; ?>
138
+        <?php echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>'; ?>
139 139
         <div>
140 140
             <?php echo $this->get_ao_partner_feed_markup(); ?>
141 141
         </div>
Please login to merge, or discard this patch.
classes/autoptimizeCSSmin.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
      *
22 22
      * @param bool $raise_limits Whether to raise memory limits or not. Default true.
23 23
      */
24
-    public function __construct( $raise_limits = true )
24
+    public function __construct($raise_limits = true)
25 25
     {
26
-        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits );
26
+        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits);
27 27
     }
28 28
 
29 29
     /**
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
      *
35 35
      * @return string
36 36
      */
37
-    public function run( $css )
37
+    public function run($css)
38 38
     {
39
-        $result = $this->minifier->run( $css );
39
+        $result = $this->minifier->run($css);
40 40
 
41 41
         return $result;
42 42
     }
@@ -48,10 +48,10 @@  discard block
 block discarded – undo
48 48
      *
49 49
      * @return string
50 50
      */
51
-    public static function minify( $css )
51
+    public static function minify($css)
52 52
     {
53 53
         $minifier = new self();
54 54
 
55
-        return $minifier->run( $css );
55
+        return $minifier->run($css);
56 56
     }
57 57
 }
Please login to merge, or discard this patch.
classes/autoptimizeVersionUpdatesHandler.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Handles version updates and should only be instantiated in autoptimize.php if/when needed.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -16,9 +16,9 @@  discard block
 block discarded – undo
16 16
      */
17 17
     protected $current_major_version = null;
18 18
 
19
-    public function __construct( $current_version )
19
+    public function __construct($current_version)
20 20
     {
21
-        $this->current_major_version = substr( $current_version, 0, 3 );
21
+        $this->current_major_version = substr($current_version, 0, 3);
22 22
     }
23 23
 
24 24
     /**
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
     {
30 30
         $major_update = false;
31 31
 
32
-        switch ( $this->current_major_version ) {
32
+        switch ($this->current_major_version) {
33 33
             case '1.6':
34 34
                 $this->upgrade_from_1_6();
35 35
                 $major_update = true;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
                 // No break, intentionally, so all upgrades are ran during a single request...
49 49
         }
50 50
 
51
-        if ( true === $major_update ) {
51
+        if (true === $major_update) {
52 52
             $this->on_major_version_update();
53 53
         }
54 54
     }
@@ -60,19 +60,19 @@  discard block
 block discarded – undo
60 60
      *
61 61
      * @param string $target Target version to check against (ie., the currently running one).
62 62
      */
63
-    public static function check_installed_and_update( $target )
63
+    public static function check_installed_and_update($target)
64 64
     {
65
-        $db_version = get_option( 'autoptimize_version', 'none' );
66
-        if ( $db_version !== $target ) {
67
-            if ( 'none' === $db_version ) {
68
-                add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
65
+        $db_version = get_option('autoptimize_version', 'none');
66
+        if ($db_version !== $target) {
67
+            if ('none' === $db_version) {
68
+                add_action('admin_notices', 'autoptimizeMain::notice_installed');
69 69
             } else {
70
-                $updater = new self( $db_version );
70
+                $updater = new self($db_version);
71 71
                 $updater->run_needed_major_upgrades();
72 72
             }
73 73
 
74 74
             // Versions differed, upgrades happened if needed, store the new version.
75
-            update_option( 'autoptimize_version', $target );
75
+            update_option('autoptimize_version', $target);
76 76
         }
77 77
     }
78 78
 
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
     protected function on_major_version_update()
84 84
     {
85 85
         // The transients guard here prevents stale object caches from busting the cache on every request.
86
-        if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) {
87
-            set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS );
86
+        if (false == get_transient('autoptimize_stale_option_buster')) {
87
+            set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
88 88
             autoptimizeCache::clearall();
89
-            add_action( 'admin_notices', 'autoptimizeMain::notice_updated' );
89
+            add_action('admin_notices', 'autoptimizeMain::notice_updated');
90 90
         }
91 91
     }
92 92
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     private function upgrade_from_1_6()
97 97
     {
98 98
         // If user was on version 1.6.x, force advanced options to be shown by default.
99
-        update_option( 'autoptimize_show_adv', '1' );
99
+        update_option('autoptimize_show_adv', '1');
100 100
 
101 101
         // And remove old options.
102 102
         $to_delete_options = array(
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
             'autoptimize_cdn_img_url',
109 109
             'autoptimize_css_yui',
110 110
         );
111
-        foreach ( $to_delete_options as $del_opt ) {
112
-            delete_option( $del_opt );
111
+        foreach ($to_delete_options as $del_opt) {
112
+            delete_option($del_opt);
113 113
         }
114 114
     }
115 115
 
@@ -120,29 +120,29 @@  discard block
 block discarded – undo
120 120
      */
121 121
     private function upgrade_from_1_7()
122 122
     {
123
-        if ( ! is_multisite() ) {
124
-            $css_exclude = get_option( 'autoptimize_css_exclude' );
125
-            if ( empty( $css_exclude ) ) {
123
+        if (!is_multisite()) {
124
+            $css_exclude = get_option('autoptimize_css_exclude');
125
+            if (empty($css_exclude)) {
126 126
                 $css_exclude = 'admin-bar.min.css, dashicons.min.css';
127
-            } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
127
+            } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
128 128
                 $css_exclude .= ', dashicons.min.css';
129 129
             }
130
-            update_option( 'autoptimize_css_exclude', $css_exclude );
130
+            update_option('autoptimize_css_exclude', $css_exclude);
131 131
         } else {
132 132
             global $wpdb;
133
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
133
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
134 134
             $original_blog_id = get_current_blog_id();
135
-            foreach ( $blog_ids as $blog_id ) {
136
-                switch_to_blog( $blog_id );
137
-                $css_exclude = get_option( 'autoptimize_css_exclude' );
138
-                if ( empty( $css_exclude ) ) {
135
+            foreach ($blog_ids as $blog_id) {
136
+                switch_to_blog($blog_id);
137
+                $css_exclude = get_option('autoptimize_css_exclude');
138
+                if (empty($css_exclude)) {
139 139
                     $css_exclude = 'admin-bar.min.css, dashicons.min.css';
140
-                } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
140
+                } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
141 141
                     $css_exclude .= ', dashicons.min.css';
142 142
                 }
143
-                update_option( 'autoptimize_css_exclude', $css_exclude );
143
+                update_option('autoptimize_css_exclude', $css_exclude);
144 144
             }
145
-            switch_to_blog( $original_blog_id );
145
+            switch_to_blog($original_blog_id);
146 146
         }
147 147
     }
148 148
 
@@ -154,19 +154,19 @@  discard block
 block discarded – undo
154 154
      */
155 155
     private function upgrade_from_1_9()
156 156
     {
157
-        if ( ! is_multisite() ) {
158
-            update_option( 'autoptimize_css_include_inline', 'on' );
159
-            update_option( 'autoptimize_js_include_inline', 'on' );
157
+        if (!is_multisite()) {
158
+            update_option('autoptimize_css_include_inline', 'on');
159
+            update_option('autoptimize_js_include_inline', 'on');
160 160
         } else {
161 161
             global $wpdb;
162
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
162
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
163 163
             $original_blog_id = get_current_blog_id();
164
-            foreach ( $blog_ids as $blog_id ) {
165
-                switch_to_blog( $blog_id );
166
-                update_option( 'autoptimize_css_include_inline', 'on' );
167
-                update_option( 'autoptimize_js_include_inline', 'on' );
164
+            foreach ($blog_ids as $blog_id) {
165
+                switch_to_blog($blog_id);
166
+                update_option('autoptimize_css_include_inline', 'on');
167
+                update_option('autoptimize_js_include_inline', 'on');
168 168
             }
169
-            switch_to_blog( $original_blog_id );
169
+            switch_to_blog($original_blog_id);
170 170
         }
171 171
     }
172 172
 
@@ -177,17 +177,17 @@  discard block
 block discarded – undo
177 177
      */
178 178
     private function upgrade_from_2_2()
179 179
     {
180
-        if ( ! is_multisite() ) {
180
+        if (!is_multisite()) {
181 181
             $this->do_2_2_settings_update();
182 182
         } else {
183 183
             global $wpdb;
184
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
184
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
185 185
             $original_blog_id = get_current_blog_id();
186
-            foreach ( $blog_ids as $blog_id ) {
187
-                switch_to_blog( $blog_id );
186
+            foreach ($blog_ids as $blog_id) {
187
+                switch_to_blog($blog_id);
188 188
                 $this->do_2_2_settings_update();
189 189
             }
190
-            switch_to_blog( $original_blog_id );
190
+            switch_to_blog($original_blog_id);
191 191
         }
192 192
     }
193 193
 
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
196 196
      */
197 197
     private function do_2_2_settings_update()
198 198
     {
199
-        $nogooglefont    = get_option( 'autoptimize_css_nogooglefont', '' );
200
-        $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
201
-        if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
202
-            update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
199
+        $nogooglefont    = get_option('autoptimize_css_nogooglefont', '');
200
+        $ao_extrasetting = get_option('autoptimize_extra_settings', '');
201
+        if (($nogooglefont) && (empty($ao_extrasetting))) {
202
+            update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options());
203 203
         }
204
-        delete_option( 'autoptimize_css_nogooglefont' );
204
+        delete_option('autoptimize_css_nogooglefont');
205 205
     }
206 206
 }
Please login to merge, or discard this patch.
classes/autoptimizeSpeedupper.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
  * new in Autoptimize 2.2
5 5
  */
6 6
 
7
-if ( ! defined( 'ABSPATH' ) ) {
7
+if (!defined('ABSPATH')) {
8 8
     exit;
9 9
 }
10 10
 
@@ -17,94 +17,94 @@  discard block
 block discarded – undo
17 17
 
18 18
     public function add_hooks()
19 19
     {
20
-        if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
21
-            add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 );
22
-            add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 );
20
+        if (apply_filters('autoptimize_js_do_minify', true)) {
21
+            add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2);
22
+            add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1);
23 23
         }
24
-        if ( apply_filters( 'autoptimize_css_do_minify', true ) ) {
25
-            add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 );
26
-            add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 );
24
+        if (apply_filters('autoptimize_css_do_minify', true)) {
25
+            add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2);
26
+            add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1);
27 27
         }
28 28
     }
29 29
 
30
-    public function js_snippetcacher( $jsin, $jsfilename )
30
+    public function js_snippetcacher($jsin, $jsfilename)
31 31
     {
32
-        $md5hash = 'snippet_' . md5( $jsin );
33
-        $ccheck  = new autoptimizeCache( $md5hash, 'js' );
34
-        if ( $ccheck->check() ) {
32
+        $md5hash = 'snippet_'.md5($jsin);
33
+        $ccheck  = new autoptimizeCache($md5hash, 'js');
34
+        if ($ccheck->check()) {
35 35
             $scriptsrc = $ccheck->retrieve();
36 36
         } else {
37
-            if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) {
38
-                $tmp_jscode = trim( JSMin::minify( $jsin ) );
39
-                if ( ! empty( $tmp_jscode ) ) {
37
+            if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
38
+                $tmp_jscode = trim(JSMin::minify($jsin));
39
+                if (!empty($tmp_jscode)) {
40 40
                     $scriptsrc = $tmp_jscode;
41
-                    unset( $tmp_jscode );
41
+                    unset($tmp_jscode);
42 42
                 } else {
43 43
                     $scriptsrc = $jsin;
44 44
                 }
45 45
             } else {
46 46
                 // Removing comments, linebreaks and stuff!
47
-                $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin );
48
-                $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc );
49
-                $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc );
47
+                $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin);
48
+                $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc);
49
+                $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
50 50
             }
51 51
 
52
-            $last_char = substr( $scriptsrc, -1, 1 );
53
-            if ( ';' !== $last_char && '}' !== $last_char ) {
52
+            $last_char = substr($scriptsrc, -1, 1);
53
+            if (';' !== $last_char && '}' !== $last_char) {
54 54
                 $scriptsrc .= ';';
55 55
             }
56 56
 
57
-            if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) {
57
+            if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) {
58 58
                 // Don't cache inline CSS or if filter says no!
59
-                $ccheck->cache( $scriptsrc, 'text/javascript' );
59
+                $ccheck->cache($scriptsrc, 'text/javascript');
60 60
             }
61 61
         }
62
-        unset( $ccheck );
62
+        unset($ccheck);
63 63
 
64 64
         return $scriptsrc;
65 65
     }
66 66
 
67
-    public function css_snippetcacher( $cssin, $cssfilename )
67
+    public function css_snippetcacher($cssin, $cssfilename)
68 68
     {
69
-        $md5hash = 'snippet_' . md5( $cssin );
70
-        $ccheck  = new autoptimizeCache( $md5hash, 'css' );
71
-        if ( $ccheck->check() ) {
69
+        $md5hash = 'snippet_'.md5($cssin);
70
+        $ccheck  = new autoptimizeCache($md5hash, 'css');
71
+        if ($ccheck->check()) {
72 72
             $stylesrc = $ccheck->retrieve();
73 73
         } else {
74
-            if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) {
74
+            if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
75 75
                 $cssmin   = new autoptimizeCSSmin();
76
-                $tmp_code = trim( $cssmin->run( $cssin ) );
76
+                $tmp_code = trim($cssmin->run($cssin));
77 77
 
78
-                if ( ! empty( $tmp_code ) ) {
78
+                if (!empty($tmp_code)) {
79 79
                     $stylesrc = $tmp_code;
80
-                    unset( $tmp_code );
80
+                    unset($tmp_code);
81 81
                 } else {
82 82
                     $stylesrc = $cssin;
83 83
                 }
84 84
             } else {
85 85
                 // .min.css -> no heavy-lifting, just some cleanup!
86
-                $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin );
87
-                $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc );
88
-                $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc );
86
+                $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin);
87
+                $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
88
+                $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
89 89
             }
90
-            if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) {
90
+            if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) {
91 91
                 // Only caching CSS if it's not inline and is allowed by filter!
92
-                $ccheck->cache( $stylesrc, 'text/css' );
92
+                $ccheck->cache($stylesrc, 'text/css');
93 93
             }
94 94
         }
95
-        unset( $ccheck );
95
+        unset($ccheck);
96 96
 
97 97
         return $stylesrc;
98 98
     }
99 99
 
100
-    public function css_cleanup( $cssin )
100
+    public function css_cleanup($cssin)
101 101
     {
102 102
         // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed.
103
-        return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) );
103
+        return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
104 104
     }
105 105
 
106
-    public function js_cleanup( $jsin )
106
+    public function js_cleanup($jsin)
107 107
     {
108
-        return trim( $jsin );
108
+        return trim($jsin);
109 109
     }
110 110
 }
Please login to merge, or discard this patch.
classes/autoptimizeToolbar.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Handles toolbar-related stuff.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -12,32 +12,32 @@  discard block
 block discarded – undo
12 12
     public function __construct()
13 13
     {
14 14
         // If Cache is not available we don't add the toolbar.
15
-        if ( ! autoptimizeCache::cacheavail() ) {
15
+        if (!autoptimizeCache::cacheavail()) {
16 16
             return;
17 17
         }
18 18
 
19 19
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
20
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
20
+        add_action('wp_loaded', array($this, 'load_toolbar'));
21 21
     }
22 22
 
23 23
     public function load_toolbar()
24 24
     {
25 25
         // Check permissions and that toolbar is not hidden via filter.
26
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
26
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
27 27
 
28 28
             // Create a handler for the AJAX toolbar requests.
29
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
29
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
30 30
 
31 31
             // Load custom styles, scripts and menu only when needed.
32
-            if ( is_admin_bar_showing() ) {
33
-                if ( is_admin() ) {
34
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
32
+            if (is_admin_bar_showing()) {
33
+                if (is_admin()) {
34
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
35 35
                 } else {
36
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
36
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
37 37
                 }
38 38
 
39 39
                 // Add the Autoptimize Toolbar to the Admin bar.
40
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
40
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
41 41
             }
42 42
         }
43 43
     }
@@ -50,17 +50,17 @@  discard block
 block discarded – undo
50 50
         $stats = autoptimizeCache::stats();
51 51
 
52 52
         // Set the Max Size recommended for cache files.
53
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
53
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
54 54
 
55 55
         // Retrieve the current Total Files in cache.
56 56
         $files = $stats[0];
57 57
         // Retrieve the current Total Size of the cache.
58 58
         $bytes = $stats[1];
59
-        $size  = $this->format_filesize( $bytes );
59
+        $size  = $this->format_filesize($bytes);
60 60
 
61 61
         // Calculate the percentage of cache used.
62
-        $percentage = ceil( $bytes / $max_size * 100 );
63
-        if ( $percentage > 100 ) {
62
+        $percentage = ceil($bytes/$max_size*100);
63
+        if ($percentage > 100) {
64 64
             $percentage = 100;
65 65
         }
66 66
 
@@ -70,81 +70,81 @@  discard block
 block discarded – undo
70 70
          * - "orange" if over 80%.
71 71
          * - "red" if over 100%.
72 72
          */
73
-        $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
73
+        $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
74 74
 
75 75
         // Create or add new items into the Admin Toolbar.
76 76
         // Main "Autoptimize" node.
77
-        $wp_admin_bar->add_node( array(
77
+        $wp_admin_bar->add_node(array(
78 78
             'id'    => 'autoptimize',
79
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>',
80
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
81
-            'meta'  => array( 'class' => 'bullet-' . $color ),
79
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>',
80
+            'href'  => admin_url('options-general.php?page=autoptimize'),
81
+            'meta'  => array('class' => 'bullet-'.$color),
82 82
         ));
83 83
 
84 84
         // "Cache Info" node.
85
-        $wp_admin_bar->add_node( array(
85
+        $wp_admin_bar->add_node(array(
86 86
             'id'     => 'autoptimize-cache-info',
87
-            'title'  => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' .
88
-                        '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
89
-                        '<div class="autoptimize-circle">' .
90
-                        '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' .
91
-                        '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' .
92
-                        '<div class="shadow"></div>' .
93
-                        '</div>' .
94
-                        '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' .
95
-                        '</div>' .
96
-                        '<table>' .
97
-                        '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
98
-                        '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
87
+            'title'  => '<p>'.__('Cache Info', 'autoptimize').'</p>'.
88
+                        '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
89
+                        '<div class="autoptimize-circle">'.
90
+                        '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
91
+                        '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
92
+                        '<div class="shadow"></div>'.
93
+                        '</div>'.
94
+                        '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
95
+                        '</div>'.
96
+                        '<table>'.
97
+                        '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
98
+                        '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
99 99
                         '</table>',
100 100
             'parent' => 'autoptimize',
101 101
         ));
102 102
 
103 103
         // "Delete Cache" node.
104
-        $wp_admin_bar->add_node( array(
104
+        $wp_admin_bar->add_node(array(
105 105
             'id'     => 'autoptimize-delete-cache',
106
-            'title'  => __( 'Delete Cache', 'autoptimize' ),
106
+            'title'  => __('Delete Cache', 'autoptimize'),
107 107
             'parent' => 'autoptimize',
108 108
         ));
109 109
     }
110 110
 
111 111
     public function delete_cache()
112 112
     {
113
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
113
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
114 114
 
115 115
         $result = false;
116
-        if ( current_user_can( 'manage_options' ) ) {
116
+        if (current_user_can('manage_options')) {
117 117
             // We call the function for cleaning the Autoptimize cache.
118 118
             $result = autoptimizeCache::clearall();
119 119
         }
120 120
 
121
-        wp_send_json( $result );
121
+        wp_send_json($result);
122 122
     }
123 123
 
124 124
     public function enqueue_scripts()
125 125
     {
126 126
         // Autoptimize Toolbar Styles.
127
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' );
127
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all');
128 128
 
129 129
         // Autoptimize Toolbar Javascript.
130
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true );
130
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true);
131 131
 
132 132
         // Localizes a registered script with data for a JavaScript variable.
133 133
         // Needed for the AJAX to work properly on the frontend.
134
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
135
-            'ajaxurl'     => admin_url( 'admin-ajax.php' ),
136
-            'error_msg'   => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
137
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
138
-            'nonce'       => wp_create_nonce( 'ao_delcache_nonce' ),
139
-        ) );
134
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
135
+            'ajaxurl'     => admin_url('admin-ajax.php'),
136
+            'error_msg'   => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
137
+            'dismiss_msg' => __('Dismiss this notice.'),
138
+            'nonce'       => wp_create_nonce('ao_delcache_nonce'),
139
+        ));
140 140
     }
141 141
 
142
-    public function format_filesize( $bytes, $decimals = 2 )
142
+    public function format_filesize($bytes, $decimals = 2)
143 143
     {
144
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
144
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
145 145
 
146
-        for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine
146
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine
147 147
 
148
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] );
148
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
149 149
     }
150 150
 }
Please login to merge, or discard this patch.
classes/autoptimizeStyles.php 2 patches
Doc Comments   +19 added lines, -2 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      * be inlined into a data: URI. Defaults to 4096, passed through
283 283
      * `autoptimize_filter_css_datauri_maxsize` filter.
284 284
      *
285
-     * @return mixed
285
+     * @return integer|null
286 286
      */
287 287
     private function get_datauri_maxsize()
288 288
     {
@@ -303,6 +303,9 @@  discard block
 block discarded – undo
303 303
         return $max_size;
304 304
     }
305 305
 
306
+    /**
307
+     * @param false|string $url
308
+     */
306 309
     private function check_datauri_exclude_list( $url )
307 310
     {
308 311
         static $exclude_list = null;
@@ -328,6 +331,9 @@  discard block
 block discarded – undo
328 331
         return $matched;
329 332
     }
330 333
 
334
+    /**
335
+     * @param false|string $path
336
+     */
331 337
     private function build_or_get_datauri_image( $path )
332 338
     {
333 339
         /**
@@ -746,6 +752,11 @@  discard block
 block discarded – undo
746 752
         return true;
747 753
     }
748 754
 
755
+    /**
756
+     * @param string $code
757
+     *
758
+     * @return string
759
+     */
749 760
     public function run_minifier_on( $code )
750 761
     {
751 762
         if ( ! $this->alreadyminified ) {
@@ -945,6 +956,9 @@  discard block
 block discarded – undo
945 956
         return $code;
946 957
     }
947 958
 
959
+    /**
960
+     * @param string $tag
961
+     */
948 962
     private function ismovable( $tag )
949 963
     {
950 964
         if ( ! $this->aggregate ) {
@@ -1005,7 +1019,7 @@  discard block
 block discarded – undo
1005 1019
      * @param string $filepath Filepath.
1006 1020
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
1007 1021
      *
1008
-     * @return bool|string Url pointing to the minified css file or false.
1022
+     * @return false|string Url pointing to the minified css file or false.
1009 1023
      */
1010 1024
     public function minify_single( $filepath, $cache_miss = false )
1011 1025
     {
@@ -1057,6 +1071,9 @@  discard block
 block discarded – undo
1057 1071
         $this->options = $options;
1058 1072
     }
1059 1073
 
1074
+    /**
1075
+     * @param string $name
1076
+     */
1060 1077
     public function setOption( $name, $value )
1061 1078
     {
1062 1079
         $this->options[$name] = $value;
Please login to merge, or discard this patch.
Spacing   +306 added lines, -306 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
  * Class for CSS optimization.
4 4
  */
5 5
 
6
-if ( ! defined( 'ABSPATH' ) ) {
6
+if (!defined('ABSPATH')) {
7 7
     exit;
8 8
 }
9 9
 
@@ -48,53 +48,53 @@  discard block
 block discarded – undo
48 48
     // public $cdn_url; // Used all over the place implicitly, so will have to be either public or protected :/ .
49 49
 
50 50
     // Reads the page and collects style tags.
51
-    public function read( $options )
51
+    public function read($options)
52 52
     {
53
-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
54
-        if ( $noptimizeCSS ) {
53
+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
54
+        if ($noptimizeCSS) {
55 55
             return false;
56 56
         }
57 57
 
58
-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );
59
-        if ( ! empty( $whitelistCSS ) ) {
60
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistCSS ) ) );
58
+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
59
+        if (!empty($whitelistCSS)) {
60
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistCSS)));
61 61
         }
62 62
 
63
-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', '' );
64
-        if ( ! empty( $removableCSS ) ) {
65
-            $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removableCSS ) ) );
63
+        $removableCSS = apply_filters('autoptimize_filter_css_removables', '');
64
+        if (!empty($removableCSS)) {
65
+            $this->cssremovables = array_filter(array_map('trim', explode(',', $removableCSS)));
66 66
         }
67 67
 
68
-        $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 );
68
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
69 69
 
70 70
         // filter to "late inject minified CSS", default to true for now (it is faster).
71
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true );
71
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
72 72
 
73 73
         // Remove everything that's not the header.
74
-        if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) {
75
-            $content             = explode( '</head>', $this->content, 2 );
76
-            $this->content       = $content[0] . '</head>';
74
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) {
75
+            $content             = explode('</head>', $this->content, 2);
76
+            $this->content       = $content[0].'</head>';
77 77
             $this->restofcontent = $content[1];
78 78
         }
79 79
 
80 80
         // Determine whether we're doing CSS-files aggregation or not.
81
-        if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) {
81
+        if (isset($options['aggregate']) && !$options['aggregate']) {
82 82
             $this->aggregate = false;
83 83
         }
84 84
         // Returning true for "dontaggregate" turns off aggregation.
85
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) {
85
+        if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) {
86 86
             $this->aggregate = false;
87 87
         }
88 88
 
89 89
         // include inline?
90
-        if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) {
90
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) {
91 91
             $this->include_inline = true;
92 92
         }
93 93
 
94 94
         // List of CSS strings which are excluded from autoptimization.
95
-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content );
96
-        if ( '' !== $excludeCSS ) {
97
-            $this->dontmove = array_filter( array_map( 'trim', explode( ',', $excludeCSS ) ) );
95
+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content);
96
+        if ('' !== $excludeCSS) {
97
+            $this->dontmove = array_filter(array_map('trim', explode(',', $excludeCSS)));
98 98
         } else {
99 99
             $this->dontmove = array();
100 100
         }
@@ -105,16 +105,16 @@  discard block
 block discarded – undo
105 105
         // Should we defer css?
106 106
         // value: true / false.
107 107
         $this->defer = $options['defer'];
108
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );
108
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
109 109
 
110 110
         // Should we inline while deferring?
111 111
         // value: inlined CSS.
112
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content );
112
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content);
113 113
 
114 114
         // Should we inline?
115 115
         // value: true / false.
116 116
         $this->inline = $options['inline'];
117
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );
117
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
118 118
 
119 119
         // Store cdn url.
120 120
         $this->cdn_url = $options['cdn_url'];
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $this->datauris = $options['datauris'];
124 124
 
125 125
         // noptimize me.
126
-        $this->content = $this->hide_noptimize( $this->content );
126
+        $this->content = $this->hide_noptimize($this->content);
127 127
 
128 128
         // Exclude (no)script, as those may contain CSS which should be left as is.
129 129
         $this->content = $this->replace_contents_with_marker_if_exists(
@@ -134,26 +134,26 @@  discard block
 block discarded – undo
134 134
         );
135 135
 
136 136
         // Save IE hacks.
137
-        $this->content = $this->hide_iehacks( $this->content );
137
+        $this->content = $this->hide_iehacks($this->content);
138 138
 
139 139
         // Hide HTML comments.
140
-        $this->content = $this->hide_comments( $this->content );
140
+        $this->content = $this->hide_comments($this->content);
141 141
 
142 142
         // Get <style> and <link>.
143
-        if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) {
143
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
144 144
 
145
-            foreach ( $matches[0] as $tag ) {
146
-                if ( $this->isremovable( $tag, $this->cssremovables ) ) {
147
-                    $this->content = str_replace( $tag, '', $this->content );
148
-                } elseif ( $this->ismovable( $tag ) ) {
145
+            foreach ($matches[0] as $tag) {
146
+                if ($this->isremovable($tag, $this->cssremovables)) {
147
+                    $this->content = str_replace($tag, '', $this->content);
148
+                } elseif ($this->ismovable($tag)) {
149 149
                     // Get the media.
150
-                    if ( false !== strpos( $tag, 'media=' ) ) {
151
-                        preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias );
152
-                        $medias = explode( ',', $medias[1] );
150
+                    if (false !== strpos($tag, 'media=')) {
151
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
152
+                        $medias = explode(',', $medias[1]);
153 153
                         $media = array();
154
-                        foreach ( $medias as $elem ) {
154
+                        foreach ($medias as $elem) {
155 155
                             /* $media[] = current(explode(' ',trim($elem),2)); */
156
-                            if ( empty( $elem ) ) {
156
+                            if (empty($elem)) {
157 157
                                 $elem = 'all';
158 158
                             }
159 159
 
@@ -161,59 +161,59 @@  discard block
 block discarded – undo
161 161
                         }
162 162
                     } else {
163 163
                         // No media specified - applies to all.
164
-                        $media = array( 'all' );
164
+                        $media = array('all');
165 165
                     }
166 166
 
167
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag );
167
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
168 168
 
169
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
169
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
170 170
                         // <link>.
171
-                        $url  = current( explode( '?', $source[2], 2 ) );
172
-                        $path = $this->getpath( $url );
171
+                        $url  = current(explode('?', $source[2], 2));
172
+                        $path = $this->getpath($url);
173 173
 
174
-                        if ( false !== $path && preg_match( '#\.css$#', $path ) ) {
174
+                        if (false !== $path && preg_match('#\.css$#', $path)) {
175 175
                             // Good link.
176
-                            $this->css[] = array( $media, $path );
176
+                            $this->css[] = array($media, $path);
177 177
                         } else {
178 178
                             // Link is dynamic (.php etc).
179 179
                             $tag = '';
180 180
                         }
181 181
                     } else {
182 182
                         // Inline css in style tags can be wrapped in comment tags, so restore comments.
183
-                        $tag = $this->restore_comments( $tag );
184
-                        preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code );
183
+                        $tag = $this->restore_comments($tag);
184
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
185 185
 
186 186
                         // And re-hide them to be able to to the removal based on tag.
187
-                        $tag = $this->hide_comments( $tag );
187
+                        $tag = $this->hide_comments($tag);
188 188
 
189
-                        if ( $this->include_inline ) {
190
-                            $code = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] );
191
-                            $this->css[] = array( $media, 'INLINE;' . $code );
189
+                        if ($this->include_inline) {
190
+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
191
+                            $this->css[] = array($media, 'INLINE;'.$code);
192 192
                         } else {
193 193
                             $tag = '';
194 194
                         }
195 195
                     }
196 196
 
197 197
                     // Remove the original style tag.
198
-                    $this->content = str_replace( $tag, '', $this->content );
198
+                    $this->content = str_replace($tag, '', $this->content);
199 199
                 } else {
200 200
                     // Excluded CSS, minify if getpath and filter says so...
201
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
202
-                        $exploded_url = explode( '?', $source[2], 2 );
201
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
202
+                        $exploded_url = explode('?', $source[2], 2);
203 203
                         $url          = $exploded_url[0];
204
-                        $path         = $this->getpath( $url );
204
+                        $path         = $this->getpath($url);
205 205
 
206
-                        if ( $path && apply_filters( 'autoptimize_filter_css_minify_excluded', true, $url ) ) {
207
-                            $minified_url = $this->minify_single( $path );
208
-                            if ( ! empty( $minified_url ) ) {
206
+                        if ($path && apply_filters('autoptimize_filter_css_minify_excluded', true, $url)) {
207
+                            $minified_url = $this->minify_single($path);
208
+                            if (!empty($minified_url)) {
209 209
                                 // Replace orig URL with cached minified URL.
210
-                                $new_tag = str_replace( $url, $minified_url, $tag );
210
+                                $new_tag = str_replace($url, $minified_url, $tag);
211 211
                             } else {
212 212
                                 $new_tag = $tag;
213 213
                             }
214 214
 
215 215
                             // Defer single CSS if "inline & defer" is ON and there is inline CSS.
216
-                            if ( $this->defer && ! empty( $this->defer_inline ) ) {
216
+                            if ($this->defer && !empty($this->defer_inline)) {
217 217
                                 // Get/ set (via filter) the JS to be triggers onload of the preloaded CSS.
218 218
                                 $_preload_onload = apply_filters(
219 219
                                     'autoptimize_filter_css_preload_onload',
@@ -221,18 +221,18 @@  discard block
 block discarded – undo
221 221
                                     $url
222 222
                                 );
223 223
                                 // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
224
-                                $new_tag = '<noscript>' . $new_tag . '</noscript>' . str_replace(
224
+                                $new_tag = '<noscript>'.$new_tag.'</noscript>'.str_replace(
225 225
                                     array(
226 226
                                         "rel='stylesheet'",
227 227
                                         'rel="stylesheet"',
228 228
                                     ),
229
-                                    "rel='preload' as='style' onload=\"" . $_preload_onload . "\"",
229
+                                    "rel='preload' as='style' onload=\"".$_preload_onload."\"",
230 230
                                     $new_tag
231 231
                                 );
232 232
                             }
233 233
 
234 234
                             // And replace!
235
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
235
+                            $this->content = str_replace($tag, $new_tag, $this->content);
236 236
                         }
237 237
                     }
238 238
                 }
@@ -251,22 +251,22 @@  discard block
 block discarded – undo
251 251
      * @param string $path
252 252
      * @return boolean
253 253
      */
254
-    private function is_datauri_candidate( $path )
254
+    private function is_datauri_candidate($path)
255 255
     {
256 256
         // Call only once since it's called from a loop.
257 257
         static $max_size = null;
258
-        if ( null === $max_size ) {
258
+        if (null === $max_size) {
259 259
             $max_size = $this->get_datauri_maxsize();
260 260
         }
261 261
 
262
-        if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) &&
263
-            file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) {
262
+        if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) &&
263
+            file_exists($path) && is_readable($path) && filesize($path) <= $max_size) {
264 264
 
265 265
             // Seems we have a candidate.
266 266
             $is_candidate = true;
267 267
         } else {
268 268
             // Filter allows overriding default decision (which checks for local file existence).
269
-            $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path );
269
+            $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path);
270 270
         }
271 271
 
272 272
         return $is_candidate;
@@ -291,29 +291,29 @@  discard block
 block discarded – undo
291 291
          * of thing you're probably better of building assets completely
292 292
          * outside of WordPress anyway.
293 293
          */
294
-        if ( null === $max_size ) {
295
-            $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 );
294
+        if (null === $max_size) {
295
+            $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096);
296 296
         }
297 297
 
298 298
         return $max_size;
299 299
     }
300 300
 
301
-    private function check_datauri_exclude_list( $url )
301
+    private function check_datauri_exclude_list($url)
302 302
     {
303 303
         static $exclude_list = null;
304 304
         $no_datauris         = array();
305 305
 
306 306
         // Again, skip doing certain stuff repeatedly when loop-called.
307
-        if ( null === $exclude_list ) {
308
-            $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' );
309
-            $no_datauris = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) );
307
+        if (null === $exclude_list) {
308
+            $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', '');
309
+            $no_datauris = array_filter(array_map('trim', explode(',', $exclude_list)));
310 310
         }
311 311
 
312 312
         $matched = false;
313 313
 
314
-        if ( ! empty( $exclude_list ) ) {
315
-            foreach ( $no_datauris as $no_datauri ) {
316
-                if ( false !== strpos( $url, $no_datauri ) ) {
314
+        if (!empty($exclude_list)) {
315
+            foreach ($no_datauris as $no_datauri) {
316
+                if (false !== strpos($url, $no_datauri)) {
317 317
                     $matched = true;
318 318
                     break;
319 319
                 }
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
         return $matched;
324 324
     }
325 325
 
326
-    private function build_or_get_datauri_image( $path )
326
+    private function build_or_get_datauri_image($path)
327 327
     {
328 328
         /**
329 329
          * TODO/FIXME: document the required return array format, or better yet,
@@ -332,27 +332,27 @@  discard block
 block discarded – undo
332 332
          */
333 333
 
334 334
         // Allows short-circuiting datauri generation for an image.
335
-        $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path );
336
-        if ( ! empty( $result ) ) {
337
-            if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) {
335
+        $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path);
336
+        if (!empty($result)) {
337
+            if (is_array($result) && isset($result['full']) && isset($result['base64data'])) {
338 338
                 return $result;
339 339
             }
340 340
         }
341 341
 
342
-        $hash = md5( $path );
343
-        $check = new autoptimizeCache( $hash, 'img' );
344
-        if ( $check->check() ) {
342
+        $hash = md5($path);
343
+        $check = new autoptimizeCache($hash, 'img');
344
+        if ($check->check()) {
345 345
             // we have the base64 image in cache.
346 346
             $headAndData = $check->retrieve();
347
-            $_base64data = explode( ';base64,', $headAndData );
347
+            $_base64data = explode(';base64,', $headAndData);
348 348
             $base64data  = $_base64data[1];
349
-            unset( $_base64data );
349
+            unset($_base64data);
350 350
         } else {
351 351
             // It's an image and we don't have it in cache, get the type by extension.
352
-            $exploded_path = explode( '.', $path );
353
-            $type = end( $exploded_path );
352
+            $exploded_path = explode('.', $path);
353
+            $type = end($exploded_path);
354 354
 
355
-            switch ( $type ) {
355
+            switch ($type) {
356 356
                 case 'jpg':
357 357
                 case 'jpeg':
358 358
                     $dataurihead = 'data:image/jpeg;base64,';
@@ -374,15 +374,15 @@  discard block
 block discarded – undo
374 374
             }
375 375
 
376 376
             // Encode the data.
377
-            $base64data  = base64_encode( file_get_contents( $path ) );
378
-            $headAndData = $dataurihead . $base64data;
377
+            $base64data  = base64_encode(file_get_contents($path));
378
+            $headAndData = $dataurihead.$base64data;
379 379
 
380 380
             // Save in cache.
381
-            $check->cache( $headAndData, 'text/plain' );
381
+            $check->cache($headAndData, 'text/plain');
382 382
         }
383
-        unset( $check );
383
+        unset($check);
384 384
 
385
-        return array( 'full' => $headAndData, 'base64data' => $base64data );
385
+        return array('full' => $headAndData, 'base64data' => $base64data);
386 386
     }
387 387
 
388 388
     /**
@@ -394,13 +394,13 @@  discard block
 block discarded – undo
394 394
      *
395 395
      * @return string
396 396
      */
397
-    protected static function replace_longest_matches_first( $string, $replacements = array() )
397
+    protected static function replace_longest_matches_first($string, $replacements = array())
398 398
     {
399
-        if ( ! empty( $replacements ) ) {
399
+        if (!empty($replacements)) {
400 400
             // Sort the replacements array by key length in desc order (so that the longest strings are replaced first).
401
-            $keys = array_map( 'strlen', array_keys( $replacements ) );
402
-            array_multisort( $keys, SORT_DESC, $replacements );
403
-            $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string );
401
+            $keys = array_map('strlen', array_keys($replacements));
402
+            array_multisort($keys, SORT_DESC, $replacements);
403
+            $string = str_replace(array_keys($replacements), array_values($replacements), $string);
404 404
         }
405 405
 
406 406
         return $string;
@@ -416,15 +416,15 @@  discard block
 block discarded – undo
416 416
      *
417 417
      * @return string
418 418
      */
419
-    public function replace_urls( $code = '' )
419
+    public function replace_urls($code = '')
420 420
     {
421 421
         $replacements = array();
422 422
 
423
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
424
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
425
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
423
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
424
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
425
+            foreach ($url_src_matches[1] as $count => $original_url) {
426 426
                 // Removes quotes and other cruft.
427
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
427
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
428 428
 
429 429
                 /**
430 430
                  * TODO/FIXME: Add a way for other code / callable to be called here
@@ -442,17 +442,17 @@  discard block
 block discarded – undo
442 442
                  */
443 443
 
444 444
                 // Do CDN replacement if needed.
445
-                if ( ! empty( $this->cdn_url ) ) {
446
-                    $replacement_url = $this->url_replace_cdn( $url );
445
+                if (!empty($this->cdn_url)) {
446
+                    $replacement_url = $this->url_replace_cdn($url);
447 447
                     // Prepare replacements array.
448
-                    $replacements[ $url_src_matches[1][ $count ] ] = str_replace(
448
+                    $replacements[$url_src_matches[1][$count]] = str_replace(
449 449
                         $original_url, $replacement_url, $url_src_matches[1][$count]
450 450
                     );
451 451
                 }
452 452
             }
453 453
         }
454 454
 
455
-        $code = self::replace_longest_matches_first( $code, $replacements );
455
+        $code = self::replace_longest_matches_first($code, $replacements);
456 456
 
457 457
         return $code;
458 458
     }
@@ -465,26 +465,26 @@  discard block
 block discarded – undo
465 465
      * @param string $code
466 466
      * @return string
467 467
      */
468
-    public function hide_fontface_and_maybe_cdn( $code )
468
+    public function hide_fontface_and_maybe_cdn($code)
469 469
     {
470 470
         // Proceed only if @font-face declarations exist within $code.
471
-        preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces );
472
-        if ( isset( $fontfaces[0] ) ) {
471
+        preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces);
472
+        if (isset($fontfaces[0])) {
473 473
             // Check if we need to cdn fonts or not.
474
-            $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false );
474
+            $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false);
475 475
 
476
-            foreach ( $fontfaces[0] as $full_match ) {
476
+            foreach ($fontfaces[0] as $full_match) {
477 477
                 // Keep original match so we can search/replace it.
478 478
                 $match_search = $full_match;
479 479
 
480 480
                 // Do font cdn if needed.
481
-                if ( $do_font_cdn ) {
482
-                    $full_match = $this->replace_urls( $full_match );
481
+                if ($do_font_cdn) {
482
+                    $full_match = $this->replace_urls($full_match);
483 483
                 }
484 484
 
485 485
                 // Replace declaration with its base64 encoded string.
486
-                $replacement = self::build_marker( 'FONTFACE', $full_match );
487
-                $code = str_replace( $match_search, $replacement, $code );
486
+                $replacement = self::build_marker('FONTFACE', $full_match);
487
+                $code = str_replace($match_search, $replacement, $code);
488 488
             }
489 489
         }
490 490
 
@@ -498,16 +498,16 @@  discard block
 block discarded – undo
498 498
      * @param string $code
499 499
      * @return string
500 500
      */
501
-    public function restore_fontface( $code )
501
+    public function restore_fontface($code)
502 502
     {
503
-        return $this->restore_marked_content( 'FONTFACE', $code );
503
+        return $this->restore_marked_content('FONTFACE', $code);
504 504
     }
505 505
 
506 506
     // Re-write (and/or inline) referenced assets.
507
-    public function rewrite_assets( $code )
507
+    public function rewrite_assets($code)
508 508
     {
509 509
         // Handle @font-face rules by hiding and processing them separately.
510
-        $code = $this->hide_fontface_and_maybe_cdn( $code );
510
+        $code = $this->hide_fontface_and_maybe_cdn($code);
511 511
 
512 512
         /**
513 513
          * TODO/FIXME:
@@ -523,30 +523,30 @@  discard block
 block discarded – undo
523 523
         $url_src_matches = array();
524 524
         $imgreplace = array();
525 525
         // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs.
526
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
527
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
528
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
526
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
527
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
528
+            foreach ($url_src_matches[1] as $count => $original_url) {
529 529
                 // Removes quotes and other cruft.
530
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
530
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
531 531
 
532 532
                 // If datauri inlining is turned on, do it.
533 533
                 $inlined = false;
534
-                if ( $this->datauris ) {
534
+                if ($this->datauris) {
535 535
                     $iurl = $url;
536
-                    if ( false !== strpos( $iurl, '?' ) ) {
537
-                        $iurl = strtok( $iurl, '?' );
536
+                    if (false !== strpos($iurl, '?')) {
537
+                        $iurl = strtok($iurl, '?');
538 538
                     }
539 539
 
540
-                    $ipath = $this->getpath( $iurl );
540
+                    $ipath = $this->getpath($iurl);
541 541
 
542
-                    $excluded = $this->check_datauri_exclude_list( $ipath );
543
-                    if ( ! $excluded ) {
544
-                        $is_datauri_candidate = $this->is_datauri_candidate( $ipath );
545
-                        if ( $is_datauri_candidate ) {
546
-                            $datauri     = $this->build_or_get_datauri_image( $ipath );
542
+                    $excluded = $this->check_datauri_exclude_list($ipath);
543
+                    if (!$excluded) {
544
+                        $is_datauri_candidate = $this->is_datauri_candidate($ipath);
545
+                        if ($is_datauri_candidate) {
546
+                            $datauri     = $this->build_or_get_datauri_image($ipath);
547 547
                             $base64data  = $datauri['base64data'];
548 548
                             // Add it to the list for replacement.
549
-                            $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
549
+                            $imgreplace[$url_src_matches[1][$count]] = str_replace(
550 550
                                     $original_url,
551 551
                                     $datauri['full'],
552 552
                                     $url_src_matches[1][$count]
@@ -562,20 +562,20 @@  discard block
 block discarded – undo
562 562
                  * inlining isn't turned on, or if a resource is skipped from
563 563
                  * being inlined for whatever reason above.
564 564
                  */
565
-                if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) {
565
+                if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) {
566 566
                     // Just do the "simple" CDN replacement.
567
-                    $replacement_url = $this->url_replace_cdn( $url );
568
-                    $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
567
+                    $replacement_url = $this->url_replace_cdn($url);
568
+                    $imgreplace[$url_src_matches[1][$count]] = str_replace(
569 569
                         $original_url, $replacement_url, $url_src_matches[1][$count]
570 570
                     );
571 571
                 }
572 572
             }
573 573
         }
574 574
 
575
-        $code = self::replace_longest_matches_first( $code, $imgreplace );
575
+        $code = self::replace_longest_matches_first($code, $imgreplace);
576 576
 
577 577
         // Replace back font-face markers with actual font-face declarations.
578
-        $code = $this->restore_fontface( $code );
578
+        $code = $this->restore_fontface($code);
579 579
 
580 580
         return $code;
581 581
     }
@@ -583,29 +583,29 @@  discard block
 block discarded – undo
583 583
     // Joins and optimizes CSS.
584 584
     public function minify()
585 585
     {
586
-        foreach ( $this->css as $group ) {
587
-            list( $media, $css ) = $group;
588
-            if ( preg_match( '#^INLINE;#', $css ) ) {
586
+        foreach ($this->css as $group) {
587
+            list($media, $css) = $group;
588
+            if (preg_match('#^INLINE;#', $css)) {
589 589
                 // <style>.
590
-                $css = preg_replace( '#^INLINE;#', '', $css );
591
-                $css = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash.
592
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' );
593
-                if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
590
+                $css = preg_replace('#^INLINE;#', '', $css);
591
+                $css = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash.
592
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, '');
593
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
594 594
                     $css = $tmpstyle;
595 595
                     $this->alreadyminified = true;
596 596
                 }
597 597
             } else {
598 598
                 // <link>
599
-                if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) {
599
+                if (false !== $css && file_exists($css) && is_readable($css)) {
600 600
                     $cssPath = $css;
601
-                    $css = self::fixurls( $cssPath, file_get_contents( $cssPath ) );
602
-                    $css = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css );
603
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );
604
-                    if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
601
+                    $css = self::fixurls($cssPath, file_get_contents($cssPath));
602
+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
603
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
604
+                    if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
605 605
                         $css = $tmpstyle;
606 606
                         $this->alreadyminified = true;
607
-                    } elseif ( $this->can_inject_late( $cssPath, $css ) ) {
608
-                        $css = self::build_injectlater_marker( $cssPath, md5( $css ) );
607
+                    } elseif ($this->can_inject_late($cssPath, $css)) {
608
+                        $css = self::build_injectlater_marker($cssPath, md5($css));
609 609
                     }
610 610
                 } else {
611 611
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -613,12 +613,12 @@  discard block
 block discarded – undo
613 613
                 }
614 614
             }
615 615
 
616
-            foreach ( $media as $elem ) {
617
-                if ( ! empty( $css ) ) {
618
-                    if ( ! isset( $this->csscode[$elem] ) ) {
616
+            foreach ($media as $elem) {
617
+                if (!empty($css)) {
618
+                    if (!isset($this->csscode[$elem])) {
619 619
                         $this->csscode[$elem] = '';
620 620
                     }
621
-                    $this->csscode[$elem] .= "\n/*FILESTART*/" . $css;
621
+                    $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
622 622
                 }
623 623
             }
624 624
         }
@@ -626,133 +626,133 @@  discard block
 block discarded – undo
626 626
         // Check for duplicate code.
627 627
         $md5list = array();
628 628
         $tmpcss  = $this->csscode;
629
-        foreach ( $tmpcss as $media => $code ) {
630
-            $md5sum    = md5( $code );
629
+        foreach ($tmpcss as $media => $code) {
630
+            $md5sum    = md5($code);
631 631
             $medianame = $media;
632
-            foreach ( $md5list as $med => $sum ) {
632
+            foreach ($md5list as $med => $sum) {
633 633
                 // If same code.
634
-                if ( $sum === $md5sum ) {
634
+                if ($sum === $md5sum) {
635 635
                     // Add the merged code.
636
-                    $medianame                 = $med . ', ' . $media;
636
+                    $medianame                 = $med.', '.$media;
637 637
                     $this->csscode[$medianame] = $code;
638 638
                     $md5list[$medianame]       = $md5list[$med];
639
-                    unset( $this->csscode[$med], $this->csscode[$media], $md5list[$med] );
639
+                    unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]);
640 640
                 }
641 641
             }
642 642
             $md5list[$medianame] = $md5sum;
643 643
         }
644
-        unset( $tmpcss );
644
+        unset($tmpcss);
645 645
 
646 646
         // Manage @imports, while is for recursive import management.
647
-        foreach ( $this->csscode as &$thiscss ) {
647
+        foreach ($this->csscode as &$thiscss) {
648 648
             // Flag to trigger import reconstitution and var to hold external imports.
649 649
             $fiximports       = false;
650 650
             $external_imports = '';
651 651
 
652 652
             // remove comments to avoid importing commented-out imports.
653
-            $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
654
-            while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) {
655
-                foreach ( $matches[0] as $import ) {
656
-                    if ( $this->isremovable( $import, $this->cssremovables ) ) {
657
-                        $thiscss = str_replace( $import, '', $thiscss );
653
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
654
+            while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) {
655
+                foreach ($matches[0] as $import) {
656
+                    if ($this->isremovable($import, $this->cssremovables)) {
657
+                        $thiscss = str_replace($import, '', $thiscss);
658 658
                         $import_ok = true;
659 659
                     } else {
660
-                        $url = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" );
661
-                        $path = $this->getpath( $url );
660
+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
661
+                        $path = $this->getpath($url);
662 662
                         $import_ok = false;
663
-                        if ( file_exists( $path ) && is_readable( $path ) ) {
664
-                            $code = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), "\\" );
665
-                            $code = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code );
666
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' );
667
-                            if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
663
+                        if (file_exists($path) && is_readable($path)) {
664
+                            $code = addcslashes(self::fixurls($path, file_get_contents($path)), "\\");
665
+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
666
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, '');
667
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
668 668
                                 $code = $tmpstyle;
669 669
                                 $this->alreadyminified = true;
670
-                            } elseif ( $this->can_inject_late( $path, $code ) ) {
671
-                                $code = self::build_injectlater_marker( $path, md5( $code ) );
670
+                            } elseif ($this->can_inject_late($path, $code)) {
671
+                                $code = self::build_injectlater_marker($path, md5($code));
672 672
                             }
673 673
 
674
-                            if ( ! empty( $code ) ) {
675
-                                $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss );
676
-                                if ( ! empty( $tmp_thiscss ) ) {
674
+                            if (!empty($code)) {
675
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
676
+                                if (!empty($tmp_thiscss)) {
677 677
                                     $thiscss = $tmp_thiscss;
678 678
                                     $import_ok = true;
679
-                                    unset( $tmp_thiscss );
679
+                                    unset($tmp_thiscss);
680 680
                                 }
681 681
                             }
682
-                            unset( $code );
682
+                            unset($code);
683 683
                         }
684 684
                     }
685
-                    if ( ! $import_ok ) {
685
+                    if (!$import_ok) {
686 686
                         // External imports and general fall-back.
687 687
                         $external_imports .= $import;
688 688
 
689
-                        $thiscss    = str_replace( $import, '', $thiscss );
689
+                        $thiscss    = str_replace($import, '', $thiscss);
690 690
                         $fiximports = true;
691 691
                     }
692 692
                 }
693
-                $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss );
694
-                $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss );
693
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
694
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
695 695
 
696 696
                 // and update $thiscss_nocomments before going into next iteration in while loop.
697
-                $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
697
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
698 698
             }
699
-            unset( $thiscss_nocomments );
699
+            unset($thiscss_nocomments);
700 700
 
701 701
             // Add external imports to top of aggregated CSS.
702
-            if ( $fiximports ) {
703
-                $thiscss = $external_imports . $thiscss;
702
+            if ($fiximports) {
703
+                $thiscss = $external_imports.$thiscss;
704 704
             }
705 705
         }
706
-        unset( $thiscss );
706
+        unset($thiscss);
707 707
 
708 708
         // $this->csscode has all the uncompressed code now.
709
-        foreach ( $this->csscode as &$code ) {
709
+        foreach ($this->csscode as &$code) {
710 710
             // Check for already-minified code.
711
-            $hash = md5( $code );
712
-            do_action( 'autoptimize_action_css_hash', $hash );
713
-            $ccheck = new autoptimizeCache( $hash, 'css' );
714
-            if ( $ccheck->check() ) {
711
+            $hash = md5($code);
712
+            do_action('autoptimize_action_css_hash', $hash);
713
+            $ccheck = new autoptimizeCache($hash, 'css');
714
+            if ($ccheck->check()) {
715 715
                 $code = $ccheck->retrieve();
716
-                $this->hashmap[md5( $code )] = $hash;
716
+                $this->hashmap[md5($code)] = $hash;
717 717
                 continue;
718 718
             }
719
-            unset( $ccheck );
719
+            unset($ccheck);
720 720
 
721 721
             // Rewrite and/or inline referenced assets.
722
-            $code = $this->rewrite_assets( $code );
722
+            $code = $this->rewrite_assets($code);
723 723
 
724 724
             // Minify.
725
-            $code = $this->run_minifier_on( $code );
725
+            $code = $this->run_minifier_on($code);
726 726
 
727 727
             // Bring back INJECTLATER stuff.
728
-            $code = $this->inject_minified( $code );
728
+            $code = $this->inject_minified($code);
729 729
 
730 730
             // Filter results.
731
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
732
-            if ( ! empty( $tmp_code ) ) {
731
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
732
+            if (!empty($tmp_code)) {
733 733
                 $code = $tmp_code;
734
-                unset( $tmp_code );
734
+                unset($tmp_code);
735 735
             }
736 736
 
737
-            $this->hashmap[md5( $code )] = $hash;
737
+            $this->hashmap[md5($code)] = $hash;
738 738
         }
739 739
 
740
-        unset( $code );
740
+        unset($code);
741 741
         return true;
742 742
     }
743 743
 
744
-    public function run_minifier_on( $code )
744
+    public function run_minifier_on($code)
745 745
     {
746
-        if ( ! $this->alreadyminified ) {
747
-            $do_minify = apply_filters( 'autoptimize_css_do_minify', true );
746
+        if (!$this->alreadyminified) {
747
+            $do_minify = apply_filters('autoptimize_css_do_minify', true);
748 748
 
749
-            if ( $do_minify ) {
749
+            if ($do_minify) {
750 750
                 $cssmin   = new autoptimizeCSSmin();
751
-                $tmp_code = trim( $cssmin->run( $code ) );
751
+                $tmp_code = trim($cssmin->run($code));
752 752
 
753
-                if ( ! empty( $tmp_code ) ) {
753
+                if (!empty($tmp_code)) {
754 754
                     $code = $tmp_code;
755
-                    unset( $tmp_code );
755
+                    unset($tmp_code);
756 756
                 }
757 757
             }
758 758
         }
@@ -764,14 +764,14 @@  discard block
 block discarded – undo
764 764
     public function cache()
765 765
     {
766 766
         // CSS cache.
767
-        foreach ( $this->csscode as $media => $code ) {
768
-            $md5 = $this->hashmap[md5( $code )];
769
-            $cache = new autoptimizeCache( $md5, 'css' );
770
-            if ( ! $cache->check() ) {
767
+        foreach ($this->csscode as $media => $code) {
768
+            $md5 = $this->hashmap[md5($code)];
769
+            $cache = new autoptimizeCache($md5, 'css');
770
+            if (!$cache->check()) {
771 771
                 // Cache our code.
772
-                $cache->cache( $code, 'text/css' );
772
+                $cache->cache($code, 'text/css');
773 773
             }
774
-            $this->url[$media] = AUTOPTIMIZE_CACHE_URL . $cache->getname();
774
+            $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
775 775
         }
776 776
     }
777 777
 
@@ -779,88 +779,88 @@  discard block
 block discarded – undo
779 779
     public function getcontent()
780 780
     {
781 781
         // restore comments.
782
-        $this->content = $this->restore_comments( $this->content );
782
+        $this->content = $this->restore_comments($this->content);
783 783
 
784 784
         // restore IE hacks.
785
-        $this->content = $this->restore_iehacks( $this->content );
785
+        $this->content = $this->restore_iehacks($this->content);
786 786
 
787 787
         // restore (no)script.
788
-        $this->content = $this->restore_marked_content( 'SCRIPT', $this->content );
788
+        $this->content = $this->restore_marked_content('SCRIPT', $this->content);
789 789
 
790 790
         // Restore noptimize.
791
-        $this->content = $this->restore_noptimize( $this->content );
791
+        $this->content = $this->restore_noptimize($this->content);
792 792
 
793 793
         // Restore the full content.
794
-        if ( ! empty( $this->restofcontent ) ) {
794
+        if (!empty($this->restofcontent)) {
795 795
             $this->content .= $this->restofcontent;
796 796
             $this->restofcontent = '';
797 797
         }
798 798
 
799 799
         // Inject the new stylesheets.
800
-        $replaceTag = array( '<title', 'before' );
801
-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content );
800
+        $replaceTag = array('<title', 'before');
801
+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
802 802
 
803
-        if ( $this->inline ) {
804
-            foreach ( $this->csscode as $media => $code ) {
805
-                $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $code . '</style>', $replaceTag );
803
+        if ($this->inline) {
804
+            foreach ($this->csscode as $media => $code) {
805
+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
806 806
             }
807 807
         } else {
808
-            if ( $this->defer ) {
808
+            if ($this->defer) {
809 809
                 $preloadCssBlock = '';
810 810
                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";
811 811
 
812 812
                 $defer_inline_code = $this->defer_inline;
813
-                if ( ! empty( $defer_inline_code ) ) {
814
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
815
-                        $iCssHash = md5( $defer_inline_code );
816
-                        $iCssCache = new autoptimizeCache( $iCssHash, 'css' );
817
-                        if ( $iCssCache->check() ) {
813
+                if (!empty($defer_inline_code)) {
814
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
815
+                        $iCssHash = md5($defer_inline_code);
816
+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');
817
+                        if ($iCssCache->check()) {
818 818
                             // we have the optimized inline CSS in cache.
819 819
                             $defer_inline_code = $iCssCache->retrieve();
820 820
                         } else {
821 821
                             $cssmin   = new autoptimizeCSSmin();
822
-                            $tmp_code = trim( $cssmin->run( $defer_inline_code ) );
822
+                            $tmp_code = trim($cssmin->run($defer_inline_code));
823 823
 
824
-                            if ( ! empty( $tmp_code ) ) {
824
+                            if (!empty($tmp_code)) {
825 825
                                 $defer_inline_code = $tmp_code;
826
-                                $iCssCache->cache( $defer_inline_code, 'text/css' );
827
-                                unset( $tmp_code );
826
+                                $iCssCache->cache($defer_inline_code, 'text/css');
827
+                                unset($tmp_code);
828 828
                             }
829 829
                         }
830 830
                     }
831
-                    $code_out = '<style type="text/css" id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
832
-                    $this->inject_in_html( $code_out, $replaceTag );
831
+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
832
+                    $this->inject_in_html($code_out, $replaceTag);
833 833
                 }
834 834
             }
835 835
 
836
-            foreach ( $this->url as $media => $url ) {
837
-                $url = $this->url_replace_cdn( $url );
836
+            foreach ($this->url as $media => $url) {
837
+                $url = $this->url_replace_cdn($url);
838 838
 
839 839
                 // Add the stylesheet either deferred (import at bottom) or normal links in head.
840
-                if ( $this->defer ) {
840
+                if ($this->defer) {
841 841
                     $preloadOnLoad = autoptimizeConfig::get_ao_css_preload_onload();
842 842
 
843
-                    $preloadCssBlock .= '<link rel="preload" as="style" media="' . $media . '" href="' . $url . '" onload="' . $preloadOnLoad . '" />';
844
-                    $noScriptCssBlock .= '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
843
+                    $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preloadOnLoad.'" />';
844
+                    $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
845 845
                 } else {
846 846
                     // $this->inject_in_html('<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag);
847
-                    if ( strlen( $this->csscode[$media] ) > $this->cssinlinesize ) {
848
-                        $this->inject_in_html( '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag );
849
-                    } elseif ( strlen( $this->csscode[$media] ) > 0 ) {
850
-                        $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $this->csscode[$media] . '</style>', $replaceTag );
847
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
848
+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
849
+                    } elseif (strlen($this->csscode[$media]) > 0) {
850
+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
851 851
                     }
852 852
                 }
853 853
             }
854 854
 
855
-            if ( $this->defer ) {
855
+            if ($this->defer) {
856 856
                 $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
857 857
                 $noScriptCssBlock .= '</noscript>';
858
-                $this->inject_in_html( $preloadCssBlock . $noScriptCssBlock, $replaceTag );
858
+                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag);
859 859
 
860 860
                 // Adds preload polyfill at end of body tag.
861 861
                 $this->inject_in_html(
862
-                    apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ),
863
-                    array( '</body>', 'before' )
862
+                    apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill),
863
+                    array('</body>', 'before')
864 864
                 );
865 865
             }
866 866
         }
@@ -869,44 +869,44 @@  discard block
 block discarded – undo
869 869
         return $this->content;
870 870
     }
871 871
 
872
-    static function fixurls( $file, $code )
872
+    static function fixurls($file, $code)
873 873
     {
874 874
         // Switch all imports to the url() syntax.
875
-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
875
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
876 876
 
877
-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
878
-            $file = str_replace( WP_ROOT_DIR, '/', $file );
877
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
878
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
879 879
             /**
880 880
              * rollback as per https://github.com/futtta/autoptimize/issues/94
881 881
              * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file );
882 882
              */
883
-            $dir = dirname( $file ); // Like /themes/expound/css.
883
+            $dir = dirname($file); // Like /themes/expound/css.
884 884
 
885 885
             /**
886 886
              * $dir should not contain backslashes, since it's used to replace
887 887
              * urls, but it can contain them when running on Windows because
888 888
              * fixurls() is sometimes called with `ABSPATH . 'index.php'`
889 889
              */
890
-            $dir = str_replace( '\\', '/', $dir );
891
-            unset( $file ); // not used below at all.
890
+            $dir = str_replace('\\', '/', $dir);
891
+            unset($file); // not used below at all.
892 892
 
893 893
             $replace = array();
894
-            foreach ( $matches[1] as $k => $url ) {
894
+            foreach ($matches[1] as $k => $url) {
895 895
                 // Remove quotes.
896
-                $url    = trim( $url, " \t\n\r\0\x0B\"'" );
897
-                $noQurl = trim( $url, "\"'" );
898
-                if ( $url !== $noQurl ) {
896
+                $url    = trim($url, " \t\n\r\0\x0B\"'");
897
+                $noQurl = trim($url, "\"'");
898
+                if ($url !== $noQurl) {
899 899
                     $removedQuotes = true;
900 900
                 } else {
901 901
                     $removedQuotes = false;
902 902
                 }
903 903
 
904
-                if ( '' === $noQurl ) {
904
+                if ('' === $noQurl) {
905 905
                     continue;
906 906
                 }
907 907
 
908 908
                 $url = $noQurl;
909
-                if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
909
+                if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
910 910
                     // URL is protocol-relative, host-relative or something we don't touch.
911 911
                     continue;
912 912
                 } else {
@@ -915,49 +915,49 @@  discard block
 block discarded – undo
915 915
                      * rollback as per https://github.com/futtta/autoptimize/issues/94
916 916
                      * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
917 917
                      */
918
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
919
-                    $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl );
918
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
919
+                    $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl);
920 920
 
921 921
                     /**
922 922
                      * Hash the url + whatever was behind potentially for replacement
923 923
                      * We must do this, or different css classes referencing the same bg image (but
924 924
                      * different parts of it, say, in sprites and such) loose their stuff...
925 925
                      */
926
-                    $hash = md5( $url . $matches[2][$k] );
927
-                    $code = str_replace( $matches[0][$k], $hash, $code );
926
+                    $hash = md5($url.$matches[2][$k]);
927
+                    $code = str_replace($matches[0][$k], $hash, $code);
928 928
 
929
-                    if ( $removedQuotes ) {
930
-                        $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
929
+                    if ($removedQuotes) {
930
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
931 931
                     } else {
932
-                        $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
932
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
933 933
                     }
934 934
                 }
935 935
             }
936 936
 
937
-            $code = self::replace_longest_matches_first( $code, $replace );
937
+            $code = self::replace_longest_matches_first($code, $replace);
938 938
         }
939 939
 
940 940
         return $code;
941 941
     }
942 942
 
943
-    private function ismovable( $tag )
943
+    private function ismovable($tag)
944 944
     {
945
-        if ( ! $this->aggregate ) {
945
+        if (!$this->aggregate) {
946 946
             return false;
947 947
         }
948 948
 
949
-        if ( ! empty( $this->whitelist ) ) {
950
-            foreach ( $this->whitelist as $match ) {
951
-                if ( false !== strpos( $tag, $match ) ) {
949
+        if (!empty($this->whitelist)) {
950
+            foreach ($this->whitelist as $match) {
951
+                if (false !== strpos($tag, $match)) {
952 952
                     return true;
953 953
                 }
954 954
             }
955 955
             // no match with whitelist.
956 956
             return false;
957 957
         } else {
958
-            if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) {
959
-                foreach ( $this->dontmove as $match ) {
960
-                    if ( false !== strpos( $tag, $match ) ) {
958
+            if (is_array($this->dontmove) && !empty($this->dontmove)) {
959
+                foreach ($this->dontmove as $match) {
960
+                    if (false !== strpos($tag, $match)) {
961 961
                         // Matched something.
962 962
                         return false;
963 963
                     }
@@ -969,22 +969,22 @@  discard block
 block discarded – undo
969 969
         }
970 970
     }
971 971
 
972
-    private function can_inject_late( $cssPath, $css )
972
+    private function can_inject_late($cssPath, $css)
973 973
     {
974
-        $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $cssPath );
975
-        if ( true !== $this->inject_min_late ) {
974
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
975
+        if (true !== $this->inject_min_late) {
976 976
             // late-inject turned off.
977 977
             return false;
978
-        } elseif ( ( false === strpos( $cssPath, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $cssPath ) === $cssPath ) ) {
978
+        } elseif ((false === strpos($cssPath, 'min.css')) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
979 979
             // file not minified based on filename & filter.
980 980
             return false;
981
-        } elseif ( false !== strpos( $css, '@import' ) ) {
981
+        } elseif (false !== strpos($css, '@import')) {
982 982
             // can't late-inject files with imports as those need to be aggregated.
983 983
             return false;
984
-        } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) {
984
+        } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) {
985 985
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed.
986 986
             return false;
987
-        } elseif ( ( ( $this->datauris == true ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) {
987
+        } elseif ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) {
988 988
             // don't late-inject CSS with images if CDN is set OR if image inlining is on.
989 989
             return false;
990 990
         } else {
@@ -1002,32 +1002,32 @@  discard block
 block discarded – undo
1002 1002
      *
1003 1003
      * @return bool|string Url pointing to the minified css file or false.
1004 1004
      */
1005
-    public function minify_single( $filepath, $cache_miss = false )
1005
+    public function minify_single($filepath, $cache_miss = false)
1006 1006
     {
1007
-        $contents = $this->prepare_minify_single( $filepath );
1007
+        $contents = $this->prepare_minify_single($filepath);
1008 1008
 
1009
-        if ( empty( $contents ) ) {
1009
+        if (empty($contents)) {
1010 1010
             return false;
1011 1011
         }
1012 1012
 
1013 1013
         // Check cache.
1014
-        $hash  = 'single_' . md5( $contents );
1015
-        $cache = new autoptimizeCache( $hash, 'css' );
1014
+        $hash  = 'single_'.md5($contents);
1015
+        $cache = new autoptimizeCache($hash, 'css');
1016 1016
 
1017 1017
         // If not in cache already, minify...
1018
-        if ( ! $cache->check() || $cache_miss ) {
1018
+        if (!$cache->check() || $cache_miss) {
1019 1019
             // Fixurls...
1020
-            $contents = self::fixurls( $filepath, $contents );
1020
+            $contents = self::fixurls($filepath, $contents);
1021 1021
             // CDN-replace any referenced assets if needed...
1022
-            $contents = $this->replace_urls( $contents );
1022
+            $contents = $this->replace_urls($contents);
1023 1023
             // Now minify...
1024 1024
             $cssmin   = new autoptimizeCSSmin();
1025
-            $contents = trim( $cssmin->run( $contents ) );
1025
+            $contents = trim($cssmin->run($contents));
1026 1026
             // Store in cache.
1027
-            $cache->cache( $contents, 'text/css' );
1027
+            $cache->cache($contents, 'text/css');
1028 1028
         }
1029 1029
 
1030
-        $url = $this->build_minify_single_url( $cache );
1030
+        $url = $this->build_minify_single_url($cache);
1031 1031
 
1032 1032
         return $url;
1033 1033
     }
@@ -1047,18 +1047,18 @@  discard block
 block discarded – undo
1047 1047
         return $this->options;
1048 1048
     }
1049 1049
 
1050
-    public function replaceOptions( $options )
1050
+    public function replaceOptions($options)
1051 1051
     {
1052 1052
         $this->options = $options;
1053 1053
     }
1054 1054
 
1055
-    public function setOption( $name, $value )
1055
+    public function setOption($name, $value)
1056 1056
     {
1057 1057
         $this->options[$name] = $value;
1058 1058
         $this->$name = $value;
1059 1059
     }
1060 1060
 
1061
-    public function getOption( $name )
1061
+    public function getOption($name)
1062 1062
     {
1063 1063
         return $this->options[$name];
1064 1064
     }
Please login to merge, or discard this patch.
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   +378 added lines, -378 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,21 +629,21 @@  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
      */
641
-    public function test_should_aggregate_script_types( $input, $expected )
641
+    public function test_should_aggregate_script_types($input, $expected)
642 642
     {
643
-        $instance = new autoptimizeScripts( '' );
644
-        $actual   = $instance->should_aggregate( $input );
643
+        $instance = new autoptimizeScripts('');
644
+        $actual   = $instance->should_aggregate($input);
645 645
 
646
-        $this->assertEquals( $expected, $actual );
646
+        $this->assertEquals($expected, $actual);
647 647
     }
648 648
 
649 649
     public function provider_test_should_aggregate_script_types()
@@ -705,11 +705,11 @@  discard block
 block discarded – undo
705 705
     /**
706 706
      * @dataProvider provider_is_valid_buffer
707 707
      */
708
-    public function test_valid_buffers( $input, $expected )
708
+    public function test_valid_buffers($input, $expected)
709 709
     {
710
-        $actual = $this->ao->is_valid_buffer( $input );
710
+        $actual = $this->ao->is_valid_buffer($input);
711 711
 
712
-        $this->assertEquals( $expected, $actual );
712
+        $this->assertEquals($expected, $actual);
713 713
     }
714 714
 
715 715
     public function provider_is_valid_buffer()
@@ -771,11 +771,11 @@  discard block
 block discarded – undo
771 771
     /**
772 772
      * @dataProvider provider_is_amp_markup
773 773
      */
774
-    public function test_autoptimize_is_amp_markup( $input, $expected )
774
+    public function test_autoptimize_is_amp_markup($input, $expected)
775 775
     {
776
-        $actual = autoptimizeMain::is_amp_markup( $input );
776
+        $actual = autoptimizeMain::is_amp_markup($input);
777 777
 
778
-        $this->assertEquals( $expected, $actual );
778
+        $this->assertEquals($expected, $actual);
779 779
     }
780 780
 
781 781
     public function provider_is_amp_markup()
@@ -806,31 +806,31 @@  discard block
 block discarded – undo
806 806
     public function test_skips_buffering_when_ao_noptimize_filter_is_true()
807 807
     {
808 808
         // True => disable autoptimize.
809
-        add_filter( 'autoptimize_filter_noptimize', '__return_true' );
809
+        add_filter('autoptimize_filter_noptimize', '__return_true');
810 810
 
811 811
         // Buffering should not run due to the above filter.
812 812
         $expected = false;
813
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
813
+        $actual   = $this->ao->should_buffer($doing_tests = true);
814 814
 
815
-        $this->assertEquals( $expected, $actual );
815
+        $this->assertEquals($expected, $actual);
816 816
     }
817 817
 
818 818
     public function test_does_buffering_when_ao_noptimize_filter_is_false()
819 819
     {
820 820
         // False => disable noptimize, aka, run normally (weird, yes...).
821
-        add_filter( 'autoptimize_filter_noptimize', '__return_false' );
821
+        add_filter('autoptimize_filter_noptimize', '__return_false');
822 822
 
823 823
         // Buffering should run because of above.
824 824
         $expected = true;
825
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
825
+        $actual   = $this->ao->should_buffer($doing_tests = true);
826 826
 
827
-        $this->assertEquals( $expected, $actual );
827
+        $this->assertEquals($expected, $actual);
828 828
     }
829 829
 
830 830
     public function test_ignores_ao_noptimize_qs_when_instructed()
831 831
     {
832 832
         // Should skip checking for the qs completely due to filter.
833
-        add_filter( 'autoptimize_filter_honor_qs_noptimize', '__return_false' );
833
+        add_filter('autoptimize_filter_honor_qs_noptimize', '__return_false');
834 834
 
835 835
         /**
836 836
          * The above should then result in the "current" value being `false`
@@ -841,23 +841,23 @@  discard block
 block discarded – undo
841 841
          */
842 842
 
843 843
         $that = $this; // Makes it work on php 5.3!
844
-        add_filter( 'autoptimize_filter_noptimize', function ( $current_value ) use ( $that ) {
844
+        add_filter('autoptimize_filter_noptimize', function($current_value) use ($that) {
845 845
             $expected = false;
846
-            if ( defined( 'DONOTMINIFY' ) && DONOTMINIFY ) {
846
+            if (defined('DONOTMINIFY') && DONOTMINIFY) {
847 847
                 $expected = true;
848 848
             }
849 849
 
850
-            $that->assertEquals( $expected, $current_value );
850
+            $that->assertEquals($expected, $current_value);
851 851
         });
852 852
 
853
-        $this->ao->should_buffer( $doing_tests = true );
853
+        $this->ao->should_buffer($doing_tests = true);
854 854
     }
855 855
 
856 856
     public function test_wpengine_cache_flush()
857 857
     {
858 858
         // Creating a mock so that we can get past class_exists() and method_exists() checks present
859 859
         // in `autoptimizeCache::flushPageCache()`...
860
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
860
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
861 861
                 ->disableOriginalConstructor()->setMethods(
862 862
                     array(
863 863
                         'purge_varnish_cache',
@@ -866,9 +866,9 @@  discard block
 block discarded – undo
866 866
                 ->getMock();
867 867
 
868 868
         $that = $this;
869
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
870
-            $expected_methods = array( 'purge_varnish_cache' );
871
-            $that->assertEquals( $methods, $expected_methods );
869
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
870
+            $expected_methods = array('purge_varnish_cache');
871
+            $that->assertEquals($methods, $expected_methods);
872 872
 
873 873
             return $methods;
874 874
         });
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
     public function test_wpengine_cache_flush_agressive()
883 883
     {
884 884
         // Creating a mock so that we can get past class_exists() and method_exists() checks `autoptimize_flush_pagecache()`...
885
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
885
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
886 886
                 ->disableOriginalConstructor()->setMethods(
887 887
                     array(
888 888
                         'purge_varnish_cache',
@@ -892,19 +892,19 @@  discard block
 block discarded – undo
892 892
                 )
893 893
                 ->getMock();
894 894
 
895
-        add_filter( 'autoptimize_flush_wpengine_aggressive', function() {
895
+        add_filter('autoptimize_flush_wpengine_aggressive', function() {
896 896
             return true;
897 897
         });
898 898
 
899 899
         $that = $this;
900
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
900
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
901 901
             $expected_methods = array(
902 902
                 'purge_varnish_cache',
903 903
                 'purge_memcached',
904 904
                 'clear_maxcdn_cache',
905 905
             );
906 906
 
907
-            $that->assertEquals( $methods, $expected_methods );
907
+            $that->assertEquals($methods, $expected_methods);
908 908
 
909 909
             return $methods;
910 910
         });
@@ -915,15 +915,15 @@  discard block
 block discarded – undo
915 915
     /**
916 916
      * @dataProvider provider_test_url_replace_cdn
917 917
      */
918
-    public function test_url_replace_cdn( $cdn_url, $input, $expected )
918
+    public function test_url_replace_cdn($cdn_url, $input, $expected)
919 919
     {
920
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
920
+        $mock = $this->getMockBuilder('autoptimizeBase')
921 921
                 ->disableOriginalConstructor()
922 922
                 ->getMockForAbstractClass();
923 923
 
924 924
         $mock->cdn_url = $cdn_url;
925
-        $actual        = $mock->url_replace_cdn( $input );
926
-        $this->assertEquals( $expected, $actual );
925
+        $actual        = $mock->url_replace_cdn($input);
926
+        $this->assertEquals($expected, $actual);
927 927
     }
928 928
 
929 929
     public function provider_test_url_replace_cdn()
@@ -940,13 +940,13 @@  discard block
 block discarded – undo
940 940
                 // CDN base url, url, expected result...
941 941
                 'http://cdn-test.example.org',
942 942
                 '/a.jpg',
943
-                'http://cdn-test.example.org/' . $subfolder . 'a.jpg',
943
+                'http://cdn-test.example.org/'.$subfolder.'a.jpg',
944 944
             ),
945 945
             // Full link with a matching AUTOPTIMIZE_WP_SITE_URL gets properly replaced...
946 946
             array(
947 947
                 'http://cdn-test.example.org',
948
-                $siteurl . '/wp-content/themes/something/example.svg',
949
-                'http://cdn-test.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
948
+                $siteurl.'/wp-content/themes/something/example.svg',
949
+                'http://cdn-test.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
950 950
             ),
951 951
             // Protocol-relative url with a "local" hostname that doesn't match example.org (AUTOPTIMIZE_WP_SITE_URL)...
952 952
             array(
@@ -957,59 +957,59 @@  discard block
 block discarded – undo
957 957
             // www.example.org does not match example.org (AUTOPTIMIZE_WP_SITE_URL) so it's left alone...
958 958
             array(
959 959
                 'http://cdn-test.example.org',
960
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
961
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
960
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
961
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
962 962
             ),
963 963
             // SSL cdn url + host-relative link...
964 964
             array(
965 965
                 'https://cdn.example.org',
966 966
                 '/a.jpg',
967
-                'https://cdn.example.org/' . $subfolder . 'a.jpg',
967
+                'https://cdn.example.org/'.$subfolder.'a.jpg',
968 968
             ),
969 969
             // SSL cdn url + http site url that matches AUTOPTIMIZE_WP_SITE_URL is properly replaced...
970 970
             array(
971 971
                 'https://cdn.example.org',
972
-                $siteurl . '/wp-content/themes/something/example.svg',
973
-                'https://cdn.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
972
+                $siteurl.'/wp-content/themes/something/example.svg',
973
+                'https://cdn.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
974 974
             ),
975 975
             // Protocol-relative cdn url given with protocol relative link that matches AUTOPTIMIZE_WP_SITE_URL host...
976 976
             array(
977 977
                 '//cdn.example.org',
978
-                $protorelativesiteurl . '/something.jpg',
979
-                '//cdn.example.org/' . $subfolder . 'something.jpg',
978
+                $protorelativesiteurl.'/something.jpg',
979
+                '//cdn.example.org/'.$subfolder.'something.jpg',
980 980
             ),
981 981
             // Protocol-relative cdn url given a http link that matches AUTOPTIMIZE_WP_SITE_URL host...
982 982
             array(
983 983
                 '//cdn.example.org',
984
-                $siteurl . '/something.png',
985
-                '//cdn.example.org/' . $subfolder . 'something.png',
984
+                $siteurl.'/something.png',
985
+                '//cdn.example.org/'.$subfolder.'something.png',
986 986
             ),
987 987
             // Protocol-relative cdn url with a host-relative link...
988 988
             array(
989 989
                 '//cdn.example.org',
990 990
                 '/a.jpg',
991
-                '//cdn.example.org/' . $subfolder . 'a.jpg',
991
+                '//cdn.example.org/'.$subfolder.'a.jpg',
992 992
             ),
993 993
             // Testing cdn urls with an explicit port number...
994 994
             array(
995 995
                 'http://cdn.com:8080',
996 996
                 '/a.jpg',
997
-                'http://cdn.com:8080/' . $subfolder . 'a.jpg',
997
+                'http://cdn.com:8080/'.$subfolder.'a.jpg',
998 998
             ),
999 999
             array(
1000 1000
                 '//cdn.com:4433',
1001 1001
                 '/a.jpg',
1002
-                '//cdn.com:4433/' . $subfolder . 'a.jpg',
1002
+                '//cdn.com:4433/'.$subfolder.'a.jpg',
1003 1003
             ),
1004 1004
             array(
1005 1005
                 '//cdn.com:4433',
1006
-                $siteurl . '/something.jpg',
1007
-                '//cdn.com:4433/' . $subfolder . 'something.jpg',
1006
+                $siteurl.'/something.jpg',
1007
+                '//cdn.com:4433/'.$subfolder.'something.jpg',
1008 1008
             ),
1009 1009
             array(
1010 1010
                 '//cdn.com:1234',
1011
-                $protorelativesiteurl . '/something.jpg',
1012
-                '//cdn.com:1234/' . $subfolder . 'something.jpg',
1011
+                $protorelativesiteurl.'/something.jpg',
1012
+                '//cdn.com:1234/'.$subfolder.'something.jpg',
1013 1013
             ),
1014 1014
             // Relative links should not be touched by url_replace_cdn()...
1015 1015
             array(
@@ -1034,8 +1034,8 @@  discard block
 block discarded – undo
1034 1034
             // even though they are really strange...
1035 1035
             array(
1036 1036
                 $siteurl, // example.org or http://localhost or http://localhost/wordpress
1037
-                $siteurl . '/something.jpg',
1038
-                $siteurl . '/something.jpg',
1037
+                $siteurl.'/something.jpg',
1038
+                $siteurl.'/something.jpg',
1039 1039
             ),
1040 1040
             // These shouldn't really be changed, or even if replacements do
1041 1041
             // happen, they shouldn't be destructive...
@@ -1074,31 +1074,31 @@  discard block
 block discarded – undo
1074 1074
         $test_link = '/a.jpg';
1075 1075
         $cdn_url   = '//cdn.example.org';
1076 1076
 
1077
-        $with_ssl = function( $cdn ) {
1077
+        $with_ssl = function($cdn) {
1078 1078
             return '';
1079 1079
         };
1080 1080
         $expected_with_ssl = '/a.jpg';
1081 1081
 
1082
-        $without_ssl = function( $cdn ) {
1082
+        $without_ssl = function($cdn) {
1083 1083
             return $cdn;
1084 1084
         };
1085
-        $expected_without_ssl = '//cdn.example.org/' . $sub . 'a.jpg';
1085
+        $expected_without_ssl = '//cdn.example.org/'.$sub.'a.jpg';
1086 1086
 
1087 1087
         // With a filter that returns something considered "empty", cdn replacement shouldn't occur...
1088
-        add_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
1089
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
1088
+        add_filter('autoptimize_filter_base_cdnurl', $with_ssl);
1089
+        $mock = $this->getMockBuilder('autoptimizeBase')
1090 1090
                 ->disableOriginalConstructor()
1091 1091
                 ->getMockForAbstractClass();
1092 1092
 
1093 1093
         $mock->cdn_url   = $cdn_url;
1094
-        $actual_with_ssl = $mock->url_replace_cdn( $test_link );
1095
-        $this->assertEquals( $expected_with_ssl, $actual_with_ssl );
1096
-        remove_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
1094
+        $actual_with_ssl = $mock->url_replace_cdn($test_link);
1095
+        $this->assertEquals($expected_with_ssl, $actual_with_ssl);
1096
+        remove_filter('autoptimize_filter_base_cdnurl', $with_ssl);
1097 1097
 
1098 1098
         // With a filter that returns an actual cdn url, cdn replacement should occur.
1099
-        add_filter( 'autoptimize_filter_base_cdnurl', $without_ssl );
1100
-        $actual_without_ssl = $mock->url_replace_cdn( $test_link );
1101
-        $this->assertEquals( $expected_without_ssl, $actual_without_ssl );
1099
+        add_filter('autoptimize_filter_base_cdnurl', $without_ssl);
1100
+        $actual_without_ssl = $mock->url_replace_cdn($test_link);
1101
+        $this->assertEquals($expected_without_ssl, $actual_without_ssl);
1102 1102
     }
1103 1103
 
1104 1104
     public function provider_cssmin_issues()
@@ -1137,11 +1137,11 @@  discard block
 block discarded – undo
1137 1137
     /**
1138 1138
      * @dataProvider provider_cssmin_issues
1139 1139
      */
1140
-    public function test_cssmin_issues( $input, $expected )
1140
+    public function test_cssmin_issues($input, $expected)
1141 1141
     {
1142
-        $minifier = new autoptimizeCSSmin( false ); // No need to raise limits for now.
1143
-        $actual   = $minifier->run( $input );
1144
-        $this->assertEquals( $expected, $actual );
1142
+        $minifier = new autoptimizeCSSmin(false); // No need to raise limits for now.
1143
+        $actual   = $minifier->run($input);
1144
+        $this->assertEquals($expected, $actual);
1145 1145
     }
1146 1146
 
1147 1147
     public function provider_getpath()
@@ -1166,7 +1166,7 @@  discard block
 block discarded – undo
1166 1166
             // This file comes with core, so should exist...
1167 1167
             array(
1168 1168
                 '/wp-includes/js/jquery/jquery.js',
1169
-                WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.js',
1169
+                WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.js',
1170 1170
             ),
1171 1171
             // Empty $url should return false.
1172 1172
             array(
@@ -1191,12 +1191,12 @@  discard block
 block discarded – undo
1191 1191
     /**
1192 1192
      * @dataProvider provider_getpath
1193 1193
      */
1194
-    public function test_getpath( $input, $expected )
1194
+    public function test_getpath($input, $expected)
1195 1195
     {
1196
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )->disableOriginalConstructor()->getMockForAbstractClass();
1196
+        $mock = $this->getMockBuilder('autoptimizeBase')->disableOriginalConstructor()->getMockForAbstractClass();
1197 1197
 
1198
-        $actual = $mock->getpath( $input );
1199
-        $this->assertEquals( $expected, $actual );
1198
+        $actual = $mock->getpath($input);
1199
+        $this->assertEquals($expected, $actual);
1200 1200
     }
1201 1201
 
1202 1202
     /**
@@ -1210,7 +1210,7 @@  discard block
 block discarded – undo
1210 1210
 
1211 1211
         $protorelativesiteurl = $urls['prsiteurl'];
1212 1212
 
1213
-        $css_orig     = <<<CSS
1213
+        $css_orig = <<<CSS
1214 1214
 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")}
1215 1215
 section.clipped.clippedTop {clip-path:url("#clipPolygonTop")}
1216 1216
 section.clipped.clippedBottom {clip-path:url("#clipPolygonBottom")}
@@ -1223,13 +1223,13 @@  discard block
 block discarded – undo
1223 1223
 .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);}
1224 1224
 CSS;
1225 1225
 
1226
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
1227
-        $this->assertEquals( $css_expected, $fixurls_result );
1226
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
1227
+        $this->assertEquals($css_expected, $fixurls_result);
1228 1228
     }
1229 1229
 
1230 1230
     public function test_background_datauri_sprites_with_fixurls()
1231 1231
     {
1232
-        $css_orig     = <<<CSS
1232
+        $css_orig = <<<CSS
1233 1233
 .shadow { background:url(img/1x1.png) top center; }
1234 1234
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
1235 1235
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1281,27 +1281,27 @@  discard block
 block discarded – undo
1281 1281
 CSS;
1282 1282
 
1283 1283
         // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri.
1284
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
1284
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
1285 1285
             return true;
1286
-        }, 10, 2 );
1286
+        }, 10, 2);
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_datauri_image', function( $base64array, $path ) {
1289
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
1290 1290
             $head = 'data:image/png;base64,';
1291 1291
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
1292 1292
 
1293
-            $result['full']       = $head . $data;
1293
+            $result['full']       = $head.$data;
1294 1294
             $result['base64data'] = $data;
1295 1295
             return $result;
1296
-        }, 10, 2 );
1296
+        }, 10, 2);
1297 1297
 
1298
-        $instance = new autoptimizeStyles( $css_orig );
1299
-        $instance->setOption( 'datauris', true );
1298
+        $instance = new autoptimizeStyles($css_orig);
1299
+        $instance->setOption('datauris', true);
1300 1300
 
1301
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
1302
-        $css_actual     = $instance->rewrite_assets( $fixurls_result );
1301
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
1302
+        $css_actual     = $instance->rewrite_assets($fixurls_result);
1303 1303
 
1304
-        $this->assertEquals( $css_expected, $css_actual );
1304
+        $this->assertEquals($css_expected, $css_actual);
1305 1305
     }
1306 1306
 
1307 1307
     /**
@@ -1321,7 +1321,7 @@  discard block
 block discarded – undo
1321 1321
      */
1322 1322
     public function test_background_datauri_sprites_without_fixurls()
1323 1323
     {
1324
-        $css_orig     = <<<CSS
1324
+        $css_orig = <<<CSS
1325 1325
 .shadow { background:url(img/1x1.png) top center; }
1326 1326
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
1327 1327
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1365,24 +1365,24 @@  discard block
 block discarded – undo
1365 1365
 CSS;
1366 1366
 
1367 1367
         // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri.
1368
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
1368
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
1369 1369
             return true;
1370
-        }, 10, 2 );
1370
+        }, 10, 2);
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_datauri_image', function( $base64array, $path ) {
1373
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
1374 1374
             $head = 'data:image/png;base64,';
1375 1375
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
1376 1376
 
1377
-            $result['full']       = $head . $data;
1377
+            $result['full']       = $head.$data;
1378 1378
             $result['base64data'] = $data;
1379 1379
             return $result;
1380
-        }, 10, 2 );
1380
+        }, 10, 2);
1381 1381
 
1382
-        $instance = new autoptimizeStyles( $css_orig );
1383
-        $instance->setOption( 'datauris', true );
1384
-        $css_actual = $instance->rewrite_assets( $css_orig );
1385
-        $this->assertEquals( $css_expected, $css_actual );
1382
+        $instance = new autoptimizeStyles($css_orig);
1383
+        $instance->setOption('datauris', true);
1384
+        $css_actual = $instance->rewrite_assets($css_orig);
1385
+        $this->assertEquals($css_expected, $css_actual);
1386 1386
     }
1387 1387
 
1388 1388
     /**
@@ -1502,12 +1502,12 @@  discard block
 block discarded – undo
1502 1502
 CSS;
1503 1503
 
1504 1504
         // Test with fonts pointed to the CDN + cdn option is set.
1505
-        add_filter( 'autoptimize_filter_css_fonts_cdn', '__return_true' );
1506
-        $instance = new autoptimizeStyles( $css_in );
1507
-        $instance->setOption( 'cdn_url', $cdnurl );
1508
-        $css_actual_fonts_cdn = $instance->rewrite_assets( $css_in );
1505
+        add_filter('autoptimize_filter_css_fonts_cdn', '__return_true');
1506
+        $instance = new autoptimizeStyles($css_in);
1507
+        $instance->setOption('cdn_url', $cdnurl);
1508
+        $css_actual_fonts_cdn = $instance->rewrite_assets($css_in);
1509 1509
 
1510
-        $this->assertEquals( $css_expected_fonts_cdn, $css_actual_fonts_cdn );
1510
+        $this->assertEquals($css_expected_fonts_cdn, $css_actual_fonts_cdn);
1511 1511
     }
1512 1512
 
1513 1513
     /**
@@ -1623,10 +1623,10 @@  discard block
 block discarded – undo
1623 1623
 }
1624 1624
 CSS;
1625 1625
         // Test without moving fonts to CDN, but cdn option is set.
1626
-        $instance = new autoptimizeStyles( $css_in );
1627
-        $instance->setOption( 'cdn_url', $urls['cdnurl'] );
1628
-        $css_actual = $instance->rewrite_assets( $css_in );
1629
-        $this->assertEquals( $css_expected, $css_actual );
1626
+        $instance = new autoptimizeStyles($css_in);
1627
+        $instance->setOption('cdn_url', $urls['cdnurl']);
1628
+        $css_actual = $instance->rewrite_assets($css_in);
1629
+        $this->assertEquals($css_expected, $css_actual);
1630 1630
     }
1631 1631
 
1632 1632
     public function test_assets_regex_replaces_multi_bg_images()
@@ -1647,16 +1647,16 @@  discard block
 block discarded – undo
1647 1647
 }
1648 1648
 CSS;
1649 1649
 
1650
-        $instance = new autoptimizeStyles( $in );
1651
-        $instance->setOption( 'cdn_url', $cdnurl );
1652
-        $actual = $instance->rewrite_assets( $in );
1650
+        $instance = new autoptimizeStyles($in);
1651
+        $instance->setOption('cdn_url', $cdnurl);
1652
+        $actual = $instance->rewrite_assets($in);
1653 1653
 
1654
-        $this->assertEquals( $expected, $actual );
1654
+        $this->assertEquals($expected, $actual);
1655 1655
     }
1656 1656
 
1657 1657
     public function test_at_supports_spacing_issue_110()
1658 1658
     {
1659
-        $in       = <<<CSS
1659
+        $in = <<<CSS
1660 1660
 @supports (-webkit-filter: blur(3px)) or (filter: blur(3px)) {
1661 1661
     .blur {
1662 1662
         filter:blur(3px);
@@ -1670,10 +1670,10 @@  discard block
 block discarded – undo
1670 1670
 @supports (-webkit-filter:blur(3px)) or (filter:blur(3px)){.blur{filter:blur(3px)}}@supports((position:-webkit-sticky) or (position:sticky)){.sticky{position:sticky}}
1671 1671
 CSS;
1672 1672
 
1673
-        $instance = new autoptimizeStyles( $in );
1674
-        $actual   = $instance->run_minifier_on( $in );
1673
+        $instance = new autoptimizeStyles($in);
1674
+        $actual   = $instance->run_minifier_on($in);
1675 1675
 
1676
-        $this->assertEquals( $expected, $actual );
1676
+        $this->assertEquals($expected, $actual);
1677 1677
     }
1678 1678
 
1679 1679
     public function test_css_import_semicolon_url_issue_122()
@@ -1689,18 +1689,18 @@  discard block
 block discarded – undo
1689 1689
 </style>
1690 1690
 HTML;
1691 1691
 
1692
-        $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-->';
1692
+        $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-->';
1693 1693
 
1694 1694
         $options = [
1695 1695
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
1696 1696
         ];
1697 1697
 
1698
-        $instance = new autoptimizeStyles( $in );
1699
-        $instance->read( $options['autoptimizeStyles'] );
1698
+        $instance = new autoptimizeStyles($in);
1699
+        $instance->read($options['autoptimizeStyles']);
1700 1700
         $instance->minify();
1701 1701
         $instance->cache();
1702 1702
         $actual = $instance->getcontent();
1703
-        $this->assertEquals( $expected, $actual );
1703
+        $this->assertEquals($expected, $actual);
1704 1704
     }
1705 1705
 
1706 1706
     public function test_fixurls_with_at_imports_and_media_queries()
@@ -1710,10 +1710,10 @@  discard block
 block discarded – undo
1710 1710
         $subfolder = $urls['subfolder'];
1711 1711
 
1712 1712
         $in  = '@import "foo.css"; @import "bar.css" (orientation:landscape);';
1713
-        $exp = '@import url(' . $prsiteurl . '/wp-content/themes/my-theme/foo.css); @import url(' . $prsiteurl . '/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
1713
+        $exp = '@import url('.$prsiteurl.'/wp-content/themes/my-theme/foo.css); @import url('.$prsiteurl.'/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
1714 1714
 
1715
-        $actual = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $in );
1716
-        $this->assertEquals( $exp, $actual );
1715
+        $actual = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $in);
1716
+        $this->assertEquals($exp, $actual);
1717 1717
     }
1718 1718
 
1719 1719
     public function test_aostyles_at_imports_with_media_queries()
@@ -1728,43 +1728,43 @@  discard block
 block discarded – undo
1728 1728
 </style>
1729 1729
 HTML;
1730 1730
 
1731
-        $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-->';
1731
+        $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-->';
1732 1732
 
1733 1733
         $options = [
1734 1734
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
1735 1735
         ];
1736 1736
 
1737
-        $instance = new autoptimizeStyles( $in );
1738
-        $instance->read( $options['autoptimizeStyles'] );
1737
+        $instance = new autoptimizeStyles($in);
1738
+        $instance->read($options['autoptimizeStyles']);
1739 1739
         $instance->minify();
1740 1740
         $instance->cache();
1741 1741
 
1742 1742
         $actual = $instance->getcontent();
1743
-        $this->assertEquals( $expected, $actual );
1743
+        $this->assertEquals($expected, $actual);
1744 1744
     }
1745 1745
 
1746 1746
     public function test_cache_size_checker_hooked_by_default()
1747 1747
     {
1748
-        $this->assertNotEmpty( autoptimizeCacheChecker::SCHEDULE_HOOK );
1748
+        $this->assertNotEmpty(autoptimizeCacheChecker::SCHEDULE_HOOK);
1749 1749
 
1750 1750
         // No schedule, because it's only added when is_admin() is true.
1751
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1751
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1752 1752
 
1753 1753
         // Proving that setup() sets the schedule as needed.
1754 1754
         $checker = new autoptimizeCacheChecker();
1755 1755
         $checker->setup();
1756
-        $this->assertEquals( 'twicedaily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1756
+        $this->assertEquals('twicedaily', wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1757 1757
     }
1758 1758
 
1759 1759
     public function test_cache_size_checker_disabled_with_filter()
1760 1760
     {
1761
-        add_filter( 'autoptimize_filter_cachecheck_do', '__return_false' );
1761
+        add_filter('autoptimize_filter_cachecheck_do', '__return_false');
1762 1762
 
1763 1763
         $checker = new autoptimizeCacheChecker();
1764 1764
         $checker->setup();
1765
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
1765
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
1766 1766
 
1767
-        remove_all_filters( 'autoptimize_filter_cachecheck_do' );
1767
+        remove_all_filters('autoptimize_filter_cachecheck_do');
1768 1768
     }
1769 1769
 
1770 1770
     public function test_is_start_buffering_hooked_properly()
@@ -1777,12 +1777,12 @@  discard block
 block discarded – undo
1777 1777
          * https://www.theaveragedev.com/mocking-constants-in-tests/.
1778 1778
          */
1779 1779
 
1780
-        if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
1780
+        if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
1781 1781
             $this->assertEquals(
1782 1782
                 autoptimizeMain::INIT_EARLIER_PRIORITY,
1783
-                has_action( 'init', array( $instance, 'start_buffering' ) )
1783
+                has_action('init', array($instance, 'start_buffering'))
1784 1784
             );
1785
-            $this->assertTrue( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) );
1785
+            $this->assertTrue(!defined('AUTOPTIMIZE_HOOK_INTO'));
1786 1786
         }
1787 1787
 
1788 1788
         /*
@@ -1799,18 +1799,18 @@  discard block
 block discarded – undo
1799 1799
 
1800 1800
     public function test_inline_and_defer_markup()
1801 1801
     {
1802
-        add_filter( 'autoptimize_filter_css_defer', '__return_true' );
1803
-        add_filter( 'autoptimize_filter_css_defer_inline', '__return_true' );
1802
+        add_filter('autoptimize_filter_css_defer', '__return_true');
1803
+        add_filter('autoptimize_filter_css_defer_inline', '__return_true');
1804 1804
 
1805
-        $actual = $this->ao->end_buffering( $this->get_test_markup() );
1806
-        if ( is_multisite() ) {
1807
-            $this->assertEquals( $this->get_test_markup_output_inline_defer_ms(), $actual );
1805
+        $actual = $this->ao->end_buffering($this->get_test_markup());
1806
+        if (is_multisite()) {
1807
+            $this->assertEquals($this->get_test_markup_output_inline_defer_ms(), $actual);
1808 1808
         } else {
1809
-            $this->assertEquals( $this->get_test_markup_output_inline_defer(), $actual );
1809
+            $this->assertEquals($this->get_test_markup_output_inline_defer(), $actual);
1810 1810
         }
1811 1811
 
1812
-        remove_all_filters( 'autoptimize_filter_css_defer' );
1813
-        remove_all_filters( 'autoptimize_filter_css_defer_inline' );
1812
+        remove_all_filters('autoptimize_filter_css_defer');
1813
+        remove_all_filters('autoptimize_filter_css_defer_inline');
1814 1814
     }
1815 1815
 
1816 1816
     public function test_js_aggregation_decision_and_dontaggregate_filter()
@@ -1818,47 +1818,47 @@  discard block
 block discarded – undo
1818 1818
         $opts = $this->getAoScriptsDefaultOptions();
1819 1819
 
1820 1820
         // Aggregating: true by default.
1821
-        $scripts = new autoptimizeScripts( '' );
1822
-        $scripts->read( $opts );
1823
-        $this->assertTrue( $scripts->aggregating() );
1821
+        $scripts = new autoptimizeScripts('');
1822
+        $scripts->read($opts);
1823
+        $this->assertTrue($scripts->aggregating());
1824 1824
 
1825 1825
         // Aggregating: option=true (dontaggregate=false by default).
1826 1826
         $opts['aggregate'] = true;
1827
-        $scripts           = new autoptimizeScripts( '' );
1828
-        $scripts->read( $opts );
1829
-        $this->assertTrue( $scripts->aggregating() );
1827
+        $scripts           = new autoptimizeScripts('');
1828
+        $scripts->read($opts);
1829
+        $this->assertTrue($scripts->aggregating());
1830 1830
 
1831 1831
         // Aggregating: option=true, dontaggregate=false explicit.
1832 1832
         $opts['aggregate'] = true;
1833
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
1834
-        $scripts = new autoptimizeScripts( '' );
1835
-        $scripts->read( $opts );
1836
-        $this->assertTrue( $scripts->aggregating() );
1837
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1833
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
1834
+        $scripts = new autoptimizeScripts('');
1835
+        $scripts->read($opts);
1836
+        $this->assertTrue($scripts->aggregating());
1837
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1838 1838
 
1839 1839
         // Not aggregating: option=true, dontaggregate=true.
1840 1840
         $opts['aggregate'] = true;
1841
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
1842
-        $scripts = new autoptimizeScripts( '' );
1843
-        $scripts->read( $opts );
1844
-        $this->assertFalse( $scripts->aggregating() );
1845
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1841
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
1842
+        $scripts = new autoptimizeScripts('');
1843
+        $scripts->read($opts);
1844
+        $this->assertFalse($scripts->aggregating());
1845
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1846 1846
 
1847 1847
         // Not aggregating: option=false, dontaggregate=false.
1848 1848
         $opts['aggregate'] = false;
1849
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
1850
-        $scripts = new autoptimizeScripts( '' );
1851
-        $scripts->read( $opts );
1852
-        $this->assertFalse( $scripts->aggregating() );
1853
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1849
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
1850
+        $scripts = new autoptimizeScripts('');
1851
+        $scripts->read($opts);
1852
+        $this->assertFalse($scripts->aggregating());
1853
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1854 1854
 
1855 1855
         // Not aggregating: option=false, dontaggregate=true.
1856 1856
         $opts['aggregate'] = false;
1857
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
1858
-        $scripts = new autoptimizeScripts( '' );
1859
-        $scripts->read( $opts );
1860
-        $this->assertFalse( $scripts->aggregating() );
1861
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
1857
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
1858
+        $scripts = new autoptimizeScripts('');
1859
+        $scripts->read($opts);
1860
+        $this->assertFalse($scripts->aggregating());
1861
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
1862 1862
     }
1863 1863
 
1864 1864
     public function test_css_aggregation_decision_and_dontaggregate_filter()
@@ -1866,78 +1866,78 @@  discard block
 block discarded – undo
1866 1866
         $opts = $this->getAoStylesDefaultOptions();
1867 1867
 
1868 1868
         // Aggregating: true by default.
1869
-        $styles = new autoptimizeStyles( '' );
1870
-        $this->assertTrue( $styles->aggregating() );
1869
+        $styles = new autoptimizeStyles('');
1870
+        $this->assertTrue($styles->aggregating());
1871 1871
 
1872 1872
         // Aggregating: option=true (dontaggregate=false by default).
1873 1873
         $opts['aggregate'] = true;
1874
-        $styles            = new autoptimizeStyles( '' );
1875
-        $styles->read( $opts );
1876
-        $this->assertTrue( $styles->aggregating() );
1874
+        $styles            = new autoptimizeStyles('');
1875
+        $styles->read($opts);
1876
+        $this->assertTrue($styles->aggregating());
1877 1877
 
1878 1878
         // Aggregating: option=true, dontaggregate=false explicit.
1879 1879
         $opts['aggregate'] = true;
1880
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
1881
-        $styles = new autoptimizeStyles( '' );
1882
-        $styles->read( $opts );
1883
-        $this->assertTrue( $styles->aggregating() );
1884
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1880
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
1881
+        $styles = new autoptimizeStyles('');
1882
+        $styles->read($opts);
1883
+        $this->assertTrue($styles->aggregating());
1884
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1885 1885
 
1886 1886
         // Not aggregating: option=true, dontaggregate=true.
1887 1887
         $opts['aggregate'] = true;
1888
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
1889
-        $styles = new autoptimizeStyles( '' );
1890
-        $styles->read( $opts );
1891
-        $this->assertFalse( $styles->aggregating() );
1892
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1888
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
1889
+        $styles = new autoptimizeStyles('');
1890
+        $styles->read($opts);
1891
+        $this->assertFalse($styles->aggregating());
1892
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1893 1893
 
1894 1894
         // Not aggregating: option=false, dontaggregate=false.
1895 1895
         $opts['aggregate'] = false;
1896
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
1897
-        $styles = new autoptimizeStyles( '' );
1898
-        $styles->read( $opts );
1899
-        $this->assertFalse( $styles->aggregating() );
1900
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1896
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
1897
+        $styles = new autoptimizeStyles('');
1898
+        $styles->read($opts);
1899
+        $this->assertFalse($styles->aggregating());
1900
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1901 1901
 
1902 1902
         // Not aggregating: option=false, dontaggregate=true.
1903 1903
         $opts['aggregate'] = false;
1904
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
1905
-        $styles = new autoptimizeStyles( '' );
1906
-        $styles->read( $opts );
1907
-        $this->assertFalse( $styles->aggregating() );
1908
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
1904
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
1905
+        $styles = new autoptimizeStyles('');
1906
+        $styles->read($opts);
1907
+        $this->assertFalse($styles->aggregating());
1908
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
1909 1909
     }
1910 1910
 
1911 1911
     public function test_css_minify_single_with_cdning()
1912 1912
     {
1913
-        $pathname = dirname( __FILE__ ) . '/fixtures/minify-single.css';
1913
+        $pathname = dirname(__FILE__).'/fixtures/minify-single.css';
1914 1914
         $opts     = $this->getAoStylesDefaultOptions();
1915
-        $styles   = new autoptimizeStyles( '' );
1916
-        $styles->read( $opts );
1915
+        $styles   = new autoptimizeStyles('');
1916
+        $styles->read($opts);
1917 1917
 
1918
-        $url = $styles->minify_single( $pathname, $cache_miss = true );
1918
+        $url = $styles->minify_single($pathname, $cache_miss = true);
1919 1919
 
1920 1920
         // Minified url filename + its pointed to cdn.
1921
-        $this->assertContains( AUTOPTIMIZE_CACHE_CHILD_DIR, $url );
1922
-        $this->assertContains( '/autoptimize_single_', $url );
1923
-        $this->assertContains( $styles->cdn_url, $url );
1921
+        $this->assertContains(AUTOPTIMIZE_CACHE_CHILD_DIR, $url);
1922
+        $this->assertContains('/autoptimize_single_', $url);
1923
+        $this->assertContains($styles->cdn_url, $url);
1924 1924
 
1925 1925
         // Actual minified css contents are minified and cdn-ed.
1926
-        $path     = $styles->getpath( $url );
1927
-        $contents = file_get_contents( $path );
1928
-        $this->assertContains( $styles->cdn_url, $contents );
1929
-        $this->assertContains( '.bg{background:url(' . $styles->cdn_url, $contents );
1926
+        $path     = $styles->getpath($url);
1927
+        $contents = file_get_contents($path);
1928
+        $this->assertContains($styles->cdn_url, $contents);
1929
+        $this->assertContains('.bg{background:url('.$styles->cdn_url, $contents);
1930 1930
     }
1931 1931
 
1932 1932
     public function test_ao_partners_instantiation_without_explicit_include()
1933 1933
     {
1934 1934
         $partners = new autoptimizePartners();
1935
-        $this->assertTrue( $partners instanceof autoptimizePartners );
1935
+        $this->assertTrue($partners instanceof autoptimizePartners);
1936 1936
     }
1937 1937
 
1938 1938
     public function test_html_minify_keep_html_comments_inside_script_blocks()
1939 1939
     {
1940
-        $markup   = <<<MARKUP
1940
+        $markup = <<<MARKUP
1941 1941
 <script>
1942 1942
 <!-- End Support AJAX add to cart -->
1943 1943
 var a = "b";
@@ -1967,23 +1967,23 @@  discard block
 block discarded – undo
1967 1967
             ],
1968 1968
         ];
1969 1969
 
1970
-        $instance = new autoptimizeHTML( $markup );
1971
-        $instance->read( $options['autoptimizeHTML'] );
1970
+        $instance = new autoptimizeHTML($markup);
1971
+        $instance->read($options['autoptimizeHTML']);
1972 1972
         $instance->minify();
1973 1973
         $actual = $instance->getcontent();
1974
-        $this->assertEquals( $expected, $actual );
1974
+        $this->assertEquals($expected, $actual);
1975 1975
 
1976
-        $instance = new autoptimizeHTML( $markup2 );
1977
-        $instance->read( $options['autoptimizeHTML'] );
1976
+        $instance = new autoptimizeHTML($markup2);
1977
+        $instance->read($options['autoptimizeHTML']);
1978 1978
         $instance->minify();
1979 1979
         $actual2 = $instance->getcontent();
1980
-        $this->assertEquals( $expected2, $actual2 );
1980
+        $this->assertEquals($expected2, $actual2);
1981 1981
     }
1982 1982
 
1983 1983
     public function test_html_minify_remove_html_comments_inside_script_blocks()
1984 1984
     {
1985 1985
         // Default case, html comments removed (keepcomments = false).
1986
-        $markup1   = <<<MARKUP
1986
+        $markup1 = <<<MARKUP
1987 1987
 <script>
1988 1988
 var a = "b";
1989 1989
 <!-- End Support AJAX add to cart -->
@@ -1994,7 +1994,7 @@  discard block
 block discarded – undo
1994 1994
 <!-- End Support AJAX add to cart</script>
1995 1995
 MARKUP;
1996 1996
 
1997
-        $markup2   = <<<MARKUP
1997
+        $markup2 = <<<MARKUP
1998 1998
 <script>
1999 1999
 <!-- End Support AJAX add to cart -->
2000 2000
 var a = "b";
@@ -2011,17 +2011,17 @@  discard block
 block discarded – undo
2011 2011
             ],
2012 2012
         ];
2013 2013
 
2014
-        $instance = new autoptimizeHTML( $markup1 );
2015
-        $instance->read( $options['autoptimizeHTML'] );
2014
+        $instance = new autoptimizeHTML($markup1);
2015
+        $instance->read($options['autoptimizeHTML']);
2016 2016
         $instance->minify();
2017 2017
         $actual = $instance->getcontent();
2018
-        $this->assertEquals( $expected1, $actual );
2018
+        $this->assertEquals($expected1, $actual);
2019 2019
 
2020
-        $instance = new autoptimizeHTML( $markup2 );
2021
-        $instance->read( $options['autoptimizeHTML'] );
2020
+        $instance = new autoptimizeHTML($markup2);
2021
+        $instance->read($options['autoptimizeHTML']);
2022 2022
         $instance->minify();
2023 2023
         $actual2 = $instance->getcontent();
2024
-        $this->assertEquals( $expected2, $actual2 );
2024
+        $this->assertEquals($expected2, $actual2);
2025 2025
     }
2026 2026
 
2027 2027
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern()
@@ -2045,11 +2045,11 @@  discard block
 block discarded – undo
2045 2045
             ],
2046 2046
         ];
2047 2047
 
2048
-        $instance = new autoptimizeHTML( $markup );
2049
-        $instance->read( $options['autoptimizeHTML'] );
2048
+        $instance = new autoptimizeHTML($markup);
2049
+        $instance->read($options['autoptimizeHTML']);
2050 2050
         $instance->minify();
2051 2051
         $actual = $instance->getcontent();
2052
-        $this->assertEquals( $expected, $actual );
2052
+        $this->assertEquals($expected, $actual);
2053 2053
     }
2054 2054
 
2055 2055
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern_untouched()
@@ -2074,49 +2074,49 @@  discard block
 block discarded – undo
2074 2074
             ],
2075 2075
         ];
2076 2076
 
2077
-        $instance = new autoptimizeHTML( $markup );
2078
-        $instance->read( $options['autoptimizeHTML'] );
2077
+        $instance = new autoptimizeHTML($markup);
2078
+        $instance->read($options['autoptimizeHTML']);
2079 2079
         $instance->minify();
2080 2080
         $actual = $instance->getcontent();
2081
-        $this->assertEquals( $expected, $actual );
2081
+        $this->assertEquals($expected, $actual);
2082 2082
     }
2083 2083
 
2084 2084
     public function test_utils_mbstring_availabilty_overriding()
2085 2085
     {
2086 2086
         $orig     = autoptimizeUtils::mbstring_available();
2087
-        $opposite = ! $orig;
2087
+        $opposite = !$orig;
2088 2088
 
2089
-        $this->assertSame( $orig, autoptimizeUtils::mbstring_available() );
2089
+        $this->assertSame($orig, autoptimizeUtils::mbstring_available());
2090 2090
         // Override works...
2091
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available( $opposite ) );
2091
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available($opposite));
2092 2092
         // And override remains cached as the last version.
2093
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available() );
2093
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available());
2094 2094
     }
2095 2095
 
2096 2096
     public function test_utils_mbstring_basics()
2097 2097
     {
2098 2098
         // Turn on mbstring usage.
2099
-        autoptimizeUtils::mbstring_available( true );
2099
+        autoptimizeUtils::mbstring_available(true);
2100 2100
 
2101
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'ASCII' ) );
2102
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'CP850' ) );
2103
-        $this->assertSame( 3, autoptimizeUtils::strlen( '한국어' ) );
2101
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'ASCII'));
2102
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'CP850'));
2103
+        $this->assertSame(3, autoptimizeUtils::strlen('한국어'));
2104 2104
 
2105
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', '' ) );
2106
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', 'a', -1 ) );
2107
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'd' ) );
2108
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'a', 3 ) );
2109
-        $this->assertSame( 1, autoptimizeUtils::strpos( '한국어', '국' ) );
2105
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', ''));
2106
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', 'a', -1));
2107
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'd'));
2108
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'a', 3));
2109
+        $this->assertSame(1, autoptimizeUtils::strpos('한국어', '국'));
2110 2110
     }
2111 2111
 
2112 2112
     /**
2113 2113
      * @dataProvider provider_utils_substr_replace
2114 2114
      */
2115
-    function test_utils_substr_replace_basics_mbstring( $s, $repl, $start, $len, $expected )
2115
+    function test_utils_substr_replace_basics_mbstring($s, $repl, $start, $len, $expected)
2116 2116
     {
2117 2117
         // Force mbstring code path...
2118
-        autoptimizeUtils::mbstring_available( true );
2119
-        $this->assertEquals( $expected, autoptimizeUtils::substr_replace( $s, $repl, $start, $len ) );
2118
+        autoptimizeUtils::mbstring_available(true);
2119
+        $this->assertEquals($expected, autoptimizeUtils::substr_replace($s, $repl, $start, $len));
2120 2120
     }
2121 2121
 
2122 2122
     public function provider_utils_substr_replace()
@@ -2158,48 +2158,48 @@  discard block
 block discarded – undo
2158 2158
 
2159 2159
     function test_mb_substr_replace_with_ascii_input_string()
2160 2160
     {
2161
-        autoptimizeUtils::mbstring_available( false );
2161
+        autoptimizeUtils::mbstring_available(false);
2162 2162
 
2163 2163
         $str = 'Ascii';
2164 2164
 
2165
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
2166
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2167
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2168
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
2169
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2165
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
2166
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2167
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2168
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
2169
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2170 2170
     }
2171 2171
 
2172 2172
     function test_mb_substr_replace_with_utf8_input_string()
2173 2173
     {
2174
-        autoptimizeUtils::mbstring_available( true );
2174
+        autoptimizeUtils::mbstring_available(true);
2175 2175
 
2176 2176
         $str = 'âønæë';
2177 2177
 
2178
-        $this->assertSame( 'âñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
2179
-        $this->assertSame( 'ñnæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2180
-        $this->assertSame( 'âøñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2181
-        $this->assertSame( 'âøz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
2182
-        $this->assertSame( 'âñæë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2178
+        $this->assertSame('âñ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); // No length.
2179
+        $this->assertSame('ñnæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2180
+        $this->assertSame('âøñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2181
+        $this->assertSame('âøz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
2182
+        $this->assertSame('âñæë', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2183 2183
     }
2184 2184
 
2185 2185
     function test_default_substr_replace_with_ascii_input_string()
2186 2186
     {
2187 2187
         // Disable mbstring which should fall ack to substr_replace...
2188
-        autoptimizeUtils::mbstring_available( false );
2188
+        autoptimizeUtils::mbstring_available(false);
2189 2189
 
2190 2190
         $str = 'Ascii';
2191 2191
 
2192
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
2193
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2194
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2195
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
2196
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2192
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
2193
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2194
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2195
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
2196
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
2197 2197
     }
2198 2198
 
2199 2199
     function test_default_substr_replace_with_utf8_input_string()
2200 2200
     {
2201 2201
         // Disabling mbstring, falling back to substr_replace...
2202
-        autoptimizeUtils::mbstring_available( false );
2202
+        autoptimizeUtils::mbstring_available(false);
2203 2203
 
2204 2204
         // This is really impossible to make work properly, since
2205 2205
         // any start/len parameters we give are working with bytes instead
@@ -2208,55 +2208,55 @@  discard block
 block discarded – undo
2208 2208
 
2209 2209
         // $this->assertSame( '�ñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
2210 2210
         // $this->assertSame( 'ñ�næë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
2211
-        $this->assertSame( 'ñønæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
2212
-        $this->assertSame( 'âñxæë', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
2213
-        $this->assertSame( 'âz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
2211
+        $this->assertSame('ñønæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
2212
+        $this->assertSame('âñxæë', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
2213
+        $this->assertSame('âz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
2214 2214
     }
2215 2215
 
2216 2216
     public function test_cache_fast_delete()
2217 2217
     {
2218
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
2218
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
2219 2219
 
2220 2220
         autoptimizeCache::clearall_actionless();
2221 2221
 
2222
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
2222
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
2223 2223
     }
2224 2224
 
2225 2225
     public function test_delete_advanced_cache_clear_artifacts()
2226 2226
     {
2227
-        $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() );
2227
+        $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts());
2228 2228
     }
2229 2229
 
2230 2230
     public function provider_canonicalization()
2231 2231
     {
2232 2232
         return array(
2233
-            array( '../common', 'common' ),
2234
-            array( '../what-does-this-mean/really?/', 'what-does-this-mean/really?/' ),
2235
-            array( '../../what/where/how', 'what/where/how' ),
2236
-            array( '/../more.dots.please/', '/more.dots.please/' ),
2237
-            array( '/../../what/where/how', '/what/where/how' ),
2238
-            array( '/a/b/c/../../../d/e/file.txt', '/d/e/file.txt' ),
2239
-            array( 'a/b/../c', 'a/c' ),
2240
-            array( './../../etc/passwd', './etc/passwd' ),
2241
-            array( '/var/.////./user/./././..//.//../////../././.././test/////', '/test/' ),
2242
-            array( '/var/user/./././.././../.././././test/', '/test/' ),
2243
-            array( '/hello/0//how/../are/../you', '/hello/0/you' ),
2244
-            array( '', '' ),
2245
-            array( '.', '.' ),
2246
-            array( '..', '..' ),
2247
-            array( './..', './..' ),
2248
-            array( '../.', '.' ),
2233
+            array('../common', 'common'),
2234
+            array('../what-does-this-mean/really?/', 'what-does-this-mean/really?/'),
2235
+            array('../../what/where/how', 'what/where/how'),
2236
+            array('/../more.dots.please/', '/more.dots.please/'),
2237
+            array('/../../what/where/how', '/what/where/how'),
2238
+            array('/a/b/c/../../../d/e/file.txt', '/d/e/file.txt'),
2239
+            array('a/b/../c', 'a/c'),
2240
+            array('./../../etc/passwd', './etc/passwd'),
2241
+            array('/var/.////./user/./././..//.//../////../././.././test/////', '/test/'),
2242
+            array('/var/user/./././.././../.././././test/', '/test/'),
2243
+            array('/hello/0//how/../are/../you', '/hello/0/you'),
2244
+            array('', ''),
2245
+            array('.', '.'),
2246
+            array('..', '..'),
2247
+            array('./..', './..'),
2248
+            array('../.', '.'),
2249 2249
             // This might be debatable...
2250
-            array( '../..', '..' ),
2250
+            array('../..', '..'),
2251 2251
         );
2252 2252
     }
2253 2253
 
2254 2254
     /**
2255 2255
      * @dataProvider provider_canonicalization
2256 2256
      */
2257
-    public function test_path_canonicalize( $path, $canonicalized )
2257
+    public function test_path_canonicalize($path, $canonicalized)
2258 2258
     {
2259
-        $this->assertSame( $canonicalized, autoptimizeUtils::path_canonicalize( $path ) );
2259
+        $this->assertSame($canonicalized, autoptimizeUtils::path_canonicalize($path));
2260 2260
     }
2261 2261
 
2262 2262
     /**
@@ -2270,16 +2270,16 @@  discard block
 block discarded – undo
2270 2270
     public function test_autoptimize_filter_cdn_magic_path_check()
2271 2271
     {
2272 2272
         $cdnurl = 'http://cdn.example.org';
2273
-        add_filter( 'autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2 );
2273
+        add_filter('autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2);
2274 2274
 
2275 2275
         // Even when site is in a subfolder, the resulting cdn-rewritten url
2276 2276
         // should not magically include it, due to the above filter.
2277 2277
         // The second parameter is here to force a cache miss and re-run
2278 2278
         // the filter since we're using the same cdn url all over the place,
2279 2279
         // but want to prove different things with it.
2280
-        $this->assertSame( $cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed( $cdnurl, true ) );
2280
+        $this->assertSame($cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed($cdnurl, true));
2281 2281
 
2282
-        remove_all_filters( 'autoptimize_filter_cdn_magic_path_check' );
2282
+        remove_all_filters('autoptimize_filter_cdn_magic_path_check');
2283 2283
     }
2284 2284
 
2285 2285
     /**
@@ -2302,8 +2302,8 @@  discard block
 block discarded – undo
2302 2302
 MARKUP;
2303 2303
 
2304 2304
         $instance = new autoptimizeExtra();
2305
-        $actual = $instance->filter_optimize_images( $markup );
2306
-        $this->assertEquals( $expected, $actual );
2305
+        $actual = $instance->filter_optimize_images($markup);
2306
+        $this->assertEquals($expected, $actual);
2307 2307
     }
2308 2308
 
2309 2309
     /**
@@ -2324,8 +2324,8 @@  discard block
 block discarded – undo
2324 2324
 MARKUP;
2325 2325
 
2326 2326
         $instance = new autoptimizeExtra();
2327
-        $actual = $instance->filter_optimize_images( $markup );
2328
-        $this->assertEquals( $expected, $actual );
2327
+        $actual = $instance->filter_optimize_images($markup);
2328
+        $this->assertEquals($expected, $actual);
2329 2329
     }
2330 2330
 
2331 2331
     /**
@@ -2348,8 +2348,8 @@  discard block
 block discarded – undo
2348 2348
 MARKUP;
2349 2349
 
2350 2350
         $instance = new autoptimizeExtra();
2351
-        $actual = $instance->filter_optimize_images( $markup );
2352
-        $this->assertEquals( $expected, $actual );
2351
+        $actual = $instance->filter_optimize_images($markup);
2352
+        $this->assertEquals($expected, $actual);
2353 2353
     }
2354 2354
 
2355 2355
     /**
@@ -2359,7 +2359,7 @@  discard block
 block discarded – undo
2359 2359
     {
2360 2360
         $actual = autoptimizeUtils::str_is_valid_regex($str);
2361 2361
 
2362
-        $this->assertEquals( $expected, $actual );
2362
+        $this->assertEquals($expected, $actual);
2363 2363
     }
2364 2364
 
2365 2365
     public function provider_str_is_valid_regex()
@@ -2375,11 +2375,11 @@  discard block
 block discarded – undo
2375 2375
     /**
2376 2376
      * @dataProvider provider_protocol_relative_tests
2377 2377
      */
2378
-    public function test_is_protocol_relative( $str, $expected )
2378
+    public function test_is_protocol_relative($str, $expected)
2379 2379
     {
2380
-        $actual = autoptimizeUtils::is_protocol_relative( $str );
2380
+        $actual = autoptimizeUtils::is_protocol_relative($str);
2381 2381
 
2382
-        $this->assertEquals( $expected, $actual );
2382
+        $this->assertEquals($expected, $actual);
2383 2383
     }
2384 2384
 
2385 2385
     public function provider_protocol_relative_tests()
@@ -2406,31 +2406,31 @@  discard block
 block discarded – undo
2406 2406
 
2407 2407
         $expected = 'img.centered,.aligncenter{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}';
2408 2408
 
2409
-        $instance = new autoptimizeStyles( $css );
2410
-        $minified = $instance->run_minifier_on( $css );
2409
+        $instance = new autoptimizeStyles($css);
2410
+        $minified = $instance->run_minifier_on($css);
2411 2411
 
2412
-        $this->assertEquals( $expected, $minified );
2412
+        $this->assertEquals($expected, $minified);
2413 2413
     }
2414 2414
 
2415 2415
     public function test_css_font_names_mangling()
2416 2416
     {
2417 2417
         // Properly quoted font names dont get mangled.
2418 2418
         $css      = 'h2{font-family:"Archivo Black"}';
2419
-        $instance = new autoptimizeStyles( $css );
2420
-        $actual   = $instance->run_minifier_on( $css );
2421
-        $this->assertEquals( $css, $actual );
2419
+        $instance = new autoptimizeStyles($css);
2420
+        $actual   = $instance->run_minifier_on($css);
2421
+        $this->assertEquals($css, $actual);
2422 2422
 
2423 2423
         // When not quoted, 'Black' used to become '#000', but not anymore... :)
2424 2424
         $css_unquoted = 'h2{font-family:Archivo Black;}';
2425 2425
         $expected     = 'h2{font-family:Archivo Black}';
2426
-        $instance     = new autoptimizeStyles( $css_unquoted );
2427
-        $actual       = $instance->run_minifier_on( $css_unquoted );
2428
-        $this->assertEquals( $expected, $actual );
2426
+        $instance     = new autoptimizeStyles($css_unquoted);
2427
+        $actual       = $instance->run_minifier_on($css_unquoted);
2428
+        $this->assertEquals($expected, $actual);
2429 2429
 
2430 2430
         $css_unquoted = 'h1{font:italic 1.2em Fira White,serif}';
2431
-        $instance     = new autoptimizeStyles( $css_unquoted );
2432
-        $actual       = $instance->run_minifier_on( $css_unquoted );
2433
-        $this->assertEquals( $css_unquoted, $actual );
2431
+        $instance     = new autoptimizeStyles($css_unquoted);
2432
+        $actual       = $instance->run_minifier_on($css_unquoted);
2433
+        $this->assertEquals($css_unquoted, $actual);
2434 2434
     }
2435 2435
 
2436 2436
     public function test_jsminphp_string_literal_minification()
@@ -2444,7 +2444,7 @@  discard block
 block discarded – undo
2444 2444
         $expected = '`line
2445 2445
 break`+`he  llo`;foo`hel( \'\');lo`;`he\nl\`lo`;(`he${one + two}`)';
2446 2446
 
2447
-        $actual = JSMin::minify( $js );
2448
-        $this->assertEquals( $expected, $actual );
2447
+        $actual = JSMin::minify($js);
2448
+        $this->assertEquals($expected, $actual);
2449 2449
     }
2450 2450
 }
Please login to merge, or discard this patch.