futtta / autoptimize

classes/autoptimizeCriticalCSSSettings.php

Spacing +113 added lines, -113 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS Options page.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,34 +17,34 @@ 
 
     public function __construct()
     {
-        $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
+        $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http);
         $this->run();
     }
 
     protected function enabled()
     {
-        return apply_filters( 'autoptimize_filter_show_criticalcss_tabs', true );
+        return apply_filters('autoptimize_filter_show_criticalcss_tabs', true);
     }
 
     public function run()
     {
-        if ( $this->enabled() ) {
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_critcss_tabs' ), 10, 1 );
-            add_action( 'admin_enqueue_scripts', array( $this, 'admin_assets' ) );
+        if ($this->enabled()) {
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_critcss_tabs'), 10, 1);
+            add_action('admin_enqueue_scripts', array($this, 'admin_assets'));
 
-            if ( $this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+            if ($this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'add_critcss_admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+                add_action('admin_menu', array($this, 'add_critcss_admin_menu'));
             }
 
             $criticalcss_ajax = new autoptimizeCriticalCSSSettingsAjax();
         }
     }
 
-    public function add_critcss_tabs( $in )
+    public function add_critcss_tabs($in)
     {
-        $in = array_merge( $in, array( 'ao_critcss' => '⚡ ' . __( 'Critical CSS', 'autoptimize' ) ) );
+        $in = array_merge($in, array('ao_critcss' => '⚡ '.__('Critical CSS', 'autoptimize')));
 
         return $in;
     }
@@ -52,66 +52,66 @@ 
     public function add_critcss_admin_menu()
     {
         // Register settings.
-        register_setting( 'ao_ccss_options_group', 'autoptimize_css_defer_inline' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rules' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_additional' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_queue' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_viewport' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_finclude' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rtimelimit' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_noptimize' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_debug' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_key' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_keyst' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_loggedin' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_forcepath' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_deferjquery' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_domain' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_unloadccss' );
+        register_setting('ao_ccss_options_group', 'autoptimize_css_defer_inline');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rules');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_additional');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_queue');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_viewport');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_finclude');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rtimelimit');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_noptimize');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_debug');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_key');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_keyst');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_loggedin');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_forcepath');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_deferjquery');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_domain');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_unloadccss');
 
         // And add submenu-page.
-        add_submenu_page( null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array( $this, 'ao_criticalcsssettings_page' ) );
+        add_submenu_page(null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array($this, 'ao_criticalcsssettings_page'));
     }
 
-    public function admin_assets( $hook ) {
+    public function admin_assets($hook) {
         // Return if plugin is not hooked.
-        if ( 'settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook ) {
+        if ('settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook) {
             return;
         }
 
         // Stylesheets to add.
-        wp_enqueue_style( 'wp-jquery-ui-dialog' );
-        wp_enqueue_style( 'ao-tablesorter', plugins_url( 'critcss-inc/css/ao-tablesorter/style.css', __FILE__ ) );
-        wp_enqueue_style( 'ao-ccss-admin-css', plugins_url( 'critcss-inc/css/admin_styles.css', __FILE__ ) );
+        wp_enqueue_style('wp-jquery-ui-dialog');
+        wp_enqueue_style('ao-tablesorter', plugins_url('critcss-inc/css/ao-tablesorter/style.css', __FILE__));
+        wp_enqueue_style('ao-ccss-admin-css', plugins_url('critcss-inc/css/admin_styles.css', __FILE__));
 
         // Scripts to add.
-        wp_enqueue_script( 'jquery-ui-dialog', array( 'jquery' ) );
-        wp_enqueue_script( 'md5', plugins_url( 'critcss-inc/js/md5.min.js', __FILE__ ), null, null, true );
-        wp_enqueue_script( 'tablesorter', plugins_url( 'critcss-inc/js/jquery.tablesorter.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'ao-ccss-admin-license', plugins_url( 'critcss-inc/js/admin_settings.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jquery-ui-dialog', array('jquery'));
+        wp_enqueue_script('md5', plugins_url('critcss-inc/js/md5.min.js', __FILE__), null, null, true);
+        wp_enqueue_script('tablesorter', plugins_url('critcss-inc/js/jquery.tablesorter.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('ao-ccss-admin-license', plugins_url('critcss-inc/js/admin_settings.js', __FILE__), array('jquery'), null, true);
     }
 
     public function ao_criticalcsssettings_page()
     {
         // these are not OO yet, simply require for now.
-        require_once( 'critcss-inc/admin_settings_rules.php' );
-        require_once( 'critcss-inc/admin_settings_queue.php' );
-        require_once( 'critcss-inc/admin_settings_key.php' );
-        require_once( 'critcss-inc/admin_settings_adv.php' );
-        require_once( 'critcss-inc/admin_settings_explain.php' );
+        require_once('critcss-inc/admin_settings_rules.php');
+        require_once('critcss-inc/admin_settings_queue.php');
+        require_once('critcss-inc/admin_settings_key.php');
+        require_once('critcss-inc/admin_settings_adv.php');
+        require_once('critcss-inc/admin_settings_explain.php');
 
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
         ?>
-        <script>document.title = "Autoptimize: <?php _e( 'Critical CSS', 'autoptimize' ); ?> " + document.title;</script>
+        <script>document.title = "Autoptimize: <?php _e('Critical CSS', 'autoptimize'); ?> " + document.title;</script>
         <div class="wrap">
             <div id="autoptimize_main">
                 <div id="ao_title_and_button">
-                    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+                    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
                 </div>
 
                 <?php
@@ -119,39 +119,39 @@ 
                 echo autoptimizeConfig::ao_admin_tabs();
 
                 // Make sure dir to write ao_ccss exists and is writable.
-                if ( ! is_dir( AO_CCSS_DIR ) ) {
-                    $mkdirresp = @mkdir( AO_CCSS_DIR, 0775, true ); // @codingStandardsIgnoreLine
+                if (!is_dir(AO_CCSS_DIR)) {
+                    $mkdirresp = @mkdir(AO_CCSS_DIR, 0775, true); // @codingStandardsIgnoreLine
                 } else {
                     $mkdirresp = true;
                 }
 
                 // Make sure our index.html is there.
-                if ( ! is_file( AO_CCSS_DIR . 'index.html' ) ) {
-                    $fileresp = file_put_contents( AO_CCSS_DIR . 'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' );
+                if (!is_file(AO_CCSS_DIR.'index.html')) {
+                    $fileresp = file_put_contents(AO_CCSS_DIR.'index.html', '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
                 } else {
                     $fileresp = true;
                 }
 
                 // Warn if we could not create those files.
-                if ( ( ! $mkdirresp ) || ( ! $fileresp ) ) {
+                if ((!$mkdirresp) || (!$fileresp)) {
                     ?>
                     <div class="notice-error notice"><p>
                     <?php
-                    _e( 'Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize' );
+                    _e('Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
                 }
 
                 // Check for "inline & defer CSS" being active in Autoptimize.
-                if ( ! empty( $ao_ccss_key ) && ! $ao_css_defer ) {
-                    if ( empty( $ao_ccss_keyst ) ) {
+                if (!empty($ao_ccss_key) && !$ao_css_defer) {
+                    if (empty($ao_ccss_keyst)) {
                         // no keystate so likely in activation-process of CCSS, let's enable "inline & defer CSS" immediately to make things easier!
-                        autoptimizeOptionWrapper::update_option( 'autoptimize_css_defer', 'on' );
+                        autoptimizeOptionWrapper::update_option('autoptimize_css_defer', 'on');
                         ?>
                         <div class="notice-info notice"><p>
                         <?php
-                        _e( "The \"Inline and Defer CSS\" option was activated to allow critical CSS to be used.", 'autoptimize' );
+                        _e("The \"Inline and Defer CSS\" option was activated to allow critical CSS to be used.", 'autoptimize');
                         ?>
                         </p></div>
                         <?php
@@ -160,7 +160,7 @@ 
                         ?>
                         <div class="notice-warning notice"><p>
                         <?php
-                        _e( "Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to ensure critical CSS is used on the front-end.", 'autoptimize' );
+                        _e("Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to ensure critical CSS is used on the front-end.", 'autoptimize');
                         ?>
                         </p></div>
                         <?php
@@ -168,11 +168,11 @@ 
                 }
 
                 // check if WordPress cron is disabled and warn if so.
-                if ( ! empty( $ao_ccss_key ) && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && PAnD::is_admin_notice_active( 'i-know-about-disable-cron-forever' ) ) {
+                if (!empty($ao_ccss_key) && defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && PAnD::is_admin_notice_active('i-know-about-disable-cron-forever')) {
                     ?>
                     <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -180,24 +180,24 @@ 
 
                 // warn if it looks as though the queue processing job looks isn't running
                 // but store result in transient as to not to have to go through 2 arrays each and every time.
-                $_warn_cron = get_transient( 'ao_ccss_cronwarning' );
-                if ( ! empty( $ao_ccss_key ) && false === $_warn_cron ) {
+                $_warn_cron = get_transient('ao_ccss_cronwarning');
+                if (!empty($ao_ccss_key) && false === $_warn_cron) {
                     $_jobs_all_new         = true;
-                    $_oldest_job_timestamp = microtime( true ); // now.
+                    $_oldest_job_timestamp = microtime(true); // now.
                     $_jobs_too_old         = true;
 
                     // go over queue array.
-                    if ( empty( $ao_ccss_queue ) ) {
+                    if (empty($ao_ccss_queue)) {
                         // no jobs, then no warning.
                         $_jobs_all_new = false;
                     } else {
-                        foreach ( $ao_ccss_queue as $job ) {
-                            if ( $job['jctime'] < $_oldest_job_timestamp ) {
+                        foreach ($ao_ccss_queue as $job) {
+                            if ($job['jctime'] < $_oldest_job_timestamp) {
                                 // we need to catch the oldest job's timestamp.
                                 $_oldest_job_timestamp = $job['jctime'];
                             }
 
-                            if ( 'NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid'] ) {
+                            if ('NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid']) {
                                 // we have a non-"NEW" job which is not our pending firstrun job either, break the loop.
                                 $_jobs_all_new = false;
                                 break;
@@ -206,11 +206,11 @@ 
                     }
 
                     // is the oldest job too old (4h)?
-                    if ( $_oldest_job_timestamp > microtime( true ) - 60 * 60 * 4 ) {
+                    if ($_oldest_job_timestamp > microtime(true) - 60*60*4) {
                         $_jobs_too_old = false;
                     }
 
-                    if ( $_jobs_all_new && ! $this->ao_ccss_has_autorules() && $_jobs_too_old ) {
+                    if ($_jobs_all_new && !$this->ao_ccss_has_autorules() && $_jobs_too_old) {
                         $_warn_cron            = 'on';
                         $_transient_multiplier = 1; // store for 1 hour.
                     } else {
@@ -218,35 +218,35 @@ 
                         $_transient_multiplier = 4; // store for 4 hours.
                     }
                     // and set transient.
-                    set_transient( 'ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier * HOUR_IN_SECONDS );
+                    set_transient('ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier*HOUR_IN_SECONDS);
                 }
 
-                if ( ! empty( $ao_ccss_key ) && 'on' == $_warn_cron && PAnD::is_admin_notice_active( 'i-know-about-cron-1' ) ) {
+                if (!empty($ao_ccss_key) && 'on' == $_warn_cron && PAnD::is_admin_notice_active('i-know-about-cron-1')) {
                     ?>
                     <div data-dismissible="i-know-about-cron-1" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
-                } elseif ( ! empty( $ao_ccss_key ) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && ! $this->ao_ccss_has_autorules() ) {
+                } elseif (!empty($ao_ccss_key) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && !$this->ao_ccss_has_autorules()) {
                     ?>
                     <div class="notice-success notice"><p>
                     <?php
-                    _e( 'Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize' );
+                    _e('Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize');
                     echo ' ';
-                    _e( 'In the meantime you might want to <strong>edit default rule CSS now</strong>, to avoid all CSS being inlined when no (applicable) rules are found.', 'autoptimize' );
+                    _e('In the meantime you might want to <strong>edit default rule CSS now</strong>, to avoid all CSS being inlined when no (applicable) rules are found.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
                 }
 
                 // warn if service is down.
-                if ( ! empty( $ao_ccss_key ) && ! empty( $ao_ccss_servicestatus ) && is_array( $ao_ccss_servicestatus ) && 'down' === $ao_ccss_servicestatus['critcss']['status'] ) {
+                if (!empty($ao_ccss_key) && !empty($ao_ccss_servicestatus) && is_array($ao_ccss_servicestatus) && 'down' === $ao_ccss_servicestatus['critcss']['status']) {
                     ?>
                     <div class="notice-warning notice"><p>
                     <?php
-                    _e( 'The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize' );
+                    _e('The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -254,12 +254,12 @@ 
 
                 // warn if too many rules (based on length of ao_ccss_rules option) as that might cause issues at e.g. wpengine
                 // see https://wpengine.com/support/database-optimization-best-practices/#Autoloaded_Data
-                $_raw_rules_length = strlen( get_option( 'autoptimize_ccss_rules', '') );
-                if ( $_raw_rules_length > apply_filters( 'autoptimize_ccss_rules_length_warning', 500000 ) ) {
+                $_raw_rules_length = strlen(get_option('autoptimize_ccss_rules', ''));
+                if ($_raw_rules_length > apply_filters('autoptimize_ccss_rules_length_warning', 500000)) {
                     ?>
                     <div class="notice-warning notice"><p>
                     <?php
-                    _e( 'It looks like the amount of Critical CSS rules is very high, it is recommended to reconfigure Autoptimize (e.g. by manually creating broader rules) to ensure less rules are created.', 'autoptimize' );
+                    _e('It looks like the amount of Critical CSS rules is very high, it is recommended to reconfigure Autoptimize (e.g. by manually creating broader rules) to ensure less rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -269,24 +269,24 @@ 
                 ?>
                 <form id="settings" method="post" action="options.php">
                     <?php
-                    settings_fields( 'ao_ccss_options_group' );
+                    settings_fields('ao_ccss_options_group');
 
                     // Get API key status.
-                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( true );
+                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(true);
 
-                    if ( $this->is_multisite_network_admin() ) {
+                    if ($this->is_multisite_network_admin()) {
                         ?>
                         <ul id="key-panel">
                             <li class="itemDetail">
                             <?php
                                 // translators: the placesholder is for a line of code in wp-config.php.
-                                echo sprintf( __( '<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize' ), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>' );
+                                echo sprintf(__('<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize'), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>');
                             ?>
                             </li>
                         </ul>
                         <?php
                     } else {
-                        if ( 'valid' == $key['status'] ) {
+                        if ('valid' == $key['status']) {
                             // If key status is valid, render other panels.
                             // Render rules section.
                             ao_ccss_render_rules();
@@ -303,23 +303,23 @@ 
                             $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
 
                             // Add hidden fields.
-                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='" . $ao_ccss_rules_raw . "'>";
-                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='" . $ao_ccss_queue_raw . "'>";
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="' . $viewport['w'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="' . $viewport['h'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="' . $ao_ccss_finclude . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_rtimelimit" value="' . $ao_ccss_rtimelimit . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="' . $ao_ccss_debug . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="' . $ao_ccss_noptimize . '">';
-                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="' . esc_attr( $ao_css_defer_inline ) . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="' . $ao_ccss_loggedin . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="' . $ao_ccss_forcepath . '">';
+                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='".$ao_ccss_rules_raw."'>";
+                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='".$ao_ccss_queue_raw."'>";
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="'.$viewport['w'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="'.$viewport['h'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="'.$ao_ccss_finclude.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_rtimelimit" value="'.$ao_ccss_rtimelimit.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="'.$ao_ccss_debug.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="'.$ao_ccss_noptimize.'">';
+                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="'.esc_attr($ao_css_defer_inline).'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="'.$ao_ccss_loggedin.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="'.$ao_ccss_forcepath.'">';
                         }
                         // Render key panel unconditionally.
-                        ao_ccss_render_key( $ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color'] );
+                        ao_ccss_render_key($ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color']);
                         ?>
                         <p class="submit left">
-                            <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" />
+                            <input type="submit" class="button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" />
                         </p>
                         <?php
                     }
@@ -337,31 +337,31 @@ 
                     });
                 }
                 </script>
-                <form id="importSettingsForm"<?php if ( $this->is_multisite_network_admin() ) { echo ' class="hidden"'; } ?>>
-                    <span id="exportSettings" class="button-secondary"><?php _e( 'Export Settings', 'autoptimize' ); ?></span>
-                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e( 'Import Settings', 'autoptimize' ); ?>" onclick="upload();return false;" />
+                <form id="importSettingsForm"<?php if ($this->is_multisite_network_admin()) { echo ' class="hidden"'; } ?>>
+                    <span id="exportSettings" class="button-secondary"><?php _e('Export Settings', 'autoptimize'); ?></span>
+                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e('Import Settings', 'autoptimize'); ?>" onclick="upload();return false;" />
                     <input class="button-secondary" id="settingsfile" name="settingsfile" type="file" />
                 </form>
                 <div id="importdialog"></div>
             </div><!-- /#autoptimize_main -->
         </div><!-- /#wrap -->
         <?php
-        if ( ! $this->is_multisite_network_admin() ) {
+        if (!$this->is_multisite_network_admin()) {
             // Include debug panel if debug mode is enable.
-            if ( $ao_ccss_debug ) {
+            if ($ao_ccss_debug) {
             ?>
                 <div id="debug">
                     <?php
                     // Include debug panel.
-                    include( 'critcss-inc/admin_settings_debug.php' );
+                    include('critcss-inc/admin_settings_debug.php');
                     ?>
                 </div><!-- /#debug -->
             <?php
             }
             echo '<script>';
-            include( 'critcss-inc/admin_settings_rules.js.php' );
-            include( 'critcss-inc/admin_settings_queue.js.php' );
-            include( 'critcss-inc/admin_settings_impexp.js.php' );
+            include('critcss-inc/admin_settings_rules.js.php');
+            include('critcss-inc/admin_settings_queue.js.php');
+            include('critcss-inc/admin_settings_impexp.js.php');
             echo '</script>';
         }
     }
@@ -369,19 +369,19 @@ 
     public static function ao_ccss_has_autorules() {
         static $_has_auto_rules = null;
 
-        if ( null === $_has_auto_rules ) {
+        if (null === $_has_auto_rules) {
             global $ao_ccss_rules;
             $_has_auto_rules = false;
-            if ( ! empty( $ao_ccss_rules ) ) {
-                foreach ( array( 'types', 'paths' ) as $_typat ) {
-                    foreach ( $ao_ccss_rules[ $_typat ] as $rule ) {
-                        if ( ! empty( $rule['hash'] ) ) {
+            if (!empty($ao_ccss_rules)) {
+                foreach (array('types', 'paths') as $_typat) {
+                    foreach ($ao_ccss_rules[$_typat] as $rule) {
+                        if (!empty($rule['hash'])) {
                             // we have at least one AUTO job, so all is fine.
                             $_has_auto_rules = true;
                             break;
                         }
                     }
-                    if ( $_has_auto_rules ) {
+                    if ($_has_auto_rules) {
                         break;
                     }
                 }
@@ -394,8 +394,8 @@ 
     public function is_multisite_network_admin() {
         static $_multisite_network_admin = null;
 
-        if ( null === $_multisite_network_admin ) {
-            if ( is_multisite() && is_network_admin() ) {
+        if (null === $_multisite_network_admin) {
+            if (is_multisite() && is_network_admin()) {
                 $_multisite_network_admin = true;
             } else {
                 $_multisite_network_admin = false;

tests/test-ao.php

Spacing +461 added lines, -461 removed lines

@@ -10,17 +10,17 @@ 
     protected $ao;
 
     protected static $flexible_url_parts_js = [
-        'default'          => 'wp-content/cache/autoptimize/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'custom'           => 'wp-content/c/ao/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite'        => 'wp-content/cache/autoptimize/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite_custom' => 'wp-content/c/ao/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'default'          => 'wp-content/cache/autoptimize/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'custom'           => 'wp-content/c/ao/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite'        => 'wp-content/cache/autoptimize/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite_custom' => 'wp-content/c/ao/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
     ];
 
     protected static $flexible_url_parts_css = [
-        'default'          => 'wp-content/cache/autoptimize/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'custom'           => 'wp-content/c/ao/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite'        => 'wp-content/cache/autoptimize/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite_custom' => 'wp-content/c/ao/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'default'          => 'wp-content/cache/autoptimize/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'custom'           => 'wp-content/c/ao/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite'        => 'wp-content/cache/autoptimize/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite_custom' => 'wp-content/c/ao/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
     ];
 
     protected function getAoStylesDefaultOptions()
@@ -28,17 +28,17 @@ 
         $conf = autoptimizeConfig::instance();
 
         return [
-            'aggregate'       => $conf->get( 'autoptimize_css_aggregate' ),
-            'justhead'        => $conf->get( 'autoptimize_css_justhead' ),
-            'datauris'        => $conf->get( 'autoptimize_css_datauris' ),
-            'defer'           => $conf->get( 'autoptimize_css_defer' ),
-            'defer_inline'    => $conf->get( 'autoptimize_css_defer_inline' ),
-            'inline'          => $conf->get( 'autoptimize_css_inline' ),
-            'css_exclude'     => $conf->get( 'autoptimize_css_exclude' ),
-            'cdn_url'         => $conf->get( 'autoptimize_cdn_url' ),
-            'include_inline'  => $conf->get( 'autoptimize_css_include_inline' ),
-            'nogooglefont'    => $conf->get( 'autoptimize_css_nogooglefont' ),
-            'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+            'aggregate'       => $conf->get('autoptimize_css_aggregate'),
+            'justhead'        => $conf->get('autoptimize_css_justhead'),
+            'datauris'        => $conf->get('autoptimize_css_datauris'),
+            'defer'           => $conf->get('autoptimize_css_defer'),
+            'defer_inline'    => $conf->get('autoptimize_css_defer_inline'),
+            'inline'          => $conf->get('autoptimize_css_inline'),
+            'css_exclude'     => $conf->get('autoptimize_css_exclude'),
+            'cdn_url'         => $conf->get('autoptimize_cdn_url'),
+            'include_inline'  => $conf->get('autoptimize_css_include_inline'),
+            'nogooglefont'    => $conf->get('autoptimize_css_nogooglefont'),
+            'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
         ];
     }
 
@@ -47,15 +47,15 @@ 
         $conf = autoptimizeConfig::instance();
 
         return [
-            'aggregate'           => $conf->get( 'autoptimize_js_aggregate' ),
-            'defer_not_aggregate' => $conf->get( 'autoptimize_js_defer_not_aggregate' ),
-            'justhead'            => $conf->get( 'autoptimize_js_justhead' ),
-            'forcehead'           => $conf->get( 'autoptimize_js_forcehead' ),
-            'trycatch'            => $conf->get( 'autoptimize_js_trycatch' ),
-            'js_exclude'          => $conf->get( 'autoptimize_js_exclude' ),
-            'cdn_url'             => $conf->get( 'autoptimize_cdn_url' ),
-            'include_inline'      => $conf->get( 'autoptimize_js_include_inline' ),
-            'minify_excluded'     => $conf->get( 'autoptimize_minify_excluded' ),
+            'aggregate'           => $conf->get('autoptimize_js_aggregate'),
+            'defer_not_aggregate' => $conf->get('autoptimize_js_defer_not_aggregate'),
+            'justhead'            => $conf->get('autoptimize_js_justhead'),
+            'forcehead'           => $conf->get('autoptimize_js_forcehead'),
+            'trycatch'            => $conf->get('autoptimize_js_trycatch'),
+            'js_exclude'          => $conf->get('autoptimize_js_exclude'),
+            'cdn_url'             => $conf->get('autoptimize_cdn_url'),
+            'include_inline'      => $conf->get('autoptimize_js_include_inline'),
+            'minify_excluded'     => $conf->get('autoptimize_minify_excluded'),
         ];
     }
 
@@ -65,35 +65,35 @@ 
     protected function get_urls()
     {
         static $site_url = null;
-        if ( null === $site_url ) {
+        if (null === $site_url) {
             $site_url = site_url();
         }
 
         static $cdn_url = null;
-        if ( null === $cdn_url ) {
-            $cdn_url = autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url' );
+        if (null === $cdn_url) {
+            $cdn_url = autoptimizeOptionWrapper::get_option('autoptimize_cdn_url');
         }
 
         static $imgopt_host = null;
-        if ( null === $imgopt_host ) {
+        if (null === $imgopt_host) {
             $optimizer   = new autoptimizeImages();
-            $imgopt_host = rtrim( $optimizer->get_imgopt_host(), '/' );
+            $imgopt_host = rtrim($optimizer->get_imgopt_host(), '/');
         }
 
         static $urls = [];
 
-        if ( empty( $urls ) ) {
+        if (empty($urls)) {
             $parts = autoptimizeUtils::get_ao_wp_site_url_parts();
             $urls  = [
                 'siteurl'    => $site_url,
-                'prsiteurl'  => '//' . str_replace( array( 'http://', 'https://' ), '', $site_url ),
-                'wwwsiteurl' => $parts['scheme'] . '://www.' . str_replace( 'www.', '', $parts['host'] ),
+                'prsiteurl'  => '//'.str_replace(array('http://', 'https://'), '', $site_url),
+                'wwwsiteurl' => $parts['scheme'].'://www.'.str_replace('www.', '', $parts['host']),
                 'cdnurl'     => $cdn_url,
                 'imgopthost' => $imgopt_host,
                 'subfolder'  => '',
             ];
 
-            if ( AO_TEST_SUBFOLDER_INSTALL ) {
+            if (AO_TEST_SUBFOLDER_INSTALL) {
                 $urls['subfolder'] = 'wordpress/';
             }
         }
@@ -106,7 +106,7 @@ 
      */
     public function setUp()
     {
-        $this->ao = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE );
+        $this->ao = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE);
 
         parent::setUp();
     }
@@ -125,8 +125,8 @@ 
             'autoptimize_filter_css_inlinesize',
             'autoptimize_filter_css_fonts_cdn',
         );
-        foreach ( $filter_tags as $filter_tag ) {
-            remove_all_filters( $filter_tag );
+        foreach ($filter_tags as $filter_tag) {
+            remove_all_filters($filter_tag);
         }
 
         parent::tearDown();
@@ -252,20 +252,20 @@ 
     protected function get_test_markup_output()
     {
         $key = 'default';
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
             $key = 'custom';
         }
 
-        $csspart = self::$flexible_url_parts_css[ $key ];
-        $jspart  = self::$flexible_url_parts_js[ $key ];
+        $csspart = self::$flexible_url_parts_css[$key];
+        $jspart  = self::$flexible_url_parts_js[$key];
 
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
+        if (AO_TEST_SUBFOLDER_INSTALL) {
             $csshash = '56398de576d59887e88e3011715250e0';
         }
 
         $urls      = $this->get_urls();
-            $siteurl   = $urls['siteurl'];
+            $siteurl = $urls['siteurl'];
         $cdnurl    = $urls['cdnurl'];
         $subfolder = $urls['subfolder'];
 
@@ -321,15 +321,15 @@ 
     protected function get_test_markup_output_ms()
     {
         $key = 'multisite';
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
             $key = 'multisite_custom';
         }
 
-        $csspart = self::$flexible_url_parts_css[ $key ];
-        $jspart  = self::$flexible_url_parts_js[ $key ];
+        $csspart = self::$flexible_url_parts_css[$key];
+        $jspart  = self::$flexible_url_parts_js[$key];
 
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
+        if (AO_TEST_SUBFOLDER_INSTALL) {
             $csshash = '56398de576d59887e88e3011715250e0';
         }
 
@@ -390,15 +390,15 @@ 
     protected function get_test_markup_output_inline_defer()
     {
         $key = 'default';
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
             $key = 'custom';
         }
 
-        $csspart = self::$flexible_url_parts_css[ $key ];
-        $jspart  = self::$flexible_url_parts_js[ $key ];
+        $csspart = self::$flexible_url_parts_css[$key];
+        $jspart  = self::$flexible_url_parts_js[$key];
 
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
+        if (AO_TEST_SUBFOLDER_INSTALL) {
             $csshash = '56398de576d59887e88e3011715250e0';
         }
 
@@ -459,15 +459,15 @@ 
     protected function get_test_markup_output_inline_defer_ms()
     {
         $key = 'multisite';
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
             $key = 'multisite_custom';
         }
 
-        $csspart = self::$flexible_url_parts_css[ $key ];
-        $jspart  = self::$flexible_url_parts_js[ $key ];
+        $csspart = self::$flexible_url_parts_css[$key];
+        $jspart  = self::$flexible_url_parts_js[$key];
 
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
+        if (AO_TEST_SUBFOLDER_INSTALL) {
             $csshash = '56398de576d59887e88e3011715250e0';
         }
 
@@ -528,11 +528,11 @@ 
     /**
      * @dataProvider provider_test_rewrite_markup_with_cdn
      */
-    function test_rewrite_markup_with_cdn( $input, $expected )
+    function test_rewrite_markup_with_cdn($input, $expected)
     {
-        $actual = $this->ao->end_buffering( $input );
+        $actual = $this->ao->end_buffering($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_test_rewrite_markup_with_cdn()
@@ -544,7 +544,7 @@ 
                 $this->get_test_markup(),
                 // Expected output.
                 // TODO/FIXME: This seemed like the fastest way to get MS crude test to pass...
-                ( is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output() ),
+                (is_multisite() ? $this->get_test_markup_output_ms() : $this->get_test_markup_output()),
             ),
 
         );
@@ -604,12 +604,12 @@ 
 }
 CSS;
 
-        $instance = new autoptimizeStyles( $css_in );
-        $instance->setOption( 'cdn_url', $cdnurl );
+        $instance = new autoptimizeStyles($css_in);
+        $instance->setOption('cdn_url', $cdnurl);
 
-        $css_actual = $instance->rewrite_assets( $css_in );
+        $css_actual = $instance->rewrite_assets($css_in);
 
-        $this->assertEquals( $css_expected, $css_actual );
+        $this->assertEquals($css_expected, $css_actual);
     }
 
     public function test_default_cssmin_minifier()
@@ -643,21 +643,21 @@ 
 .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')}
 CSS;
 
-        $instance = new autoptimizeStyles( $css );
-        $minified = $instance->run_minifier_on( $css );
+        $instance = new autoptimizeStyles($css);
+        $minified = $instance->run_minifier_on($css);
 
-        $this->assertEquals( $expected, $minified );
+        $this->assertEquals($expected, $minified);
     }
 
     /**
      * @dataProvider provider_test_should_aggregate_script_types
      */
-    public function test_should_aggregate_script_types( $input, $expected )
+    public function test_should_aggregate_script_types($input, $expected)
     {
-        $instance = new autoptimizeScripts( '' );
-        $actual   = $instance->should_aggregate( $input );
+        $instance = new autoptimizeScripts('');
+        $actual   = $instance->should_aggregate($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_test_should_aggregate_script_types()
@@ -719,11 +719,11 @@ 
     /**
      * @dataProvider provider_is_valid_buffer
      */
-    public function test_valid_buffers( $input, $expected )
+    public function test_valid_buffers($input, $expected)
     {
-        $actual = $this->ao->is_valid_buffer( $input );
+        $actual = $this->ao->is_valid_buffer($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_is_valid_buffer()
@@ -792,11 +792,11 @@ 
     /**
      * @dataProvider provider_is_amp_markup
      */
-    public function test_autoptimize_is_amp_markup( $input, $expected )
+    public function test_autoptimize_is_amp_markup($input, $expected)
     {
-        $actual = autoptimizeMain::is_amp_markup( $input );
+        $actual = autoptimizeMain::is_amp_markup($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_is_amp_markup()
@@ -827,31 +827,31 @@ 
     public function test_skips_buffering_when_ao_noptimize_filter_is_true()
     {
         // True => disable autoptimize.
-        add_filter( 'autoptimize_filter_noptimize', '__return_true' );
+        add_filter('autoptimize_filter_noptimize', '__return_true');
 
         // Buffering should not run due to the above filter.
         $expected = false;
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
+        $actual   = $this->ao->should_buffer($doing_tests = true);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_does_buffering_when_ao_noptimize_filter_is_false()
     {
         // False => disable noptimize, aka, run normally (weird, yes...).
-        add_filter( 'autoptimize_filter_noptimize', '__return_false' );
+        add_filter('autoptimize_filter_noptimize', '__return_false');
 
         // Buffering should run because of above.
         $expected = true;
-        $actual   = $this->ao->should_buffer( $doing_tests = true );
+        $actual   = $this->ao->should_buffer($doing_tests = true);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_ignores_ao_noptimize_qs_when_instructed()
     {
         // Should skip checking for the qs completely due to filter.
-        add_filter( 'autoptimize_filter_honor_qs_noptimize', '__return_false' );
+        add_filter('autoptimize_filter_honor_qs_noptimize', '__return_false');
 
         /**
          * The above should then result in the "current" value being `false`
@@ -862,23 +862,23 @@ 
          */
 
         $that = $this; // Makes it work on php 5.3!
-        add_filter( 'autoptimize_filter_noptimize', function ( $current_value ) use ( $that ) {
+        add_filter('autoptimize_filter_noptimize', function($current_value) use ($that) {
             $expected = false;
-            if ( defined( 'DONOTMINIFY' ) && DONOTMINIFY ) {
+            if (defined('DONOTMINIFY') && DONOTMINIFY) {
                 $expected = true;
             }
 
-            $that->assertEquals( $expected, $current_value );
+            $that->assertEquals($expected, $current_value);
         });
 
-        $this->ao->should_buffer( $doing_tests = true );
+        $this->ao->should_buffer($doing_tests = true);
     }
 
     public function test_wpengine_cache_flush()
     {
         // Creating a mock so that we can get past class_exists() and method_exists() checks present
         // in `autoptimizeCache::flushPageCache()`...
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
                 ->disableOriginalConstructor()->setMethods(
                     array(
                         'purge_varnish_cache',
@@ -887,9 +887,9 @@ 
                 ->getMock();
 
         $that = $this;
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
-            $expected_methods = array( 'purge_varnish_cache' );
-            $that->assertEquals( $methods, $expected_methods );
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
+            $expected_methods = array('purge_varnish_cache');
+            $that->assertEquals($methods, $expected_methods);
 
             return $methods;
         });
@@ -903,7 +903,7 @@ 
     public function test_wpengine_cache_flush_agressive()
     {
         // Creating a mock so that we can get past class_exists() and method_exists() checks `autoptimize_flush_pagecache()`...
-        $stub = $this->getMockBuilder( 'WpeCommon' )->disableAutoload()
+        $stub = $this->getMockBuilder('WpeCommon')->disableAutoload()
                 ->disableOriginalConstructor()->setMethods(
                     array(
                         'purge_varnish_cache',
@@ -913,19 +913,19 @@ 
                 )
                 ->getMock();
 
-        add_filter( 'autoptimize_flush_wpengine_aggressive', function() {
+        add_filter('autoptimize_flush_wpengine_aggressive', function() {
             return true;
         });
 
         $that = $this;
-        add_filter( 'autoptimize_flush_wpengine_methods', function( $methods ) use ( $that ) {
+        add_filter('autoptimize_flush_wpengine_methods', function($methods) use ($that) {
             $expected_methods = array(
                 'purge_varnish_cache',
                 'purge_memcached',
                 'clear_maxcdn_cache',
             );
 
-            $that->assertEquals( $methods, $expected_methods );
+            $that->assertEquals($methods, $expected_methods);
 
             return $methods;
         });
@@ -936,15 +936,15 @@ 
     /**
      * @dataProvider provider_test_url_replace_cdn
      */
-    public function test_url_replace_cdn( $cdn_url, $input, $expected )
+    public function test_url_replace_cdn($cdn_url, $input, $expected)
     {
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
+        $mock = $this->getMockBuilder('autoptimizeBase')
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
 
         $mock->cdn_url = $cdn_url;
-        $actual        = $mock->url_replace_cdn( $input );
-        $this->assertEquals( $expected, $actual );
+        $actual        = $mock->url_replace_cdn($input);
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_test_url_replace_cdn()
@@ -961,13 +961,13 @@ 
                 // CDN base url, url, expected result...
                 'http://cdn-test.example.org',
                 '/a.jpg',
-                'http://cdn-test.example.org/' . $subfolder . 'a.jpg',
+                'http://cdn-test.example.org/'.$subfolder.'a.jpg',
             ),
             // Full link with a matching AUTOPTIMIZE_WP_SITE_URL gets properly replaced...
             array(
                 'http://cdn-test.example.org',
-                $siteurl . '/wp-content/themes/something/example.svg',
-                'http://cdn-test.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
+                $siteurl.'/wp-content/themes/something/example.svg',
+                'http://cdn-test.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
             ),
             // Protocol-relative url with a "local" hostname that doesn't match example.org (AUTOPTIMIZE_WP_SITE_URL)...
             array(
@@ -978,59 +978,59 @@ 
             // www.example.org does not match example.org (AUTOPTIMIZE_WP_SITE_URL) so it's left alone...
             array(
                 'http://cdn-test.example.org',
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
-                $wwwsiteurl . '/wp-content/themes/something/example.svg',
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
+                $wwwsiteurl.'/wp-content/themes/something/example.svg',
             ),
             // SSL cdn url + host-relative link...
             array(
                 'https://cdn.example.org',
                 '/a.jpg',
-                'https://cdn.example.org/' . $subfolder . 'a.jpg',
+                'https://cdn.example.org/'.$subfolder.'a.jpg',
             ),
             // SSL cdn url + http site url that matches AUTOPTIMIZE_WP_SITE_URL is properly replaced...
             array(
                 'https://cdn.example.org',
-                $siteurl . '/wp-content/themes/something/example.svg',
-                'https://cdn.example.org/' . $subfolder . 'wp-content/themes/something/example.svg',
+                $siteurl.'/wp-content/themes/something/example.svg',
+                'https://cdn.example.org/'.$subfolder.'wp-content/themes/something/example.svg',
             ),
             // Protocol-relative cdn url given with protocol relative link that matches AUTOPTIMIZE_WP_SITE_URL host...
             array(
                 '//cdn.example.org',
-                $protorelativesiteurl . '/something.jpg',
-                '//cdn.example.org/' . $subfolder . 'something.jpg',
+                $protorelativesiteurl.'/something.jpg',
+                '//cdn.example.org/'.$subfolder.'something.jpg',
             ),
             // Protocol-relative cdn url given a http link that matches AUTOPTIMIZE_WP_SITE_URL host...
             array(
                 '//cdn.example.org',
-                $siteurl . '/something.png',
-                '//cdn.example.org/' . $subfolder . 'something.png',
+                $siteurl.'/something.png',
+                '//cdn.example.org/'.$subfolder.'something.png',
             ),
             // Protocol-relative cdn url with a host-relative link...
             array(
                 '//cdn.example.org',
                 '/a.jpg',
-                '//cdn.example.org/' . $subfolder . 'a.jpg',
+                '//cdn.example.org/'.$subfolder.'a.jpg',
             ),
             // Testing cdn urls with an explicit port number...
             array(
                 'http://cdn.com:8080',
                 '/a.jpg',
-                'http://cdn.com:8080/' . $subfolder . 'a.jpg',
+                'http://cdn.com:8080/'.$subfolder.'a.jpg',
             ),
             array(
                 '//cdn.com:4433',
                 '/a.jpg',
-                '//cdn.com:4433/' . $subfolder . 'a.jpg',
+                '//cdn.com:4433/'.$subfolder.'a.jpg',
             ),
             array(
                 '//cdn.com:4433',
-                $siteurl . '/something.jpg',
-                '//cdn.com:4433/' . $subfolder . 'something.jpg',
+                $siteurl.'/something.jpg',
+                '//cdn.com:4433/'.$subfolder.'something.jpg',
             ),
             array(
                 '//cdn.com:1234',
-                $protorelativesiteurl . '/something.jpg',
-                '//cdn.com:1234/' . $subfolder . 'something.jpg',
+                $protorelativesiteurl.'/something.jpg',
+                '//cdn.com:1234/'.$subfolder.'something.jpg',
             ),
             // Relative links should not be touched by url_replace_cdn()...
             array(
@@ -1055,8 +1055,8 @@ 
             // even though they are really strange...
             array(
                 $siteurl, // example.org or http://localhost or http://localhost/wordpress
-                $siteurl . '/something.jpg',
-                $siteurl . '/something.jpg',
+                $siteurl.'/something.jpg',
+                $siteurl.'/something.jpg',
             ),
             // These shouldn't really be changed, or even if replacements do
             // happen, they shouldn't be destructive...
@@ -1095,31 +1095,31 @@ 
         $test_link = '/a.jpg';
         $cdn_url   = '//cdn.example.org';
 
-        $with_ssl = function( $cdn ) {
+        $with_ssl = function($cdn) {
             return '';
         };
         $expected_with_ssl = '/a.jpg';
 
-        $without_ssl = function( $cdn ) {
+        $without_ssl = function($cdn) {
             return $cdn;
         };
-        $expected_without_ssl = '//cdn.example.org/' . $sub . 'a.jpg';
+        $expected_without_ssl = '//cdn.example.org/'.$sub.'a.jpg';
 
         // With a filter that returns something considered "empty", cdn replacement shouldn't occur...
-        add_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
+        add_filter('autoptimize_filter_base_cdnurl', $with_ssl);
+        $mock = $this->getMockBuilder('autoptimizeBase')
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
 
         $mock->cdn_url   = $cdn_url;
-        $actual_with_ssl = $mock->url_replace_cdn( $test_link );
-        $this->assertEquals( $expected_with_ssl, $actual_with_ssl );
-        remove_filter( 'autoptimize_filter_base_cdnurl', $with_ssl );
+        $actual_with_ssl = $mock->url_replace_cdn($test_link);
+        $this->assertEquals($expected_with_ssl, $actual_with_ssl);
+        remove_filter('autoptimize_filter_base_cdnurl', $with_ssl);
 
         // With a filter that returns an actual cdn url, cdn replacement should occur.
-        add_filter( 'autoptimize_filter_base_cdnurl', $without_ssl );
-        $actual_without_ssl = $mock->url_replace_cdn( $test_link );
-        $this->assertEquals( $expected_without_ssl, $actual_without_ssl );
+        add_filter('autoptimize_filter_base_cdnurl', $without_ssl);
+        $actual_without_ssl = $mock->url_replace_cdn($test_link);
+        $this->assertEquals($expected_without_ssl, $actual_without_ssl);
     }
 
     public function provider_cssmin_issues()
@@ -1158,11 +1158,11 @@ 
     /**
      * @dataProvider provider_cssmin_issues
      */
-    public function test_cssmin_issues( $input, $expected )
+    public function test_cssmin_issues($input, $expected)
     {
-        $minifier = new autoptimizeCSSmin( false ); // No need to raise limits for now.
-        $actual   = $minifier->run( $input );
-        $this->assertEquals( $expected, $actual );
+        $minifier = new autoptimizeCSSmin(false); // No need to raise limits for now.
+        $actual   = $minifier->run($input);
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_getpath()
@@ -1187,12 +1187,12 @@ 
             // This file comes with core, so should exist...
             array(
                 '/wp-includes/js/jquery/jquery.js',
-                WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.js',
+                WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.js',
             ),
             // This file comes with core as of 5.6, so should exist...
             array(
                 '/wp-includes/js/jquery/jquery.min.js',
-                WP_ROOT_DIR . '/wp-includes/js/jquery/jquery.min.js',
+                WP_ROOT_DIR.'/wp-includes/js/jquery/jquery.min.js',
             ),
             // Empty $url should return false.
             array(
@@ -1217,12 +1217,12 @@ 
     /**
      * @dataProvider provider_getpath
      */
-    public function test_getpath( $input, $expected )
+    public function test_getpath($input, $expected)
     {
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )->disableOriginalConstructor()->getMockForAbstractClass();
+        $mock = $this->getMockBuilder('autoptimizeBase')->disableOriginalConstructor()->getMockForAbstractClass();
 
-        $actual = $mock->getpath( $input );
-        $this->assertEquals( $expected, $actual );
+        $actual = $mock->getpath($input);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -1236,7 +1236,7 @@ 
 
         $protorelativesiteurl = $urls['prsiteurl'];
 
-        $css_orig     = <<<CSS
+        $css_orig = <<<CSS
 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")}
 section.clipped.clippedTop {clip-path:url("#clipPolygonTop")}
 section.clipped.clippedBottom {clip-path:url("#clipPolygonBottom")}
@@ -1249,13 +1249,13 @@ 
 .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);}
 CSS;
 
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
-        $this->assertEquals( $css_expected, $fixurls_result );
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
+        $this->assertEquals($css_expected, $fixurls_result);
     }
 
     public function test_background_datauri_sprites_with_fixurls()
     {
-        $css_orig     = <<<CSS
+        $css_orig = <<<CSS
 .shadow { background:url(img/1x1.png) top center; }
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1307,27 +1307,27 @@ 
 CSS;
 
         // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri.
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
             return true;
-        }, 10, 2 );
+        }, 10, 2);
 
         // For test purposes, ALL images in the css are being inline with a 1x1 trans png string/datauri.
-        add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) {
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
             $head = 'data:image/png;base64,';
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 
-            $result['full']       = $head . $data;
+            $result['full']       = $head.$data;
             $result['base64data'] = $data;
             return $result;
-        }, 10, 2 );
+        }, 10, 2);
 
-        $instance = new autoptimizeStyles( $css_orig );
-        $instance->setOption( 'datauris', true );
+        $instance = new autoptimizeStyles($css_orig);
+        $instance->setOption('datauris', true);
 
-        $fixurls_result = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $css_orig );
-        $css_actual     = $instance->rewrite_assets( $fixurls_result );
+        $fixurls_result = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $css_orig);
+        $css_actual     = $instance->rewrite_assets($fixurls_result);
 
-        $this->assertEquals( $css_expected, $css_actual );
+        $this->assertEquals($css_expected, $css_actual);
     }
 
     /**
@@ -1347,7 +1347,7 @@ 
      */
     public function test_background_datauri_sprites_without_fixurls()
     {
-        $css_orig     = <<<CSS
+        $css_orig = <<<CSS
 .shadow { background:url(img/1x1.png) top center; }
 .shadow1 { background-image:url(img/1x1.png) 0 -767px repeat-x; }
 .shadow2 {background:url(img/1x1.png) top center}
@@ -1391,24 +1391,24 @@ 
 CSS;
 
         // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri.
-        add_filter( 'autoptimize_filter_css_is_datauri_candidate', function( $is_candidate, $path ) {
+        add_filter('autoptimize_filter_css_is_datauri_candidate', function($is_candidate, $path) {
             return true;
-        }, 10, 2 );
+        }, 10, 2);
 
         // For test purposes, ALL images in the css are being inlined with a 1x1 trans png string/datauri.
-        add_filter( 'autoptimize_filter_css_datauri_image', function( $base64array, $path ) {
+        add_filter('autoptimize_filter_css_datauri_image', function($base64array, $path) {
             $head = 'data:image/png;base64,';
             $data = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
 
-            $result['full']       = $head . $data;
+            $result['full']       = $head.$data;
             $result['base64data'] = $data;
             return $result;
-        }, 10, 2 );
+        }, 10, 2);
 
-        $instance = new autoptimizeStyles( $css_orig );
-        $instance->setOption( 'datauris', true );
-        $css_actual = $instance->rewrite_assets( $css_orig );
-        $this->assertEquals( $css_expected, $css_actual );
+        $instance = new autoptimizeStyles($css_orig);
+        $instance->setOption('datauris', true);
+        $css_actual = $instance->rewrite_assets($css_orig);
+        $this->assertEquals($css_expected, $css_actual);
     }
 
     /**
@@ -1528,12 +1528,12 @@ 
 CSS;
 
         // Test with fonts pointed to the CDN + cdn option is set.
-        add_filter( 'autoptimize_filter_css_fonts_cdn', '__return_true' );
-        $instance = new autoptimizeStyles( $css_in );
-        $instance->setOption( 'cdn_url', $cdnurl );
-        $css_actual_fonts_cdn = $instance->rewrite_assets( $css_in );
+        add_filter('autoptimize_filter_css_fonts_cdn', '__return_true');
+        $instance = new autoptimizeStyles($css_in);
+        $instance->setOption('cdn_url', $cdnurl);
+        $css_actual_fonts_cdn = $instance->rewrite_assets($css_in);
 
-        $this->assertEquals( $css_expected_fonts_cdn, $css_actual_fonts_cdn );
+        $this->assertEquals($css_expected_fonts_cdn, $css_actual_fonts_cdn);
     }
 
     /**
@@ -1649,10 +1649,10 @@ 
 }
 CSS;
         // Test without moving fonts to CDN, but cdn option is set.
-        $instance = new autoptimizeStyles( $css_in );
-        $instance->setOption( 'cdn_url', $urls['cdnurl'] );
-        $css_actual = $instance->rewrite_assets( $css_in );
-        $this->assertEquals( $css_expected, $css_actual );
+        $instance = new autoptimizeStyles($css_in);
+        $instance->setOption('cdn_url', $urls['cdnurl']);
+        $css_actual = $instance->rewrite_assets($css_in);
+        $this->assertEquals($css_expected, $css_actual);
     }
 
     public function test_assets_regex_replaces_multi_bg_images()
@@ -1673,16 +1673,16 @@ 
 }
 CSS;
 
-        $instance = new autoptimizeStyles( $in );
-        $instance->setOption( 'cdn_url', $cdnurl );
-        $actual = $instance->rewrite_assets( $in );
+        $instance = new autoptimizeStyles($in);
+        $instance->setOption('cdn_url', $cdnurl);
+        $actual = $instance->rewrite_assets($in);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_at_supports_spacing_issue_110()
     {
-        $in       = <<<CSS
+        $in = <<<CSS
 @supports (-webkit-filter: blur(3px)) or (filter: blur(3px)) {
     .blur {
         filter:blur(3px);
@@ -1696,10 +1696,10 @@ 
 @supports (-webkit-filter:blur(3px)) or (filter:blur(3px)){.blur{filter:blur(3px)}}@supports((position:-webkit-sticky) or (position:sticky)){.sticky{position:sticky}}
 CSS;
 
-        $instance = new autoptimizeStyles( $in );
-        $actual   = $instance->run_minifier_on( $in );
+        $instance = new autoptimizeStyles($in);
+        $actual   = $instance->run_minifier_on($in);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_css_import_semicolon_url_issue_122()
@@ -1715,18 +1715,18 @@ 
 </style>
 HTML;
 
-        $expected = '<style 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-->';
+        $expected = '<style 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-->';
 
         $options = [
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
         ];
 
-        $instance = new autoptimizeStyles( $in );
-        $instance->read( $options['autoptimizeStyles'] );
+        $instance = new autoptimizeStyles($in);
+        $instance->read($options['autoptimizeStyles']);
         $instance->minify();
         $instance->cache();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_fixurls_with_at_imports_and_media_queries()
@@ -1736,10 +1736,10 @@ 
         $subfolder = $urls['subfolder'];
 
         $in  = '@import "foo.css"; @import "bar.css" (orientation:landscape);';
-        $exp = '@import url(' . $prsiteurl . '/wp-content/themes/my-theme/foo.css); @import url(' . $prsiteurl . '/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
+        $exp = '@import url('.$prsiteurl.'/wp-content/themes/my-theme/foo.css); @import url('.$prsiteurl.'/wp-content/themes/my-theme/bar.css) (orientation:landscape);';
 
-        $actual = autoptimizeStyles::fixurls( ABSPATH . 'wp-content/themes/my-theme/style.css', $in );
-        $this->assertEquals( $exp, $actual );
+        $actual = autoptimizeStyles::fixurls(ABSPATH.'wp-content/themes/my-theme/style.css', $in);
+        $this->assertEquals($exp, $actual);
     }
 
     public function test_aostyles_at_imports_with_media_queries()
@@ -1754,43 +1754,43 @@ 
 </style>
 HTML;
 
-        $expected = '<style media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css);@import url(' . $cdnurl . '/' . $sub . 'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
+        $expected = '<style media="all">@import url('.$cdnurl.'/'.$sub.'foo.css);@import url('.$cdnurl.'/'.$sub.'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
 
         $options = [
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
         ];
 
-        $instance = new autoptimizeStyles( $in );
-        $instance->read( $options['autoptimizeStyles'] );
+        $instance = new autoptimizeStyles($in);
+        $instance->read($options['autoptimizeStyles']);
         $instance->minify();
         $instance->cache();
 
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_cache_size_checker_hooked_by_default()
     {
-        $this->assertNotEmpty( autoptimizeCacheChecker::SCHEDULE_HOOK );
+        $this->assertNotEmpty(autoptimizeCacheChecker::SCHEDULE_HOOK);
 
         // No schedule, because it's only added when is_admin() is true.
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
 
         // Proving that setup() sets the schedule as needed.
         $checker = new autoptimizeCacheChecker();
         $checker->setup();
-        $this->assertEquals( 'twicedaily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals('twicedaily', wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
     }
 
     public function test_cache_size_checker_disabled_with_filter()
     {
-        add_filter( 'autoptimize_filter_cachecheck_do', '__return_false' );
+        add_filter('autoptimize_filter_cachecheck_do', '__return_false');
 
         $checker = new autoptimizeCacheChecker();
         $checker->setup();
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
 
-        remove_all_filters( 'autoptimize_filter_cachecheck_do' );
+        remove_all_filters('autoptimize_filter_cachecheck_do');
     }
 
     public function test_is_start_buffering_hooked_properly()
@@ -1803,12 +1803,12 @@ 
          * https://www.theaveragedev.com/mocking-constants-in-tests/.
          */
 
-        if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
+        if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
             $this->assertEquals(
                 autoptimizeMain::INIT_EARLIER_PRIORITY,
-                has_action( 'init', array( $instance, 'start_buffering' ) )
+                has_action('init', array($instance, 'start_buffering'))
             );
-            $this->assertTrue( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) );
+            $this->assertTrue(!defined('AUTOPTIMIZE_HOOK_INTO'));
         }
 
         /*
@@ -1825,18 +1825,18 @@ 
 
     public function test_inline_and_defer_markup()
     {
-        add_filter( 'autoptimize_filter_css_defer', '__return_true' );
-        add_filter( 'autoptimize_filter_css_defer_inline', '__return_true' );
+        add_filter('autoptimize_filter_css_defer', '__return_true');
+        add_filter('autoptimize_filter_css_defer_inline', '__return_true');
 
-        $actual = $this->ao->end_buffering( $this->get_test_markup() );
-        if ( is_multisite() ) {
-            $this->assertEquals( $this->get_test_markup_output_inline_defer_ms(), $actual );
+        $actual = $this->ao->end_buffering($this->get_test_markup());
+        if (is_multisite()) {
+            $this->assertEquals($this->get_test_markup_output_inline_defer_ms(), $actual);
         } else {
-            $this->assertEquals( $this->get_test_markup_output_inline_defer(), $actual );
+            $this->assertEquals($this->get_test_markup_output_inline_defer(), $actual);
         }
 
-        remove_all_filters( 'autoptimize_filter_css_defer' );
-        remove_all_filters( 'autoptimize_filter_css_defer_inline' );
+        remove_all_filters('autoptimize_filter_css_defer');
+        remove_all_filters('autoptimize_filter_css_defer_inline');
     }
 
     public function test_js_aggregation_decision_and_dontaggregate_filter()
@@ -1844,47 +1844,47 @@ 
         $opts = $this->getAoScriptsDefaultOptions();
 
         // Aggregating: true by default.
-        $scripts = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertTrue( $scripts->aggregating() );
+        $scripts = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertTrue($scripts->aggregating());
 
         // Aggregating: option=true (dontaggregate=false by default).
         $opts['aggregate'] = true;
-        $scripts           = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertTrue( $scripts->aggregating() );
+        $scripts           = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertTrue($scripts->aggregating());
 
         // Aggregating: option=true, dontaggregate=false explicit.
         $opts['aggregate'] = true;
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
-        $scripts = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertTrue( $scripts->aggregating() );
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
+        $scripts = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertTrue($scripts->aggregating());
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
 
         // Not aggregating: option=true, dontaggregate=true.
         $opts['aggregate'] = true;
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
-        $scripts = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertFalse( $scripts->aggregating() );
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
+        $scripts = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertFalse($scripts->aggregating());
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
 
         // Not aggregating: option=false, dontaggregate=false.
         $opts['aggregate'] = false;
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_false' );
-        $scripts = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertFalse( $scripts->aggregating() );
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_false');
+        $scripts = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertFalse($scripts->aggregating());
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
 
         // Not aggregating: option=false, dontaggregate=true.
         $opts['aggregate'] = false;
-        add_filter( 'autoptimize_filter_js_dontaggregate', '__return_true' );
-        $scripts = new autoptimizeScripts( '' );
-        $scripts->read( $opts );
-        $this->assertFalse( $scripts->aggregating() );
-        remove_all_filters( 'autoptimize_filter_js_dontaggregate' );
+        add_filter('autoptimize_filter_js_dontaggregate', '__return_true');
+        $scripts = new autoptimizeScripts('');
+        $scripts->read($opts);
+        $this->assertFalse($scripts->aggregating());
+        remove_all_filters('autoptimize_filter_js_dontaggregate');
     }
 
     public function test_css_aggregation_decision_and_dontaggregate_filter()
@@ -1892,78 +1892,78 @@ 
         $opts = $this->getAoStylesDefaultOptions();
 
         // Aggregating: true by default.
-        $styles = new autoptimizeStyles( '' );
-        $this->assertTrue( $styles->aggregating() );
+        $styles = new autoptimizeStyles('');
+        $this->assertTrue($styles->aggregating());
 
         // Aggregating: option=true (dontaggregate=false by default).
         $opts['aggregate'] = true;
-        $styles            = new autoptimizeStyles( '' );
-        $styles->read( $opts );
-        $this->assertTrue( $styles->aggregating() );
+        $styles            = new autoptimizeStyles('');
+        $styles->read($opts);
+        $this->assertTrue($styles->aggregating());
 
         // Aggregating: option=true, dontaggregate=false explicit.
         $opts['aggregate'] = true;
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
-        $styles = new autoptimizeStyles( '' );
-        $styles->read( $opts );
-        $this->assertTrue( $styles->aggregating() );
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
+        $styles = new autoptimizeStyles('');
+        $styles->read($opts);
+        $this->assertTrue($styles->aggregating());
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
 
         // Not aggregating: option=true, dontaggregate=true.
         $opts['aggregate'] = true;
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
-        $styles = new autoptimizeStyles( '' );
-        $styles->read( $opts );
-        $this->assertFalse( $styles->aggregating() );
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
+        $styles = new autoptimizeStyles('');
+        $styles->read($opts);
+        $this->assertFalse($styles->aggregating());
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
 
         // Not aggregating: option=false, dontaggregate=false.
         $opts['aggregate'] = false;
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_false' );
-        $styles = new autoptimizeStyles( '' );
-        $styles->read( $opts );
-        $this->assertFalse( $styles->aggregating() );
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_false');
+        $styles = new autoptimizeStyles('');
+        $styles->read($opts);
+        $this->assertFalse($styles->aggregating());
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
 
         // Not aggregating: option=false, dontaggregate=true.
         $opts['aggregate'] = false;
-        add_filter( 'autoptimize_filter_css_dontaggregate', '__return_true' );
-        $styles = new autoptimizeStyles( '' );
-        $styles->read( $opts );
-        $this->assertFalse( $styles->aggregating() );
-        remove_all_filters( 'autoptimize_filter_css_dontaggregate' );
+        add_filter('autoptimize_filter_css_dontaggregate', '__return_true');
+        $styles = new autoptimizeStyles('');
+        $styles->read($opts);
+        $this->assertFalse($styles->aggregating());
+        remove_all_filters('autoptimize_filter_css_dontaggregate');
     }
 
     public function test_css_minify_single_with_cdning()
     {
-        $pathname = dirname( __FILE__ ) . '/fixtures/minify-single.css';
+        $pathname = dirname(__FILE__).'/fixtures/minify-single.css';
         $opts     = $this->getAoStylesDefaultOptions();
-        $styles   = new autoptimizeStyles( '' );
-        $styles->read( $opts );
+        $styles   = new autoptimizeStyles('');
+        $styles->read($opts);
 
-        $url = $styles->minify_single( $pathname, $cache_miss = true );
+        $url = $styles->minify_single($pathname, $cache_miss = true);
 
         // Minified url filename + its pointed to cdn.
-        $this->assertContains( AUTOPTIMIZE_CACHE_CHILD_DIR, $url );
-        $this->assertContains( '/autoptimize_single_', $url );
-        $this->assertContains( $styles->cdn_url, $url );
+        $this->assertContains(AUTOPTIMIZE_CACHE_CHILD_DIR, $url);
+        $this->assertContains('/autoptimize_single_', $url);
+        $this->assertContains($styles->cdn_url, $url);
 
         // Actual minified css contents are minified and cdn-ed.
-        $path     = $styles->getpath( $url );
-        $contents = file_get_contents( $path );
-        $this->assertContains( $styles->cdn_url, $contents );
-        $this->assertContains( '.bg{background:url(' . $styles->cdn_url, $contents );
+        $path     = $styles->getpath($url);
+        $contents = file_get_contents($path);
+        $this->assertContains($styles->cdn_url, $contents);
+        $this->assertContains('.bg{background:url('.$styles->cdn_url, $contents);
     }
 
     public function test_ao_partners_instantiation_without_explicit_include()
     {
         $partners = new autoptimizePartners();
-        $this->assertTrue( $partners instanceof autoptimizePartners );
+        $this->assertTrue($partners instanceof autoptimizePartners);
     }
 
     public function test_html_minify_keep_html_comments_inside_script_blocks()
     {
-        $markup   = <<<MARKUP
+        $markup = <<<MARKUP
 <script>
 <!-- End Support AJAX add to cart -->
 var a = "b";
@@ -1993,23 +1993,23 @@ 
             ],
         ];
 
-        $instance = new autoptimizeHTML( $markup );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
 
-        $instance = new autoptimizeHTML( $markup2 );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup2);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual2 = $instance->getcontent();
-        $this->assertEquals( $expected2, $actual2 );
+        $this->assertEquals($expected2, $actual2);
     }
 
     public function test_html_minify_remove_html_comments_inside_script_blocks()
     {
         // Default case, html comments removed (keepcomments = false).
-        $markup1   = <<<MARKUP
+        $markup1 = <<<MARKUP
 <script>
 var a = "b";
 <!-- End Support AJAX add to cart -->
@@ -2020,7 +2020,7 @@ 
 <!-- End Support AJAX add to cart</script>
 MARKUP;
 
-        $markup2   = <<<MARKUP
+        $markup2 = <<<MARKUP
 <script>
 <!-- End Support AJAX add to cart -->
 var a = "b";
@@ -2037,17 +2037,17 @@ 
             ],
         ];
 
-        $instance = new autoptimizeHTML( $markup1 );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup1);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected1, $actual );
+        $this->assertEquals($expected1, $actual);
 
-        $instance = new autoptimizeHTML( $markup2 );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup2);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual2 = $instance->getcontent();
-        $this->assertEquals( $expected2, $actual2 );
+        $this->assertEquals($expected2, $actual2);
     }
 
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern()
@@ -2071,11 +2071,11 @@ 
             ],
         ];
 
-        $instance = new autoptimizeHTML( $markup );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_html_minify_html_comments_inside_script_blocks_old_school_pattern_untouched()
@@ -2100,49 +2100,49 @@ 
             ],
         ];
 
-        $instance = new autoptimizeHTML( $markup );
-        $instance->read( $options['autoptimizeHTML'] );
+        $instance = new autoptimizeHTML($markup);
+        $instance->read($options['autoptimizeHTML']);
         $instance->minify();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_utils_mbstring_availabilty_overriding()
     {
         $orig     = autoptimizeUtils::mbstring_available();
-        $opposite = ! $orig;
+        $opposite = !$orig;
 
-        $this->assertSame( $orig, autoptimizeUtils::mbstring_available() );
+        $this->assertSame($orig, autoptimizeUtils::mbstring_available());
         // Override works...
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available( $opposite ) );
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available($opposite));
         // And override remains cached as the last version.
-        $this->assertSame( $opposite, autoptimizeUtils::mbstring_available() );
+        $this->assertSame($opposite, autoptimizeUtils::mbstring_available());
     }
 
     public function test_utils_mbstring_basics()
     {
         // Turn on mbstring usage.
-        autoptimizeUtils::mbstring_available( true );
+        autoptimizeUtils::mbstring_available(true);
 
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'ASCII' ) );
-        $this->assertSame( 2, autoptimizeUtils::strlen( "\x00\xFF", 'CP850' ) );
-        $this->assertSame( 3, autoptimizeUtils::strlen( '한국어' ) );
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'ASCII'));
+        $this->assertSame(2, autoptimizeUtils::strlen("\x00\xFF", 'CP850'));
+        $this->assertSame(3, autoptimizeUtils::strlen('한국어'));
 
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', '' ) );
-        $this->assertFalse( @autoptimizeUtils::strpos( 'abc', 'a', -1 ) );
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'd' ) );
-        $this->assertFalse( autoptimizeUtils::strpos( 'abc', 'a', 3 ) );
-        $this->assertSame( 1, autoptimizeUtils::strpos( '한국어', '국' ) );
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', ''));
+        $this->assertFalse(@autoptimizeUtils::strpos('abc', 'a', -1));
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'd'));
+        $this->assertFalse(autoptimizeUtils::strpos('abc', 'a', 3));
+        $this->assertSame(1, autoptimizeUtils::strpos('한국어', '국'));
     }
 
     /**
      * @dataProvider provider_utils_substr_replace
      */
-    function test_utils_substr_replace_basics_mbstring( $s, $repl, $start, $len, $expected )
+    function test_utils_substr_replace_basics_mbstring($s, $repl, $start, $len, $expected)
     {
         // Force mbstring code path...
-        autoptimizeUtils::mbstring_available( true );
-        $this->assertEquals( $expected, autoptimizeUtils::substr_replace( $s, $repl, $start, $len ) );
+        autoptimizeUtils::mbstring_available(true);
+        $this->assertEquals($expected, autoptimizeUtils::substr_replace($s, $repl, $start, $len));
     }
 
     public function provider_utils_substr_replace()
@@ -2184,48 +2184,48 @@ 
 
     function test_mb_substr_replace_with_ascii_input_string()
     {
-        autoptimizeUtils::mbstring_available( false );
+        autoptimizeUtils::mbstring_available(false);
 
         $str = 'Ascii';
 
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
     }
 
     function test_mb_substr_replace_with_utf8_input_string()
     {
-        autoptimizeUtils::mbstring_available( true );
+        autoptimizeUtils::mbstring_available(true);
 
         $str = 'âønæë';
 
-        $this->assertSame( 'âñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
-        $this->assertSame( 'ñnæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
-        $this->assertSame( 'âøñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
-        $this->assertSame( 'âøz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
-        $this->assertSame( 'âñæë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
+        $this->assertSame('âñ', autoptimizeUtils::substr_replace($str, 'ñ', 1)); // No length.
+        $this->assertSame('ñnæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
+        $this->assertSame('âøñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
+        $this->assertSame('âøz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
+        $this->assertSame('âñæë', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
     }
 
     function test_default_substr_replace_with_ascii_input_string()
     {
         // Disable mbstring which should fall ack to substr_replace...
-        autoptimizeUtils::mbstring_available( false );
+        autoptimizeUtils::mbstring_available(false);
 
         $str = 'Ascii';
 
-        $this->assertSame( 'Añ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) );
-        $this->assertSame( 'ñcii', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
-        $this->assertSame( 'Asñx', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
-        $this->assertSame( 'Asz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) );
-        $this->assertSame( 'Añii', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
+        $this->assertSame('Añ', autoptimizeUtils::substr_replace($str, 'ñ', 1));
+        $this->assertSame('ñcii', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
+        $this->assertSame('Asñx', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
+        $this->assertSame('Asz', autoptimizeUtils::substr_replace($str, 'z', 2, 10));
+        $this->assertSame('Añii', autoptimizeUtils::substr_replace($str, 'ñ', 1, 2));
     }
 
     function test_default_substr_replace_with_utf8_input_string()
     {
         // Disabling mbstring, falling back to substr_replace...
-        autoptimizeUtils::mbstring_available( false );
+        autoptimizeUtils::mbstring_available(false);
 
         // This is really impossible to make work properly, since
         // any start/len parameters we give are working with bytes instead
@@ -2234,59 +2234,59 @@ 
 
         // $this->assertSame( '�ñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
         // $this->assertSame( 'ñ�næë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
-        $this->assertSame( 'ñønæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
-        $this->assertSame( 'âñxæë', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
-        $this->assertSame( 'âz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
+        $this->assertSame('ñønæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
+        $this->assertSame('âñxæë', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
+        $this->assertSame('âz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
     }
 
     public function test_cache_fast_delete()
     {
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
 
-        $this->assertTrue( autoptimizeCache::clearall_actionless() );
+        $this->assertTrue(autoptimizeCache::clearall_actionless());
 
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
     }
 
     public function test_delete_advanced_cache_clear_artifacts()
     {
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
 
-        $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() );
+        $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts());
 
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
     }
 
     public function provider_canonicalization()
     {
         return array(
-            array( '../common', 'common' ),
-            array( '../what-does-this-mean/really?/', 'what-does-this-mean/really?/' ),
-            array( '../../what/where/how', 'what/where/how' ),
-            array( '/../more.dots.please/', '/more.dots.please/' ),
-            array( '/../../what/where/how', '/what/where/how' ),
-            array( '/a/b/c/../../../d/e/file.txt', '/d/e/file.txt' ),
-            array( 'a/b/../c', 'a/c' ),
-            array( './../../etc/passwd', './etc/passwd' ),
-            array( '/var/.////./user/./././..//.//../////../././.././test/////', '/test/' ),
-            array( '/var/user/./././.././../.././././test/', '/test/' ),
-            array( '/hello/0//how/../are/../you', '/hello/0/you' ),
-            array( '', '' ),
-            array( '.', '.' ),
-            array( '..', '..' ),
-            array( './..', './..' ),
-            array( '../.', '.' ),
+            array('../common', 'common'),
+            array('../what-does-this-mean/really?/', 'what-does-this-mean/really?/'),
+            array('../../what/where/how', 'what/where/how'),
+            array('/../more.dots.please/', '/more.dots.please/'),
+            array('/../../what/where/how', '/what/where/how'),
+            array('/a/b/c/../../../d/e/file.txt', '/d/e/file.txt'),
+            array('a/b/../c', 'a/c'),
+            array('./../../etc/passwd', './etc/passwd'),
+            array('/var/.////./user/./././..//.//../////../././.././test/////', '/test/'),
+            array('/var/user/./././.././../.././././test/', '/test/'),
+            array('/hello/0//how/../are/../you', '/hello/0/you'),
+            array('', ''),
+            array('.', '.'),
+            array('..', '..'),
+            array('./..', './..'),
+            array('../.', '.'),
             // This might be debatable...
-            array( '../..', '..' ),
+            array('../..', '..'),
         );
     }
 
     /**
      * @dataProvider provider_canonicalization
      */
-    public function test_path_canonicalize( $path, $canonicalized )
+    public function test_path_canonicalize($path, $canonicalized)
     {
-        $this->assertSame( $canonicalized, autoptimizeUtils::path_canonicalize( $path ) );
+        $this->assertSame($canonicalized, autoptimizeUtils::path_canonicalize($path));
     }
 
     /**
@@ -2300,16 +2300,16 @@ 
     public function test_autoptimize_filter_cdn_magic_path_check()
     {
         $cdnurl = 'http://cdn.example.org';
-        add_filter( 'autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2 );
+        add_filter('autoptimize_filter_cdn_magic_path_check', '__return_false', 10, 2);
 
         // Even when site is in a subfolder, the resulting cdn-rewritten url
         // should not magically include it, due to the above filter.
         // The second parameter is here to force a cache miss and re-run
         // the filter since we're using the same cdn url all over the place,
         // but want to prove different things with it.
-        $this->assertSame( $cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed( $cdnurl, true ) );
+        $this->assertSame($cdnurl, autoptimizeUtils::tweak_cdn_url_if_needed($cdnurl, true));
 
-        remove_all_filters( 'autoptimize_filter_cdn_magic_path_check' );
+        remove_all_filters('autoptimize_filter_cdn_magic_path_check');
     }
 
     /**
@@ -2334,9 +2334,9 @@ 
 <img src='$imgopthost/client/q_glossy,ret_img,w_400,h_200/$siteurl/wp-content/image.jpg' width='400' height='200' srcset="$imgopthost/client/q_glossy,ret_img,w_300/$siteurl/wp-content/image-300X150.jpg 300w, $imgopthost/client/q_glossy,ret_img,w_600/$siteurl/wp-content/image-600X300.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" />
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
     
     /**
@@ -2364,9 +2364,9 @@ 
 <img src='$siteurl/wp-content/excluded.jpg' width='400' height='200' srcset="$siteurl/wp-content/image-300X150.jpg 300w, $siteurl/wp-content/image-600X300.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" />
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup, true );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup, true);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2391,9 +2391,9 @@ 
 <picture><source srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture>
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2418,9 +2418,9 @@ 
 <picture><source data-srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><noscript><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></noscript><img class="lazyload" src='$imgopthost/client/q_lqip,ret_wait/$siteurl/wp-content/image.jpg' data-src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture>
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2446,9 +2446,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2474,9 +2474,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2501,9 +2501,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2528,9 +2528,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2555,9 +2555,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2576,11 +2576,11 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
         // Expecting $markup since replacement should not happen.
-        $this->assertEquals( $markup, $actual );
+        $this->assertEquals($markup, $actual);
     }
 
     /**
@@ -2606,10 +2606,10 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2619,8 +2619,8 @@ 
     {
         $urls                                        = $this->get_urls();
         $siteurl                                     = $urls['siteurl'];
-        $siteurlparsed                               = parse_url( $siteurl );
-        $sitedomain                                  = $siteurlparsed['scheme'] . '://' . $siteurlparsed['host'];
+        $siteurlparsed                               = parse_url($siteurl);
+        $sitedomain                                  = $siteurlparsed['scheme'].'://'.$siteurlparsed['host'];
         $imgopthost                                  = $urls['imgopthost'];
         $opts                                        = autoptimizeImages::fetch_options();
         $opts['autoptimize_imgopt_checkbox_field_1'] = '1';
@@ -2635,10 +2635,10 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2663,53 +2663,53 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
      * @dataProvider provider_str_is_valid_regex
      */
-    public function test_str_is_valid_regex( $str, $expected )
+    public function test_str_is_valid_regex($str, $expected)
     {
-        $actual = autoptimizeUtils::str_is_valid_regex( $str );
+        $actual = autoptimizeUtils::str_is_valid_regex($str);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_str_is_valid_regex()
     {
         return [
-            [ '<!--[if', false ],
-            [ '&lt;--[if', false ],
-            [ '/booya/i', true ],
-            [ '~Valid(Regular)Expression~', true ],
+            ['<!--[if', false],
+            ['&lt;--[if', false],
+            ['/booya/i', true],
+            ['~Valid(Regular)Expression~', true],
         ];
     }
 
     /**
      * @dataProvider provider_protocol_relative_tests
      */
-    public function test_is_protocol_relative( $str, $expected )
+    public function test_is_protocol_relative($str, $expected)
     {
-        $actual = autoptimizeUtils::is_protocol_relative( $str );
+        $actual = autoptimizeUtils::is_protocol_relative($str);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_protocol_relative_tests()
     {
         return [
-            [ '//something-that-might-be-an-url-but-isnt-really', true ],
-            [ '', false ],
-            [ null, false ],
-            [ 'booya/i', false ],
-            [ '/root-relative', false ],
-            [ 'http://what.ever/', false ],
-            [ 'https://booya.kasha', false ],
-            [ '1/', false ],
+            ['//something-that-might-be-an-url-but-isnt-really', true],
+            ['', false],
+            [null, false],
+            ['booya/i', false],
+            ['/root-relative', false],
+            ['http://what.ever/', false],
+            ['https://booya.kasha', false],
+            ['1/', false],
         ];
     }
 
@@ -2724,38 +2724,38 @@ 
 
         $expected = 'img.centered,.aligncenter{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}';
 
-        $instance = new autoptimizeStyles( $css );
-        $minified = $instance->run_minifier_on( $css );
+        $instance = new autoptimizeStyles($css);
+        $minified = $instance->run_minifier_on($css);
 
-        $this->assertEquals( $expected, $minified );
+        $this->assertEquals($expected, $minified);
     }
 
     public function test_css_font_names_mangling()
     {
         // Properly quoted font names dont get mangled.
         $css      = 'h2{font-family:"Archivo Black"}';
-        $instance = new autoptimizeStyles( $css );
-        $actual   = $instance->run_minifier_on( $css );
-        $this->assertEquals( $css, $actual );
+        $instance = new autoptimizeStyles($css);
+        $actual   = $instance->run_minifier_on($css);
+        $this->assertEquals($css, $actual);
 
         // When not quoted, 'Black' used to become '#000', but not anymore :) ...
         $css_unquoted = 'h2{font-family:Archivo Black;}';
         $expected     = 'h2{font-family:Archivo Black}';
-        $instance     = new autoptimizeStyles( $css_unquoted );
-        $actual       = $instance->run_minifier_on( $css_unquoted );
-        $this->assertEquals( $expected, $actual );
+        $instance     = new autoptimizeStyles($css_unquoted);
+        $actual       = $instance->run_minifier_on($css_unquoted);
+        $this->assertEquals($expected, $actual);
 
         $css_unquoted = 'h1{font:italic 1.2em Fira White,serif}';
-        $instance     = new autoptimizeStyles( $css_unquoted );
-        $actual       = $instance->run_minifier_on( $css_unquoted );
-        $this->assertEquals( $css_unquoted, $actual );
+        $instance     = new autoptimizeStyles($css_unquoted);
+        $actual       = $instance->run_minifier_on($css_unquoted);
+        $this->assertEquals($css_unquoted, $actual);
     }
 
     public function test_is_plugin_active_utils_wrapper()
     {
         // Our plugin is loaded via "muplugins_loaded" filter in tests/bootstrap.php.
-        $this->assertFalse( autoptimizeUtils::is_plugin_active( 'autoptimize/autoptimize.php' ) );
-        $this->assertFalse( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) );
+        $this->assertFalse(autoptimizeUtils::is_plugin_active('autoptimize/autoptimize.php'));
+        $this->assertFalse(autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php'));
     }
 
     public function test_jsminphp_string_literal_minification()
@@ -2769,8 +2769,8 @@ 
         $expected = '`line
 break`+`he  llo`;foo`hel( \'\');lo`;`he\nl\`lo`;(`he${one + two}`)';
 
-        $actual = JSMin::minify( $js );
-        $this->assertEquals( $expected, $actual );
+        $actual = JSMin::minify($js);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2790,9 +2790,9 @@ 
 MARKUP;
 
         $instance = autoptimizeExtra::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_preload( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_preload($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2812,9 +2812,9 @@ 
 MARKUP;
 
         $instance = autoptimizeExtra::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_preload( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_preload($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2834,9 +2834,9 @@ 
 MARKUP;
 
         $instance = autoptimizeExtra::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_google_fonts( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_google_fonts($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2844,19 +2844,19 @@ 
      */
     public function test_network_no_site_settings()
     {
-        if ( is_multisite() ) {
-            define( 'TEST_MULTISITE_FORCE_AO_ON_NETWORK', true );
+        if (is_multisite()) {
+            define('TEST_MULTISITE_FORCE_AO_ON_NETWORK', true);
             // set options through WordPress core methods.
-            update_option( 'autoptimize_js_exclude', 'site' );
-            update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' );
-            update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', '' );
+            update_option('autoptimize_js_exclude', 'site');
+            update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network');
+            update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', '');
 
             // and then try fetching them through optionwrapper.
             $expected = 'network';
-            $actual   = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' );
-            $this->assertEquals( $expected, $actual );
+            $actual   = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude');
+            $this->assertEquals($expected, $actual);
         } else {
-            $this->assertEquals( 1, 1 ); // just to ensure this isn't marked as a risky test.
+            $this->assertEquals(1, 1); // just to ensure this isn't marked as a risky test.
         }
     }
 
@@ -2865,19 +2865,19 @@ 
      */
     public function test_network_per_site_settings()
     {
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             // define of TEST_MULTISITE_FORCE_AO_ON_NETWORK not needed, done in previous test.
             // set options through WordPress core methods.
-            update_option( 'autoptimize_js_exclude', 'site' );
-            update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' );
-            update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', 'on' );
+            update_option('autoptimize_js_exclude', 'site');
+            update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network');
+            update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', 'on');
 
             // and then try fetching them through optionwrapper.
             $expected = 'site';
-            $actual   = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' );
-            $this->assertEquals( $expected, $actual );
+            $actual   = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude');
+            $this->assertEquals($expected, $actual);
         } else {
-            $this->assertEquals( 1, 1 ); // just to ensure this isn't marked as a risky test.
+            $this->assertEquals(1, 1); // just to ensure this isn't marked as a risky test.
         }
     }
 }

classes/autoptimizeCriticalCSSEnqueue.php

Spacing +74 added lines, -74 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS job enqueue logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,27 +12,27 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
     }
 
-    public static function ao_ccss_enqueue( $hash ) {
+    public static function ao_ccss_enqueue($hash) {
         $self = new self();
         // Get key status.
-        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( false );
+        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(false);
 
         // Queue is available to anyone...
         $enqueue = true;
 
         // ... which are not the ones below.
-        if ( is_user_logged_in() || is_feed() || is_404() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters( 'autoptimize_filter_ccss_enqueue_should_enqueue', true ) ) {
+        if (is_user_logged_in() || is_feed() || is_404() || (defined('DOING_AJAX') && DOING_AJAX) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters('autoptimize_filter_ccss_enqueue_should_enqueue', true)) {
             $enqueue = false;
-            autoptimizeCriticalCSSCore::ao_ccss_log( "Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log("Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3);
         }
 
-        if ( $enqueue ) {
+        if ($enqueue) {
             // Continue if queue is available
             // Attach required arrays/ vars.
             global $ao_ccss_rules;
@@ -42,17 +42,17 @@ 
 
             // Get request path and page type, and initialize the queue update flag.
             $req_orig        = $_SERVER['REQUEST_URI'];
-            $req_path        = strtok( $req_orig, '?' );
+            $req_path        = strtok($req_orig, '?');
 
             // Check if we have a lang param. we need to keep as WPML can switch languages based on that
             // and that includes RTL -> LTR so diff. structure, so rules would be RTL vs LTR
             // but this needs changes in the structur of the rule object so off by default for now
             // as now this will simply result in conditional rules being overwritten.
-            if ( apply_filters( 'autoptimize_filter_ccss_coreenqueue_honor_lang', false ) && strpos( $req_orig, 'lang=' ) !== false ) {
-                $req_params = strtok( '?' );
-                parse_str( $req_params, $req_params_arr );
-                if ( array_key_exists( 'lang', $req_params_arr ) && !empty( $req_params_arr['lang'] ) ) {
-                    $req_path .= '?lang=' . $req_params_arr['lang'];
+            if (apply_filters('autoptimize_filter_ccss_coreenqueue_honor_lang', false) && strpos($req_orig, 'lang=') !== false) {
+                $req_params = strtok('?');
+                parse_str($req_params, $req_params_arr);
+                if (array_key_exists('lang', $req_params_arr) && !empty($req_params_arr['lang'])) {
+                    $req_path .= '?lang='.$req_params_arr['lang'];
                 }
             }
 
@@ -63,21 +63,21 @@ 
             $queue_update    = false;
 
             // Match for paths in rules.
-            foreach ( $ao_ccss_rules['paths'] as $path => $props ) {
+            foreach ($ao_ccss_rules['paths'] as $path => $props) {
 
                 // Prepare rule target and log.
-                $target_rule = 'paths|' . $path;
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
+                $target_rule = 'paths|'.$path;
+                autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
 
                 // Path match
                 // -> exact match needed for AUTO rules
                 // -> partial match OK for MANUAL rules (which have empty hash and a file with CCSS).
-                if ( $path === $req_path || ( false == $props['hash'] && false != $props['file'] && preg_match( '|' . $path . '|', $req_path ) ) ) {
+                if ($path === $req_path || (false == $props['hash'] && false != $props['file'] && preg_match('|'.$path.'|', $req_path))) {
 
                     // There's a path match in the rule, so job QUALIFIES with a path rule match.
                     $job_qualify     = true;
                     $rule_properties = $props;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
 
                     // Stop processing other path rules.
                     break;
@@ -85,19 +85,19 @@ 
             }
 
             // Match for types in rules if no path rule matches and if we're not enforcing paths.
-            if ( ! $job_qualify && ( ! $ao_ccss_forcepath || ! in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) || ! apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) ) {
-                foreach ( $ao_ccss_rules['types'] as $type => $props ) {
+            if (!$job_qualify && (!$ao_ccss_forcepath || !in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page'))) || !apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false))) {
+                foreach ($ao_ccss_rules['types'] as $type => $props) {
 
                     // Prepare rule target and log.
-                    $target_rule = 'types|' . $type;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying page type <' . $req_type . '> on path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
+                    $target_rule = 'types|'.$type;
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying page type <'.$req_type.'> on path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
 
-                    if ( $req_type == $type ) {
+                    if ($req_type == $type) {
                         // Type match.
                         // There's a type match in the rule, so job QUALIFIES with a type rule match.
                         $job_qualify     = true;
                         $rule_properties = $props;
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Page type <' . $req_type . '> on path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Page type <'.$req_type.'> on path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
 
                         // Stop processing other type rules.
                         break;
@@ -105,11 +105,11 @@ 
                 }
             }
 
-            if ( $job_qualify && ( ( false == $rule_properties['hash'] && false != $rule_properties['file'] ) || strpos( $req_type, 'template_' ) !== false ) ) {
+            if ($job_qualify && ((false == $rule_properties['hash'] && false != $rule_properties['file']) || strpos($req_type, 'template_') !== false)) {
                 // If job qualifies but rule hash is false and file isn't false (MANUAL rule) or if template, job does not qualify despite what previous evaluations says.
                 $job_qualify = false;
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission DISQUALIFIED by MANUAL rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
-            } elseif ( ! $job_qualify && empty( $rule_properties ) ) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission DISQUALIFIED by MANUAL rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
+            } elseif (!$job_qualify && empty($rule_properties)) {
                 // But if job does not qualify and rule properties are set, job qualifies as there is no matching rule for it yet
                 // Fill-in the new target rule.
                 $job_qualify = true;
@@ -117,28 +117,28 @@ 
                 // Should we switch to path-base AUTO-rules? Conditions:
                 // 1. forcepath option has to be enabled (off by default)
                 // 2. request type should be (by default, but filterable) one of is_page (removed for now: woo_is_product or woo_is_product_category).
-                if ( ( $ao_ccss_forcepath && in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) ) || apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) {
-                    if ( '/' !== $req_path ) {
-                        $target_rule = 'paths|' . $req_path;
+                if (($ao_ccss_forcepath && in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page')))) || apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false)) {
+                    if ('/' !== $req_path) {
+                        $target_rule = 'paths|'.$req_path;
                     } else {
                         // Exception; we don't want a path-based rule for "/" as that messes things up, hard-switch this to a type-based is_front_page rule.
-                        $target_rule = 'types|' . 'is_front_page';
+                        $target_rule = 'types|'.'is_front_page';
                     }
                 } else {
-                    $target_rule = 'types|' . $req_type;
+                    $target_rule = 'types|'.$req_type;
                 }
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by MISSING rule for page type <' . $req_type . '> on path <' . $req_path . '>, new rule target is <' . $target_rule . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by MISSING rule for page type <'.$req_type.'> on path <'.$req_path.'>, new rule target is <'.$target_rule.'>', 3);
             } else {
                 // Or just log a job qualified by a matching rule.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by AUTO rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by AUTO rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
             }
 
             // Submit job.
-            if ( $job_qualify ) {
-                if ( ! array_key_exists( $req_path, $ao_ccss_queue ) ) {
+            if ($job_qualify) {
+                if (!array_key_exists($req_path, $ao_ccss_queue)) {
                     // This is a NEW job
                     // Merge job into the queue.
-                    $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
+                    $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
                         $req_path,
                         $target_rule,
                         $req_type,
@@ -154,30 +154,30 @@ 
                 } else {
                     // This is an existing job
                     // The job is still NEW, most likely this is extra CSS file for the same page that needs a hash.
-                    if ( 'NEW' == $ao_ccss_queue[ $req_path ]['jqstat'] ) {
+                    if ('NEW' == $ao_ccss_queue[$req_path]['jqstat']) {
                         // Add hash if it's not already in the job.
-                        if ( ! in_array( $hash, $ao_ccss_queue[ $req_path ]['hashes'] ) ) {
+                        if (!in_array($hash, $ao_ccss_queue[$req_path]['hashes'])) {
                             // Push new hash to its array and update flag.
-                            $queue_update = array_push( $ao_ccss_queue[ $req_path ]['hashes'], $hash );
+                            $queue_update = array_push($ao_ccss_queue[$req_path]['hashes'], $hash);
 
                             // Log job update.
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Hashes UPDATED on local job id <' . $ao_ccss_queue[ $req_path ]['ljid'] . '>, job status NEW, target rule <' . $ao_ccss_queue[ $req_path ]['rtarget'] . '>, hash added: ' . $hash, 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Hashes UPDATED on local job id <'.$ao_ccss_queue[$req_path]['ljid'].'>, job status NEW, target rule <'.$ao_ccss_queue[$req_path]['rtarget'].'>, hash added: '.$hash, 3);
 
                             // Return from here as the hash array is already updated.
                             return true;
                         }
-                    } elseif ( 'NEW' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[ $req_path ]['jqstat'] ) {
+                    } elseif ('NEW' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[$req_path]['jqstat']) {
                         // Allow requeuing jobs that are not NEW, JOB_QUEUED or JOB_ONGOING
                         // Merge new job keeping some previous job values.
-                        $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
+                        $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
                             $req_path,
                             $target_rule,
                             $req_type,
                             $hash,
-                            $ao_ccss_queue[ $req_path ]['file'],
-                            $ao_ccss_queue[ $req_path ]['jid'],
-                            $ao_ccss_queue[ $req_path ]['jrstat'],
-                            $ao_ccss_queue[ $req_path ]['jvstat'],
+                            $ao_ccss_queue[$req_path]['file'],
+                            $ao_ccss_queue[$req_path]['jid'],
+                            $ao_ccss_queue[$req_path]['jrstat'],
+                            $ao_ccss_queue[$req_path]['jvstat'],
                             false
                         );
                         // Set update flag.
@@ -185,14 +185,14 @@ 
                     }
                 }
 
-                if ( $queue_update ) {
+                if ($queue_update) {
                     // Persist the job to the queue and return.
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
                     return true;
                 } else {
                     // Or just return false if no job was added.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A job for path <' . $req_path . '> already exist with NEW or PENDING status, skipping job creation', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A job for path <'.$req_path.'> already exist with NEW or PENDING status, skipping job creation', 3);
                     return false;
                 }
             }
@@ -209,33 +209,33 @@ 
         $page_type = false;
 
         // Iterates over the array to match a type.
-        foreach ( $ao_ccss_types as $type ) {
-            if ( is_404() ) {
+        foreach ($ao_ccss_types as $type) {
+            if (is_404()) {
                 $page_type = 'is_404';
                 break;
-            } elseif ( is_front_page() ) {
+            } elseif (is_front_page()) {
                 // identify frontpage immediately to avoid it also matching a CPT or template.
                 $page_type = 'is_front_page';
                 break;
-            } elseif ( strpos( $type, 'custom_post_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'custom_post_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match custom post types and not page or page not forced to path-based.
-                if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
+                if (get_post_type(get_the_ID()) === substr($type, 12)) {
                     $page_type = $type;
                     break;
                 }
-            } elseif ( strpos( $type, 'template_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'template_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match templates if not page or if page is not forced to path-based.
-                if ( is_page_template( substr( $type, 9 ) ) ) {
+                if (is_page_template(substr($type, 9))) {
                     $page_type = $type;
                     break;
                 }
             } else {
                 // Match all other existing types
                 // but remove prefix to be able to check if the function exists & returns true.
-                $_type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
-                if ( function_exists( $_type ) && call_user_func( $_type ) ) {
+                $_type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
+                if (function_exists($_type) && call_user_func($_type)) {
                     // Make sure we only return for one page, not for the "paged pages" (/page/2 ..).
-                    if ( ! is_page() || ! is_paged() ) {
+                    if (!is_page() || !is_paged()) {
                         $page_type = $type;
                         break;
                     }
@@ -247,44 +247,44 @@ 
         return $page_type;
     }
 
-    public function ao_ccss_define_job( $path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create ) {
+    public function ao_ccss_define_job($path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create) {
         // Define a job entry to be created or updated
         // Define commom job properties.
         $path            = array();
         $path['ljid']    = $this->ao_ccss_job_id();
         $path['rtarget'] = $target;
         $path['ptype']   = $type;
-        $path['hashes']  = array( $hash );
+        $path['hashes']  = array($hash);
         $path['hash']    = $hash;
         $path['file']    = $file;
         $path['jid']     = $jid;
         $path['jqstat']  = 'NEW';
         $path['jrstat']  = $jrstat;
         $path['jvstat']  = $jvstat;
-        $path['jctime']  = microtime( true );
+        $path['jctime']  = microtime(true);
         $path['jftime']  = null;
 
         // Set operation requested.
-        if ( $create ) {
+        if ($create) {
             $operation = 'CREATED';
         } else {
             $operation = 'UPDATED';
         }
 
         // Log job creation.
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job ' . $operation . ' with local job id <' . $path['ljid'] . '> for target rule <' . $target . '>', 3 );
+        autoptimizeCriticalCSSCore::ao_ccss_log('Job '.$operation.' with local job id <'.$path['ljid'].'> for target rule <'.$target.'>', 3);
 
         return $path;
     }
 
-    public function ao_ccss_job_id( $length = 6 ) {
+    public function ao_ccss_job_id($length = 6) {
         // Generate random strings for the local job ID
         // Based on https://stackoverflow.com/a/4356295 .
         $characters        = '0123456789abcdefghijklmnopqrstuvwxyz';
-        $characters_length = strlen( $characters );
+        $characters_length = strlen($characters);
         $random_string     = 'j-';
-        for ( $i = 0; $i < $length; $i++ ) {
-            $random_string .= $characters[ rand( 0, $characters_length - 1 ) ];
+        for ($i = 0; $i < $length; $i++) {
+            $random_string .= $characters[rand(0, $characters_length - 1)];
         }
         return $random_string;
     }
@@ -292,17 +292,17 @@ 
     public function ao_ccss_ua() {
         // Check for criticalcss.com user agent.
         $agent = '';
-        if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
             $agent = $_SERVER['HTTP_USER_AGENT'];
         }
 
         // Check for UA and return TRUE when criticalcss.com is the detected UA, false when not.
-        $rtn = strpos( $agent, AO_CCSS_URL );
-        if ( 0 === $rtn ) {
+        $rtn = strpos($agent, AO_CCSS_URL);
+        if (0 === $rtn) {
             $rtn = true;
         } else {
             $rtn = false;
         }
-        return ( $rtn );
+        return ($rtn);
     }
 }

classes/autoptimizeMain.php

Spacing +182 added lines, -182 removed lines

@@ -3,7 +3,7 @@ 
  * Wraps base plugin logic/hooks and handles activation/deactivation/uninstall.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -33,7 +33,7 @@ 
      * @param string $version Version.
      * @param string $filepath Filepath. Needed for activation/deactivation/uninstall hooks.
      */
-    public function __construct( $version, $filepath )
+    public function __construct($version, $filepath)
     {
         $this->version  = $version;
         $this->filepath = $filepath;
@@ -50,101 +50,101 @@ 
 
     protected function add_hooks()
     {
-        if ( ! defined( 'AUTOPTIMIZE_SETUP_INITHOOK' ) ) {
-            define( 'AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded' );
+        if (!defined('AUTOPTIMIZE_SETUP_INITHOOK')) {
+            define('AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded');
         }
 
-        add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'setup' ) );
-        add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'hook_page_cache_purge' ) );
+        add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'setup'));
+        add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'hook_page_cache_purge'));
 
-        add_action( 'autoptimize_setup_done', array( $this, 'version_upgrades_check' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'check_cache_and_run' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_ao_extra' ), 15 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ), 20 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_criticalcss' ), 11 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_notfound_fallback' ), 10 );
+        add_action('autoptimize_setup_done', array($this, 'version_upgrades_check'));
+        add_action('autoptimize_setup_done', array($this, 'check_cache_and_run'));
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_ao_extra'), 15);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab'), 20);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_criticalcss'), 11);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_notfound_fallback'), 10);
 
-        add_action( 'init', array( $this, 'load_textdomain' ) );
+        add_action('init', array($this, 'load_textdomain'));
 
-        if ( is_multisite() && is_admin() ) {
+        if (is_multisite() && is_admin()) {
             // Only if multisite and if in admin we want to check if we need to save options on network level.
-            add_action( 'init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options' );
+            add_action('init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options');
         }
 
         // register uninstall & deactivation hooks.
-        register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' );
-        register_deactivation_hook( $this->filepath, 'autoptimizeMain::on_deactivation' );
+        register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall');
+        register_deactivation_hook($this->filepath, 'autoptimizeMain::on_deactivation');
     }
 
     public function load_textdomain()
     {
-        load_plugin_textdomain( 'autoptimize' );
+        load_plugin_textdomain('autoptimize');
     }
 
     public function setup()
     {
         // Do we gzip in php when caching or is the webserver doing it?
-        define( 'AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip' ) );
+        define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip'));
 
         // These can be overridden by specifying them in wp-config.php or such.
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_NAME' ) ) {
-            define( 'AUTOPTIMIZE_WP_CONTENT_NAME', '/' . wp_basename( WP_CONTENT_DIR ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) {
+            define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR));
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_CHILD_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/' );
+        if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) {
+            define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/');
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHEFILE_PREFIX' ) ) {
-            define( 'AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_' );
+        if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) {
+            define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_');
         }
         // Note: trailing slash is not optional!
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname() );
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
+            define('AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname());
         }
 
-        define( 'WP_ROOT_DIR', substr( WP_CONTENT_DIR, 0, strlen( WP_CONTENT_DIR ) - strlen( AUTOPTIMIZE_WP_CONTENT_NAME ) ) );
+        define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
 
-        if ( ! defined( 'AUTOPTIMIZE_WP_SITE_URL' ) ) {
-            if ( function_exists( 'domain_mapping_siteurl' ) ) {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl( get_current_blog_id() ) );
+        if (!defined('AUTOPTIMIZE_WP_SITE_URL')) {
+            if (function_exists('domain_mapping_siteurl')) {
+                define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
             } else {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', site_url() );
+                define('AUTOPTIMIZE_WP_SITE_URL', site_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_URL' ) ) {
-            if ( function_exists( 'get_original_url' ) ) {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', str_replace( get_original_url( AUTOPTIMIZE_WP_SITE_URL ), AUTOPTIMIZE_WP_SITE_URL, content_url() ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_URL')) {
+            if (function_exists('get_original_url')) {
+                define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
             } else {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', content_url() );
+                define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_URL' ) ) {
-            if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_URL')) {
+            if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
                 $blog_id = get_current_blog_id();
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR . $blog_id . '/' );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
             } else {
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_ROOT_URL' ) ) {
-            define( 'AUTOPTIMIZE_WP_ROOT_URL', str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL ) );
+        if (!defined('AUTOPTIMIZE_WP_ROOT_URL')) {
+            define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_HASH' ) ) {
-            define( 'AUTOPTIMIZE_HASH', wp_hash( AUTOPTIMIZE_CACHE_URL ) );
+        if (!defined('AUTOPTIMIZE_HASH')) {
+            define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_SITE_DOMAIN' ) ) {
-            define( 'AUTOPTIMIZE_SITE_DOMAIN', parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) );
+        if (!defined('AUTOPTIMIZE_SITE_DOMAIN')) {
+            define('AUTOPTIMIZE_SITE_DOMAIN', parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST));
         }
 
         // Multibyte-capable string replacements are available with a filter.
         // Also requires 'mbstring' extension.
-        $with_mbstring = apply_filters( 'autoptimize_filter_main_use_mbstring', false );
-        if ( $with_mbstring ) {
-            autoptimizeUtils::mbstring_available( \extension_loaded( 'mbstring' ) );
+        $with_mbstring = apply_filters('autoptimize_filter_main_use_mbstring', false);
+        if ($with_mbstring) {
+            autoptimizeUtils::mbstring_available(\extension_loaded('mbstring'));
         } else {
-            autoptimizeUtils::mbstring_available( false );
+            autoptimizeUtils::mbstring_available(false);
         }
 
-        do_action( 'autoptimize_setup_done' );
+        do_action('autoptimize_setup_done');
     }
 
     /**
@@ -154,61 +154,61 @@ 
      */
     public function version_upgrades_check()
     {
-        autoptimizeVersionUpdatesHandler::check_installed_and_update( $this->version );
+        autoptimizeVersionUpdatesHandler::check_installed_and_update($this->version);
     }
 
     public function check_cache_and_run()
     {
-        if ( autoptimizeCache::cacheavail() ) {
+        if (autoptimizeCache::cacheavail()) {
             $conf = autoptimizeConfig::instance();
-            if ( $conf->get( 'autoptimize_html' ) || $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper() ) {
-                if ( ! defined( 'AUTOPTIMIZE_NOBUFFER_OPTIMIZE' ) ) {
+            if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper()) {
+                if (!defined('AUTOPTIMIZE_NOBUFFER_OPTIMIZE')) {
                     // Hook into WordPress frontend.
-                    if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
+                    if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
                         add_action(
                             'init',
-                            array( $this, 'start_buffering' ),
+                            array($this, 'start_buffering'),
                             self::INIT_EARLIER_PRIORITY
                         );
                     } else {
-                        if ( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ) {
-                            define( 'AUTOPTIMIZE_HOOK_INTO', 'template_redirect' );
+                        if (!defined('AUTOPTIMIZE_HOOK_INTO')) {
+                            define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect');
                         }
                         add_action(
-                            constant( 'AUTOPTIMIZE_HOOK_INTO' ),
-                            array( $this, 'start_buffering' ),
+                            constant('AUTOPTIMIZE_HOOK_INTO'),
+                            array($this, 'start_buffering'),
                             self::DEFAULT_HOOK_PRIORITY
                         );
                     }
                 }
 
                 // And disable Jetpack's site accelerator if JS or CSS opt. are active.
-                if ( class_exists( 'Jetpack' ) && apply_filters( 'autoptimize_filter_main_disable_jetpack_cdn', true ) && ( $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) ) {
-                    add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' );
+                if (class_exists('Jetpack') && apply_filters('autoptimize_filter_main_disable_jetpack_cdn', true) && ($conf->get('autoptimize_js') || $conf->get('autoptimize_css'))) {
+                    add_filter('jetpack_force_disable_site_accelerator', '__return_true');
                 }
             }
         } else {
-            add_action( 'admin_notices', 'autoptimizeMain::notice_cache_unavailable' );
+            add_action('admin_notices', 'autoptimizeMain::notice_cache_unavailable');
         }
     }
 
     public function maybe_run_ao_extra()
     {
-        if ( apply_filters( 'autoptimize_filter_extra_activate', true ) ) {
+        if (apply_filters('autoptimize_filter_extra_activate', true)) {
             $ao_imgopt = new autoptimizeImages();
             $ao_imgopt->run();
             $ao_extra = new autoptimizeExtra();
             $ao_extra->run();
 
             // And show the imgopt notice.
-            add_action( 'admin_notices', 'autoptimizeMain::notice_plug_imgopt' );
+            add_action('admin_notices', 'autoptimizeMain::notice_plug_imgopt');
         }
     }
 
     public function maybe_run_partners_tab()
     {
         // Loads partners tab code if in admin (and not in admin-ajax.php)!
-        if ( autoptimizeConfig::is_admin_and_not_ajax() ) {
+        if (autoptimizeConfig::is_admin_and_not_ajax()) {
             new autoptimizePartners();
         }
     }
@@ -216,22 +216,22 @@ 
     public function maybe_run_criticalcss()
     {
         // Loads criticalcss if the power-up is not active and if the filter returns true.
-        if ( apply_filters( 'autoptimize_filter_criticalcss_active', true ) && ! autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) {
+        if (apply_filters('autoptimize_filter_criticalcss_active', true) && !autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) {
             new autoptimizeCriticalCSSBase();
         }
     }
 
     public function maybe_run_notfound_fallback()
     {
-        if ( autoptimizeCache::do_fallback() ) {
-            add_action( 'template_redirect', array( 'autoptimizeCache', 'wordpress_notfound_fallback' ) );
+        if (autoptimizeCache::do_fallback()) {
+            add_action('template_redirect', array('autoptimizeCache', 'wordpress_notfound_fallback'));
         }
     }
 
     public function hook_page_cache_purge()
     {
         // hook into a collection of page cache purge actions if filter allows.
-        if ( apply_filters( 'autoptimize_filter_main_hookpagecachepurge', true ) ) {
+        if (apply_filters('autoptimize_filter_main_hookpagecachepurge', true)) {
             $page_cache_purge_actions = array(
                 'after_rocket_clean_domain', // exists.
                 'hyper_cache_purged', // Stefano confirmed this will be added.
@@ -246,9 +246,9 @@ 
                 'wpo_cache_flush', // wp-optimize.
                 'rt_nginx_helper_after_fastcgi_purge_all', // nginx helper.
             );
-            $page_cache_purge_actions = apply_filters( 'autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions );
-            foreach ( $page_cache_purge_actions as $purge_action ) {
-                add_action( $purge_action, 'autoptimizeCache::clearall_actionless' );
+            $page_cache_purge_actions = apply_filters('autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions);
+            foreach ($page_cache_purge_actions as $purge_action) {
+                add_action($purge_action, 'autoptimizeCache::clearall_actionless');
             }
         }
     }
@@ -260,38 +260,38 @@ 
      */
     public function start_buffering()
     {
-        if ( $this->should_buffer() ) {
+        if ($this->should_buffer()) {
 
             // Load speedupper conditionally (true by default).
-            if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
+            if (apply_filters('autoptimize_filter_speedupper', true)) {
                 $ao_speedupper = new autoptimizeSpeedupper();
             }
 
             $conf = autoptimizeConfig::instance();
 
-            if ( $conf->get( 'autoptimize_js' ) ) {
-                if ( ! defined( 'CONCATENATE_SCRIPTS' ) ) {
-                    define( 'CONCATENATE_SCRIPTS', false );
+            if ($conf->get('autoptimize_js')) {
+                if (!defined('CONCATENATE_SCRIPTS')) {
+                    define('CONCATENATE_SCRIPTS', false);
                 }
-                if ( ! defined( 'COMPRESS_SCRIPTS' ) ) {
-                    define( 'COMPRESS_SCRIPTS', false );
+                if (!defined('COMPRESS_SCRIPTS')) {
+                    define('COMPRESS_SCRIPTS', false);
                 }
             }
 
-            if ( $conf->get( 'autoptimize_css' ) ) {
-                if ( ! defined( 'COMPRESS_CSS' ) ) {
-                    define( 'COMPRESS_CSS', false );
+            if ($conf->get('autoptimize_css')) {
+                if (!defined('COMPRESS_CSS')) {
+                    define('COMPRESS_CSS', false);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_obkiller', false ) ) {
-                while ( ob_get_level() > 0 ) {
+            if (apply_filters('autoptimize_filter_obkiller', false)) {
+                while (ob_get_level() > 0) {
                     ob_end_clean();
                 }
             }
 
             // Now, start the real thing!
-            ob_start( array( $this, 'end_buffering' ) );
+            ob_start(array($this, 'end_buffering'));
         }
     }
 
@@ -302,31 +302,31 @@ 
      *                          deciding once per request (for use in tests).
      * @return bool
      */
-    public static function should_buffer( $doing_tests = false )
+    public static function should_buffer($doing_tests = false)
     {
         static $do_buffering = null;
 
         // Only check once in case we're called multiple times by others but
         // still allows multiple calls when doing tests.
-        if ( null === $do_buffering || $doing_tests ) {
+        if (null === $do_buffering || $doing_tests) {
 
             $ao_noptimize = false;
 
             // Checking for DONOTMINIFY constant as used by e.g. WooCommerce POS.
-            if ( defined( 'DONOTMINIFY' ) && ( constant( 'DONOTMINIFY' ) === true || constant( 'DONOTMINIFY' ) === 'true' ) ) {
+            if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === 'true')) {
                 $ao_noptimize = true;
             }
 
             // Skip checking query strings if they're disabled.
-            if ( apply_filters( 'autoptimize_filter_honor_qs_noptimize', true ) ) {
+            if (apply_filters('autoptimize_filter_honor_qs_noptimize', true)) {
                 // Check for `ao_noptimize` (and other) keys in the query string
                 // to get non-optimized page for debugging.
                 $keys = array(
                     'ao_noptimize',
                     'ao_noptirocket',
                 );
-                foreach ( $keys as $key ) {
-                    if ( array_key_exists( $key, $_GET ) && '1' === $_GET[ $key ] ) {
+                foreach ($keys as $key) {
+                    if (array_key_exists($key, $_GET) && '1' === $_GET[$key]) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -334,15 +334,15 @@ 
             }
 
             // If setting says not to optimize logged in user and user is logged in...
-            if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) {
+            if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', 'on') && is_user_logged_in() && current_user_can('edit_posts')) {
                 $ao_noptimize = true;
             }
 
             // If setting says not to optimize cart/checkout.
-            if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', 'off' ) ) {
+            if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', 'off')) {
                 // Checking for woocommerce, easy digital downloads and wp ecommerce...
-                foreach ( array( 'is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) {
-                    if ( function_exists( $func ) && $func() ) {
+                foreach (array('is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) {
+                    if (function_exists($func) && $func()) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -350,10 +350,10 @@ 
             }
 
             // And make sure pagebuilder previews don't get optimized HTML/ JS/ CSS/ ...
-            if ( false === $ao_noptimize ) {
-                $_qs_pagebuilders = array( 'tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor' );
-                foreach ( $_qs_pagebuilders as $_pagebuilder ) {
-                    if ( array_key_exists( $_pagebuilder, $_GET ) ) {
+            if (false === $ao_noptimize) {
+                $_qs_pagebuilders = array('tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor');
+                foreach ($_qs_pagebuilders as $_pagebuilder) {
+                    if (array_key_exists($_pagebuilder, $_GET)) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -362,16 +362,16 @@ 
 
             // Also honor PageSpeed=off parameter as used by mod_pagespeed, in use by some pagebuilders,
             // see https://www.modpagespeed.com/doc/experiment#ModPagespeed for info on that.
-            if ( false === $ao_noptimize && array_key_exists( 'PageSpeed', $_GET ) && 'off' === $_GET['PageSpeed'] ) {
+            if (false === $ao_noptimize && array_key_exists('PageSpeed', $_GET) && 'off' === $_GET['PageSpeed']) {
                 $ao_noptimize = true;
             }
 
             // And finally allows blocking of autoptimization on your own terms regardless of above decisions.
-            $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+            $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
             // Check for site being previewed in the Customizer (available since WP 4.0).
             $is_customize_preview = false;
-            if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) {
+            if (function_exists('is_customize_preview') && is_customize_preview()) {
                 $is_customize_preview = is_customize_preview();
             }
 
@@ -382,7 +382,7 @@ 
              * while the main query hasn't been ran yet. Thats why we use
              * AUTOPTIMIZE_INIT_EARLIER in tests.
              */
-            $do_buffering = ( ! is_admin() && ! is_feed() && ! is_embed() && ! $ao_noptimize && ! $is_customize_preview );
+            $do_buffering = (!is_admin() && !is_feed() && !is_embed() && !$ao_noptimize && !$is_customize_preview);
         }
 
         return $do_buffering;
@@ -395,25 +395,25 @@ 
      *
      * @return bool
      */
-    public function is_valid_buffer( $content )
+    public function is_valid_buffer($content)
     {
         // Defaults to true.
         $valid = true;
 
-        $has_no_html_tag    = ( false === stripos( $content, '<html' ) );
-        $has_xsl_stylesheet = ( false !== stripos( $content, '<xsl:stylesheet' ) || false !== stripos( $content, '<?xml-stylesheet' ) );
-        $has_html5_doctype  = ( preg_match( '/^<!DOCTYPE.+html>/i', ltrim( $content ) ) > 0 );
-        $has_noptimize_page = ( false !== stripos( $content, '<!-- noptimize-page -->' ) );
+        $has_no_html_tag    = (false === stripos($content, '<html'));
+        $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet') || false !== stripos($content, '<?xml-stylesheet'));
+        $has_html5_doctype  = (preg_match('/^<!DOCTYPE.+html>/i', ltrim($content)) > 0);
+        $has_noptimize_page = (false !== stripos($content, '<!-- noptimize-page -->'));
 
-        if ( $has_no_html_tag ) {
+        if ($has_no_html_tag) {
             // Can't be valid amp markup without an html tag preceding it.
             $is_amp_markup = false;
         } else {
-            $is_amp_markup = self::is_amp_markup( $content );
+            $is_amp_markup = self::is_amp_markup($content);
         }
 
         // If it's not html, or if it's amp or contains xsl stylesheets we don't touch it.
-        if ( $has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page ) {
+        if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page) {
             $valid = false;
         }
 
@@ -428,7 +428,7 @@ 
      *
      * @return bool
      */
-    public static function is_amp_markup( $content )
+    public static function is_amp_markup($content)
     {
         // Short-circuit if the page is already AMP from the start.
         if (
@@ -446,9 +446,9 @@ 
         }
 
         // Or else short-circuit if the AMP plugin will be processing the output to be an AMP page.
-        if ( function_exists( 'amp_is_request' ) ) {
+        if (function_exists('amp_is_request')) {
             return amp_is_request(); // For AMP plugin v2.0+.
-        } elseif ( function_exists( 'is_amp_endpoint' ) ) {
+        } elseif (function_exists('is_amp_endpoint')) {
             return is_amp_endpoint(); // For older/other AMP plugins (still supported in 2.0 as an alias).
         }
 
@@ -463,10 +463,10 @@ 
      *
      * @return string
      */
-    public function end_buffering( $content )
+    public function end_buffering($content)
     {
         // Bail early without modifying anything if we can't handle the content.
-        if ( ! $this->is_valid_buffer( $content ) ) {
+        if (!$this->is_valid_buffer($content)) {
             return $content;
         }
 
@@ -474,74 +474,74 @@ 
 
         // Determine what needs to be ran.
         $classes = array();
-        if ( $conf->get( 'autoptimize_js' ) ) {
+        if ($conf->get('autoptimize_js')) {
             $classes[] = 'autoptimizeScripts';
         }
-        if ( $conf->get( 'autoptimize_css' ) ) {
+        if ($conf->get('autoptimize_css')) {
             $classes[] = 'autoptimizeStyles';
         }
-        if ( $conf->get( 'autoptimize_html' ) ) {
+        if ($conf->get('autoptimize_html')) {
             $classes[] = 'autoptimizeHTML';
         }
 
         $classoptions = array(
             'autoptimizeScripts' => array(
-                'aggregate'           => $conf->get( 'autoptimize_js_aggregate' ),
-                'defer_not_aggregate' => $conf->get( 'autoptimize_js_defer_not_aggregate' ),
-                'justhead'            => $conf->get( 'autoptimize_js_justhead' ),
-                'forcehead'           => $conf->get( 'autoptimize_js_forcehead' ),
-                'trycatch'            => $conf->get( 'autoptimize_js_trycatch' ),
-                'js_exclude'          => $conf->get( 'autoptimize_js_exclude' ),
-                'cdn_url'             => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline'      => $conf->get( 'autoptimize_js_include_inline' ),
-                'minify_excluded'     => $conf->get( 'autoptimize_minify_excluded' ),
+                'aggregate'           => $conf->get('autoptimize_js_aggregate'),
+                'defer_not_aggregate' => $conf->get('autoptimize_js_defer_not_aggregate'),
+                'justhead'            => $conf->get('autoptimize_js_justhead'),
+                'forcehead'           => $conf->get('autoptimize_js_forcehead'),
+                'trycatch'            => $conf->get('autoptimize_js_trycatch'),
+                'js_exclude'          => $conf->get('autoptimize_js_exclude'),
+                'cdn_url'             => $conf->get('autoptimize_cdn_url'),
+                'include_inline'      => $conf->get('autoptimize_js_include_inline'),
+                'minify_excluded'     => $conf->get('autoptimize_minify_excluded'),
             ),
             'autoptimizeStyles'  => array(
-                'aggregate'       => $conf->get( 'autoptimize_css_aggregate' ),
-                'justhead'        => $conf->get( 'autoptimize_css_justhead' ),
-                'datauris'        => $conf->get( 'autoptimize_css_datauris' ),
-                'defer'           => $conf->get( 'autoptimize_css_defer' ),
-                'defer_inline'    => $conf->get( 'autoptimize_css_defer_inline' ),
-                'inline'          => $conf->get( 'autoptimize_css_inline' ),
-                'css_exclude'     => $conf->get( 'autoptimize_css_exclude' ),
-                'cdn_url'         => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline'  => $conf->get( 'autoptimize_css_include_inline' ),
-                'nogooglefont'    => $conf->get( 'autoptimize_css_nogooglefont' ),
-                'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+                'aggregate'       => $conf->get('autoptimize_css_aggregate'),
+                'justhead'        => $conf->get('autoptimize_css_justhead'),
+                'datauris'        => $conf->get('autoptimize_css_datauris'),
+                'defer'           => $conf->get('autoptimize_css_defer'),
+                'defer_inline'    => $conf->get('autoptimize_css_defer_inline'),
+                'inline'          => $conf->get('autoptimize_css_inline'),
+                'css_exclude'     => $conf->get('autoptimize_css_exclude'),
+                'cdn_url'         => $conf->get('autoptimize_cdn_url'),
+                'include_inline'  => $conf->get('autoptimize_css_include_inline'),
+                'nogooglefont'    => $conf->get('autoptimize_css_nogooglefont'),
+                'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
             ),
             'autoptimizeHTML'    => array(
-                'keepcomments' => $conf->get( 'autoptimize_html_keepcomments' ),
+                'keepcomments' => $conf->get('autoptimize_html_keepcomments'),
             ),
         );
 
-        $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+        $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
         // Run the classes!
-        foreach ( $classes as $name ) {
-            $instance = new $name( $content );
-            if ( $instance->read( $classoptions[ $name ] ) ) {
+        foreach ($classes as $name) {
+            $instance = new $name($content);
+            if ($instance->read($classoptions[$name])) {
                 $instance->minify();
                 $instance->cache();
                 $content = $instance->getcontent();
             }
-            unset( $instance );
+            unset($instance);
         }
 
-        $content = apply_filters( 'autoptimize_html_after_minify', $content );
+        $content = apply_filters('autoptimize_html_after_minify', $content);
 
         return $content;
     }
 
-    public static function autoptimize_nobuffer_optimize( $html_in ) {
+    public static function autoptimize_nobuffer_optimize($html_in) {
         $html_out = $html_in;
 
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
             $ao_speedupper = new autoptimizeSpeedupper();
         }
 
-        $self = new self( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE );
-        if ( $self->should_buffer() ) {
-            $html_out = $self->end_buffering( $html_in );
+        $self = new self(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE);
+        if ($self->should_buffer()) {
+            $html_out = $self->end_buffering($html_in);
         }
         return $html_out;
     }
@@ -605,45 +605,45 @@ 
             'autoptimize_ccss_unloadccss',
         );
 
-        if ( ! is_multisite() ) {
-            foreach ( $delete_options as $del_opt ) {
-                delete_option( $del_opt );
+        if (!is_multisite()) {
+            foreach ($delete_options as $del_opt) {
+                delete_option($del_opt);
             }
             autoptimizeMain::remove_cronjobs();
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                foreach ( $delete_options as $del_opt ) {
-                    delete_option( $del_opt );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                foreach ($delete_options as $del_opt) {
+                    delete_option($del_opt);
                 }
                 autoptimizeMain::remove_cronjobs();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
 
         // Remove AO CCSS cached files and directory.
-        $ao_ccss_dir = WP_CONTENT_DIR . '/uploads/ao_ccss/';
-        if ( file_exists( $ao_ccss_dir ) && is_dir( $ao_ccss_dir ) ) {
+        $ao_ccss_dir = WP_CONTENT_DIR.'/uploads/ao_ccss/';
+        if (file_exists($ao_ccss_dir) && is_dir($ao_ccss_dir)) {
             // fixme: should check for subdirs when in multisite and remove contents of those as well.
-            array_map( 'unlink', glob( $ao_ccss_dir . '*.{css,html,json,log,zip,lock}', GLOB_BRACE ) );
-            rmdir( $ao_ccss_dir );
+            array_map('unlink', glob($ao_ccss_dir.'*.{css,html,json,log,zip,lock}', GLOB_BRACE));
+            rmdir($ao_ccss_dir);
         }
     }
 
     public static function on_deactivation()
     {
-        if ( is_multisite() && is_network_admin() ) {
+        if (is_multisite() && is_network_admin()) {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 autoptimizeMain::remove_cronjobs();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         } else {
             autoptimizeMain::remove_cronjobs();
         }
@@ -652,9 +652,9 @@ 
 
     public static function remove_cronjobs() {
         // Remove scheduled events.
-        foreach ( array( 'ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance' ) as $_event ) {
-            if ( wp_get_schedule( $_event ) ) {
-                wp_clear_scheduled_hook( $_event );
+        foreach (array('ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance') as $_event) {
+            if (wp_get_schedule($_event)) {
+                wp_clear_scheduled_hook($_event);
             }
         }
     }
@@ -663,36 +663,36 @@ 
     {
         echo '<div class="error"><p>';
         // Translators: %s is the cache directory location.
-        printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+        printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
         echo '</p></div>';
     }
 
     public static function notice_installed()
     {
         echo '<div class="updated"><p>';
-        _e( 'Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+        _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_updated()
     {
         echo '<div class="updated"><p>';
-        _e( 'Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+        _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_plug_imgopt()
     {
         // Translators: the URL added points to the Autopmize Extra settings.
-        $_ao_imgopt_plug_notice      = sprintf( __( 'Did you know Autoptimize includes on-the-fly image optimization (with support for WebP and AVIF) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>' );
-        $_ao_imgopt_plug_notice      = apply_filters( 'autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice );
+        $_ao_imgopt_plug_notice      = sprintf(__('Did you know Autoptimize includes on-the-fly image optimization (with support for WebP and AVIF) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>');
+        $_ao_imgopt_plug_notice      = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice);
         $_ao_imgopt_launch_ok        = autoptimizeImages::launch_ok_wrapper();
         $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123';
         $_ao_imgopt_active           = autoptimizeImages::imgopt_active();
-        $_is_ao_settings_page        = ( str_replace( array( 'autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners' ), '', $_SERVER['REQUEST_URI'] ) !== $_SERVER['REQUEST_URI'] ? true : false );
+        $_is_ao_settings_page        = (str_replace(array('autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners'), '', $_SERVER['REQUEST_URI']) !== $_SERVER['REQUEST_URI'] ? true : false);
 
-        if ( current_user_can( 'manage_options' ) && $_is_ao_settings_page && '' !== $_ao_imgopt_plug_notice && ! $_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active( $_ao_imgopt_plug_dismissible ) ) {
-            echo '<div class="notice notice-info is-dismissible" data-dismissible="' . $_ao_imgopt_plug_dismissible . '"><p>';
+        if (current_user_can('manage_options') && $_is_ao_settings_page && '' !== $_ao_imgopt_plug_notice && !$_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active($_ao_imgopt_plug_dismissible)) {
+            echo '<div class="notice notice-info is-dismissible" data-dismissible="'.$_ao_imgopt_plug_dismissible.'"><p>';
             echo $_ao_imgopt_plug_notice;
             echo '</p></div>';
         }

classes/critcss-inc/admin_settings_rules.php

Spacing +70 added lines, -70 removed lines

@@ -13,12 +13,12 @@ 
 ?>
     <ul id="rules-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle"><?php _e( 'Rules', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle"><?php _e('Rules', 'autoptimize'); ?></h2>
 
             <!-- BEGIN Rule dialogs -->
             <!-- Unsaved dialog -->
             <div id="unSavedWarning" class="hidden updated settings-error notice notice-warning is-dismissible">
-                <p><?php _e( "<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize' ); ?></p>
+                <p><?php _e("<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize'); ?></p>
             </div>
 
             <!-- Create/edit rule dialog -->
@@ -26,97 +26,97 @@ 
                 <table class="form-table rules">
                     <tr id="critcss_addedit_type_wrapper">
                         <th scope="row">
-                            <?php _e( 'Rule Type', 'autoptimize' ); ?>
+                            <?php _e('Rule Type', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_type" style="width:100%;">
-                                <option value="paths"><?php _e( 'Path', 'autoptimize' ); ?></option>
-                                <option value="types"><?php _e( 'Conditional Tag', 'autoptimize' ); ?></option>
+                                <option value="paths"><?php _e('Path', 'autoptimize'); ?></option>
+                                <option value="types"><?php _e('Conditional Tag', 'autoptimize'); ?></option>
                             </select>
                         </td>
                     </tr>
                     <tr id="critcss_addedit_path_wrapper">
                         <th scope="row">
-                            <?php _e( 'String in Path', 'autoptimize' ); ?>
+                            <?php _e('String in Path', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e( "Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize' ); ?>" style="width:100%;" value="">
+                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e("Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize'); ?>" style="width:100%;" value="">
                         </td>
                     </tr>
                     <tr id="critcss_addedit_pagetype_wrapper">
                         <th scope="row">
-                            <?php _e( 'Conditional Tag, Custom Post Type or Page Template', 'autoptimize' ); ?>
+                            <?php _e('Conditional Tag, Custom Post Type or Page Template', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_pagetype" style="width:100%;">
-                                <option value="" disabled selected><?php _e( 'Select from the list below...', 'autoptimize' ); ?></option>
-                                <optgroup label="<?php _e( 'Standard Conditional Tags', 'autoptimize' ); ?>">
+                                <option value="" disabled selected><?php _e('Select from the list below...', 'autoptimize'); ?></option>
+                                <optgroup label="<?php _e('Standard Conditional Tags', 'autoptimize'); ?>">
                                     <?php
                                     // Render grouped simple conditional tags.
-                                    foreach ( $ao_ccss_types as $ctag ) {
-                                        $optgrp = substr( $ctag, 0, 3 );
-                                        if ( substr( $ctag, 0, 3 ) === 'is_' ) {
-                                            echo '<option value="' . $ctag . '">' . $ctag . '</option>';
+                                    foreach ($ao_ccss_types as $ctag) {
+                                        $optgrp = substr($ctag, 0, 3);
+                                        if (substr($ctag, 0, 3) === 'is_') {
+                                            echo '<option value="'.$ctag.'">'.$ctag.'</option>';
                                         }
-                                        $prevgrp = substr( $ctag, 0, 3 );
+                                        $prevgrp = substr($ctag, 0, 3);
                                     }
 
                                     // Render grouped custom post types, templates and specific conditional tags.
-                                    foreach ( $ao_ccss_types as $type ) {
-                                        $optgrp = substr( $type, 0, 3 );
+                                    foreach ($ao_ccss_types as $type) {
+                                        $optgrp = substr($type, 0, 3);
 
                                         // Option groups labels.
-                                        if ( $optgrp !== $prevgrp && 'is_' !== $optgrp ) {
+                                        if ($optgrp !== $prevgrp && 'is_' !== $optgrp) {
                                             ?>
                                             </optgroup>
                                             <?php
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
+                                            if (substr($type, 0, 12) === 'custom_post_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Custom Post Types', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Custom Post Types', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
+                                            } elseif (substr($type, 0, 9) === 'template_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Page Templates', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Page Templates', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'bbp_' ) {
+                                            } elseif (substr($type, 0, 4) === 'bbp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BBPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BBPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 3 ) === 'bp_' ) {
+                                            } elseif (substr($type, 0, 3) === 'bp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BuddyPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BuddyPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Easy Digital Downloads Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Easy Digital Downloads Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'WooCommerce Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('WooCommerce Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
                                             }
                                         }
 
                                         // Options.
-                                        if ( 'is_' !== $optgrp ) {
+                                        if ('is_' !== $optgrp) {
                                             // Remove prefix from custom post types, templates and some specific conditional tags.
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
-                                                $_type = str_replace( 'custom_post_', '', $type );
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
-                                                $_type = str_replace( 'template_', '', $type );
-                                            } elseif ( 'bbp_is_bbpress' == $type ) {
-                                                $_type = str_replace( 'bbp_', '', $type );
-                                            } elseif ( 'bp_is_buddypress' == $type ) {
-                                                $_type = str_replace( 'bp_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
-                                                $_type = str_replace( 'woo_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
-                                                $_type = str_replace( 'edd_', '', $type );
+                                            if (substr($type, 0, 12) === 'custom_post_') {
+                                                $_type = str_replace('custom_post_', '', $type);
+                                            } elseif (substr($type, 0, 9) === 'template_') {
+                                                $_type = str_replace('template_', '', $type);
+                                            } elseif ('bbp_is_bbpress' == $type) {
+                                                $_type = str_replace('bbp_', '', $type);
+                                            } elseif ('bp_is_buddypress' == $type) {
+                                                $_type = str_replace('bp_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
+                                                $_type = str_replace('woo_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
+                                                $_type = str_replace('edd_', '', $type);
                                             } else {
                                                 $_type = $type;
                                             }
 
-                                            echo '<option value="' . $type . '">' . $_type . '</option>';
+                                            echo '<option value="'.$type.'">'.$_type.'</option>';
                                             $prevgrp = $optgrp;
                                         }
                                     }
@@ -127,10 +127,10 @@ 
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Custom Critical CSS', 'autoptimize' ); ?>
+                            <?php _e('Custom Critical CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your specific critical CSS here and hit submit to save.', 'autoptimize' ); ?>"></textarea>
+                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e('Paste your specific critical CSS here and hit submit to save.', 'autoptimize'); ?>"></textarea>
                             <input type="hidden" id="critcss_addedit_file">
                             <input type="hidden" id="critcss_addedit_id">
                         </td>
@@ -139,23 +139,23 @@ 
             </div>
 
             <!-- Remove dialog -->
-            <div id="confirm-rm" title="<?php _e( 'Delete Rule', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm" title="<?php _e('Delete Rule', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Remove All dialog -->
-            <div id="confirm-rm-all" title="<?php _e( 'Delete all Rules and Jobs', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm-all" title="<?php _e('Delete all Rules and Jobs', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Add/edit default critical CSS dialog -->
             <div id="default_critcss_wrapper" class="hidden">
-                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Add/edit additional critical CSS dialog -->
             <div id="additional_critcss_wrapper" class="hidden">
-                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Wrapper for in screen notices -->
@@ -165,38 +165,38 @@ 
             <!-- BEGIN Rules UI -->
             <div class="howto">
                 <div class="title-wrap">
-                    <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize' ); ?></h4>
-                    <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
+                    <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize'); ?></h4>
+                    <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
                 </div>
                 <button type="button" class="toggle-btn">
                     <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                 </button>
                 <div class="howto-wrap hidden">
-                <p><?php _e( "TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize' ); ?></p>
+                <p><?php _e("TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize'); ?></p>
                     <ol>
-                        <li><?php _e( 'When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( "If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% guaranteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize' ); ?></li>
-                        <li><?php _e( 'At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize' ); ?></li>
+                        <li><?php _e('When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize'); ?></li>
+                        <li><?php _e('Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize'); ?></li>
+                        <li><?php _e('These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize'); ?></li>
+                        <li><?php _e('If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize'); ?></li>
+                        <li><?php _e('You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize'); ?></li>
+                        <li><?php _e('You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize'); ?></li>
+                        <li><?php _e("If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% guaranteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize'); ?></li>
+                        <li><?php _e('At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize'); ?></li>
                     </ol>
                 </div>
             </div>
-            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_css_defer_inline', '' ); ?></textarea>
-            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_ccss_additional', '' ); ?></textarea>
+            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_css_defer_inline', ''); ?></textarea>
+            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_ccss_additional', ''); ?></textarea>
             <table class="rules-list" cellspacing="0"><tbody id="rules-list"></tbody></table>
-            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo ( json_encode( $ao_ccss_rules, JSON_FORCE_OBJECT ) ); ?>'>
+            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo (json_encode($ao_ccss_rules, JSON_FORCE_OBJECT)); ?>'>
             <div class="submit rules-btn">
                 <div class="alignleft">
-                    <span id="addCritCssButton" class="button-secondary"><?php _e( 'Add New Rule', 'autoptimize' ); ?></span>
-                    <span id="editDefaultButton" class="button-secondary"><?php _e( 'Edit Default Rule CSS', 'autoptimize' ); ?></span>
-                    <span id="editAdditionalButton" class="button-secondary"><?php _e( 'Add CSS To All Rules', 'autoptimize' ); ?></span>
+                    <span id="addCritCssButton" class="button-secondary"><?php _e('Add New Rule', 'autoptimize'); ?></span>
+                    <span id="editDefaultButton" class="button-secondary"><?php _e('Edit Default Rule CSS', 'autoptimize'); ?></span>
+                    <span id="editAdditionalButton" class="button-secondary"><?php _e('Add CSS To All Rules', 'autoptimize'); ?></span>
                 </div>
                 <div class="alignright">
-                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e( 'Remove all rules', 'autoptimize' ); ?></span>
+                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e('Remove all rules', 'autoptimize'); ?></span>
                 </div>
             </div>
             <!-- END Rules UI -->

classes/critcss-inc/admin_settings_adv.php

Spacing +33 added lines, -33 removed lines

@@ -19,7 +19,7 @@ 
     global $ao_ccss_unloadccss;
 
     // In case domain is not set yet (done in cron.php).
-    if ( empty( $ao_ccss_domain ) ) {
+    if (empty($ao_ccss_domain)) {
         $ao_ccss_domain = get_site_url();
     }
 
@@ -28,7 +28,7 @@ 
 ?>
     <ul id="adv-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'Advanced Settings', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle fleft"><?php _e('Advanced Settings', 'autoptimize'); ?></h2>
             <button type="button" class="toggle-btn">
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
             </button>
@@ -36,114 +36,114 @@ 
                 <table id="key" class="form-table">
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Viewport Size', 'autoptimize' ); ?>
+                            <?php _e('Viewport Size', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <label for="autoptimize_ccss_vw"><?php _e( 'Width', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
-                            <label for="autoptimize_ccss_vh"><?php _e( 'Height', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
+                            <label for="autoptimize_ccss_vw"><?php _e('Width', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
+                            <label for="autoptimize_ccss_vh"><?php _e('Height', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
                             <p class="notes">
-                                <?php _e( '<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize' ); ?>
+                                <?php _e('<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force Include CSS selectors', 'autoptimize' ); ?>
+                            <?php _e('Force Include CSS selectors', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e( '.button-special,//#footer', 'autoptimize' ); ?>"><?php echo trim( $ao_ccss_finclude ); ?></textarea>
+                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e('.button-special,//#footer', 'autoptimize'); ?>"><?php echo trim($ao_ccss_finclude); ?></textarea>
                             <p class="notes">
-                                <?php _e( 'Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize' ); ?>
+                                <?php _e('Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Queue processing time limit', 'autoptimize' ); ?>
+                            <?php _e('Queue processing time limit', 'autoptimize'); ?>
                         </th>
                         <td>
                             <input type="number" id="autoptimize_ccss_rtimelimit" name="autoptimize_ccss_rtimelimit" min="0" max="240" placeholder="0" value="<?php echo $ao_ccss_rtimelimit; ?>" />
                             <p class="notes">
-                                <?php _e( 'The cronned queue processing is an asynchronous process triggerd by (WordPress) cron. To avoid this process from running too long and potentially getting killed, you can set the number of seconds here, 0 means no limit.', 'autoptimize' ); ?>
+                                <?php _e('The cronned queue processing is an asynchronous process triggerd by (WordPress) cron. To avoid this process from running too long and potentially getting killed, you can set the number of seconds here, 0 means no limit.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Fetch Original CSS', 'autoptimize' ); ?>
+                            <?php _e('Fetch Original CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked( 1 == $ao_ccss_noptimize ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked(1 == $ao_ccss_noptimize); ?>>
                             <p class="notes">
-                                <?php _e( 'In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize' ); ?>
+                                <?php _e('In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Add CCSS for logged in users?', 'autoptimize' ); ?>
+                            <?php _e('Add CCSS for logged in users?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked( 1 == $ao_ccss_loggedin ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked(1 == $ao_ccss_loggedin); ?>>
                             <p class="notes">
-                                <?php _e( 'Critical CSS is generated by criticalcss.com from your pages as seen by an "anonymous visitor". Disable this option if you don\'t want the "visitor" critical CSS to be used for logged in users.', 'autoptimize' ); ?>
+                                <?php _e('Critical CSS is generated by criticalcss.com from your pages as seen by an "anonymous visitor". Disable this option if you don\'t want the "visitor" critical CSS to be used for logged in users.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force path-based rules to be generated for pages?', 'autoptimize' ); ?>
+                            <?php _e('Force path-based rules to be generated for pages?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked( 1 == $ao_ccss_forcepath ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked(1 == $ao_ccss_forcepath); ?>>
                             <p class="notes">
-                                <?php _e( 'By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize' ); ?>
+                                <?php _e('By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Defer jQuery and other non-aggregated JS-files?', 'autoptimize' ); ?>
+                            <?php _e('Defer jQuery and other non-aggregated JS-files?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked( 1 == $ao_ccss_deferjquery ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked(1 == $ao_ccss_deferjquery); ?>>
                             <p class="notes">
-                                <?php _e( 'Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize' ); ?>
+                                <?php _e('Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Unload critical CSS after page load?', 'autoptimize' ); ?>
+                            <?php _e('Unload critical CSS after page load?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_unloadccss" name="autoptimize_ccss_unloadccss" value="1" <?php checked( 1 == $ao_ccss_unloadccss ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_unloadccss" name="autoptimize_ccss_unloadccss" value="1" <?php checked(1 == $ao_ccss_unloadccss); ?>>
                             <p class="notes">
-                                <?php _e( 'In rare cases the critical CSS needs to be removed once the full CSS loads, this option makes it so!', 'autoptimize' ); ?>
+                                <?php _e('In rare cases the critical CSS needs to be removed once the full CSS loads, this option makes it so!', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Bound domain', 'autoptimize' ); ?>
+                            <?php _e('Bound domain', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e( 'Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize' ); ?>" value="<?php echo trim( $ao_ccss_domain ); ?>">
+                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e('Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize'); ?>" value="<?php echo trim($ao_ccss_domain); ?>">
                             <p class="notes">
-                                <?php _e( 'Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize' ); ?>
+                                <?php _e('Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Debug Mode', 'autoptimize' ); ?>
+                            <?php _e('Debug Mode', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked( 1 == $ao_ccss_debug ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked(1 == $ao_ccss_debug); ?>>
                             <p class="notes">
                                 <?php
-                                _e( '<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize' );
-                                echo '<code>' . AO_CCSS_LOG . '</code>';
+                                _e('<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize');
+                                echo '<code>'.AO_CCSS_LOG.'</code>';
                                 ?>
                             </p>
                         </td>

classes/autoptimizeHTML.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Handles minifying HTML markup.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -34,19 +34,19 @@ 
         '<!--/noindex-->',
     );
 
-    public function read( $options )
+    public function read($options)
     {
         // Remove the HTML comments?
         $this->keepcomments = (bool) $options['keepcomments'];
 
         // Filter to force xhtml.
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
 
         // Filterable strings to be excluded from HTML minification.
-        $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' );
-        if ( '' !== $exclude ) {
-            $exclude_arr   = array_filter( array_map( 'trim', explode( ',', $exclude ) ) );
-            $this->exclude = array_merge( $exclude_arr, $this->exclude );
+        $exclude = apply_filters('autoptimize_filter_html_exclude', '');
+        if ('' !== $exclude) {
+            $exclude_arr   = array_filter(array_map('trim', explode(',', $exclude)));
+            $this->exclude = array_merge($exclude_arr, $this->exclude);
         }
 
         // Nothing else for HTML!
@@ -60,49 +60,49 @@ 
      */
     public function minify()
     {
-        $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ( $noptimize ) {
+        $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
+        if ($noptimize) {
             return false;
         }
 
         // Wrap the to-be-excluded strings in noptimize tags.
-        foreach ( $this->exclude as $str ) {
-            if ( false !== strpos( $this->content, $str ) ) {
-                $replacement   = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-                $this->content = str_replace( $str, $replacement, $this->content );
+        foreach ($this->exclude as $str) {
+            if (false !== strpos($this->content, $str)) {
+                $replacement   = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+                $this->content = str_replace($str, $replacement, $this->content);
             }
         }
 
         // Noptimize.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Preparing options for Minify_HTML.
-        $options = array( 'keepComments' => $this->keepcomments );
-        if ( $this->forcexhtml ) {
+        $options = array('keepComments' => $this->keepcomments);
+        if ($this->forcexhtml) {
             $options['xhtml'] = true;
         }
 
-        $tmp_content = AO_Minify_HTML::minify( $this->content, $options );
-        if ( ! empty( $tmp_content ) ) {
+        $tmp_content = AO_Minify_HTML::minify($this->content, $options);
+        if (!empty($tmp_content)) {
             $this->content = $tmp_content;
-            unset( $tmp_content );
+            unset($tmp_content);
         }
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Remove the noptimize-wrapper from around the excluded strings.
-        foreach ( $this->exclude as $str ) {
-            $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-            if ( false !== strpos( $this->content, $replacement ) ) {
-                $this->content = str_replace( $replacement, $str, $this->content );
+        foreach ($this->exclude as $str) {
+            $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+            if (false !== strpos($this->content, $replacement)) {
+                $this->content = str_replace($replacement, $str, $this->content);
             }
         }
 
         // Revslider data attribs somehow suffer from HTML optimization, this fixes that!
-        if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) {
-            $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content );
-            $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content );
+        if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+            $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+            $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
         }
 
         return true;

classes/autoptimizeCriticalCSSCron.php

Spacing +254 added lines, -254 removed lines

@@ -4,7 +4,7 @@ 
  * processes the queue, submitting jobs to criticalcss.com and retrieving generated CSS from criticalcss.com and saving rules.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,23 +13,23 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
 
         // Add queue control to a registered event.
-        add_action( 'ao_ccss_queue', array( $this, 'ao_ccss_queue_control' ) );
+        add_action('ao_ccss_queue', array($this, 'ao_ccss_queue_control'));
         // Add cleaning job to a registered event.
-        add_action( 'ao_ccss_maintenance', array( $this, 'ao_ccss_cleaning' ) );
+        add_action('ao_ccss_maintenance', array($this, 'ao_ccss_cleaning'));
     }
 
     public function ao_ccss_queue_control() {
         // The queue execution backend.
         global $ao_ccss_key;
-        if ( ! isset( $ao_ccss_key ) || empty( $ao_ccss_key ) ) {
+        if (!isset($ao_ccss_key) || empty($ao_ccss_key)) {
             // no key set, not processing the queue!
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No key set, so not processing queue.', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No key set, so not processing queue.', 3);
             return;
         }
 
@@ -50,35 +50,35 @@ 
          *    When properly set, queue will always finish a job with the declared settings above regardless of the real API responses.
          */
         $queue_debug = false;
-        if ( file_exists( AO_CCSS_DEBUG ) ) {
-            $qdobj_raw = file_get_contents( AO_CCSS_DEBUG );
-            $qdobj     = json_decode( $qdobj_raw, true );
-            if ( $qdobj ) {
-                if ( 1 === $qdobj['enable'] ) {
+        if (file_exists(AO_CCSS_DEBUG)) {
+            $qdobj_raw = file_get_contents(AO_CCSS_DEBUG);
+            $qdobj     = json_decode($qdobj_raw, true);
+            if ($qdobj) {
+                if (1 === $qdobj['enable']) {
                     $queue_debug = true;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue operating in debug mode with the following settings: <' . $qdobj_raw . '>', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue operating in debug mode with the following settings: <'.$qdobj_raw.'>', 3);
                 }
             }
         }
 
         // Set some default values for $qdobj to avoid function call warnings.
-        if ( ! $queue_debug ) {
+        if (!$queue_debug) {
             $qdobj['htcode'] = false;
         }
 
         // Check if queue is already running.
         $queue_lock = false;
-        if ( file_exists( AO_CCSS_LOCK ) ) {
+        if (file_exists(AO_CCSS_LOCK)) {
             $queue_lock = true;
         }
 
         // Proceed with the queue if it's not already running.
-        if ( ! $queue_lock ) {
+        if (!$queue_lock) {
 
             // Log queue start and create the lock file.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control started', 3 );
-            if ( touch( AO_CCSS_LOCK ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control locked', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control started', 3);
+            if (touch(AO_CCSS_LOCK)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control locked', 3);
             }
 
             // Attach required variables.
@@ -86,45 +86,45 @@ 
             global $ao_ccss_rtimelimit;
 
             // Initialize counters.
-            if ( $ao_ccss_rtimelimit == 0 ) {
+            if ($ao_ccss_rtimelimit == 0) {
                 // no time limit set, let's go with 1000 seconds.
                 $ao_ccss_rtimelimit = 1000;
             }
             $mt = time() + $ao_ccss_rtimelimit; // maxtime queue processing can run.
             $jc = 1; // job count number.
             $jr = 1; // jobs requests number.
-            $jt = count( $ao_ccss_queue ); // number of jobs in queue.
+            $jt = count($ao_ccss_queue); // number of jobs in queue.
 
             // Sort queue by ascending job status (e.g. ERROR, JOB_ONGOING, JOB_QUEUED, NEW...).
-            array_multisort( array_column( $ao_ccss_queue, 'jqstat' ), $ao_ccss_queue ); // @codingStandardsIgnoreLine
+            array_multisort(array_column($ao_ccss_queue, 'jqstat'), $ao_ccss_queue); // @codingStandardsIgnoreLine
 
             // Iterates over the entire queue.
-            foreach ( $ao_ccss_queue as $path => $jprops ) {
+            foreach ($ao_ccss_queue as $path => $jprops) {
                 // Prepare flags and target rule.
                 $update      = false;
                 $deljob      = false;
                 $rule_update = false;
                 $oldccssfile = false;
-                $trule       = explode( '|', $jprops['rtarget'] );
+                $trule       = explode('|', $jprops['rtarget']);
 
                 // Log job count.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Processing job ' . $jc . ' of ' . $jt . ' with id <' . $jprops['ljid'] . '> and status <' . $jprops['jqstat'] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Processing job '.$jc.' of '.$jt.' with id <'.$jprops['ljid'].'> and status <'.$jprops['jqstat'].'>', 3);
 
                 // Process NEW jobs.
-                if ( 'NEW' == $jprops['jqstat'] ) {
+                if ('NEW' == $jprops['jqstat']) {
 
                     // Log the new job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found NEW job with local ID <' . $jprops['ljid'] . '>, starting its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found NEW job with local ID <'.$jprops['ljid'].'>, starting its queue processing', 3);
 
                     // Compare job and rule hashes (if any).
-                    $hash = $this->ao_ccss_diff_hashes( $jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget'] );
+                    $hash = $this->ao_ccss_diff_hashes($jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget']);
 
                     // If job hash is new or different of a previous one.
-                    if ( $hash ) {
-                        if ( $jr > 2 ) {
+                    if ($hash) {
+                        if ($jr > 2) {
                             // we already posted 2 jobs to criticalcss.com, don't post more this run
                             // but we can keep on processing the queue to keep it tidy.
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Holding off on generating request for job with local ID <' . $jprops['ljid'] . '>, maximum number of POSTS reached.', 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Holding off on generating request for job with local ID <'.$jprops['ljid'].'>, maximum number of POSTS reached.', 3);
                             continue;
                         }
 
@@ -132,182 +132,182 @@ 
                         $jprops['hash'] = $hash;
 
                         // Dispatch the job generate request and increment request count.
-                        $apireq = $this->ao_ccss_api_generate( $path, $queue_debug, $qdobj['htcode'] );
+                        $apireq = $this->ao_ccss_api_generate($path, $queue_debug, $qdobj['htcode']);
                         $jr++;
 
                         // NOTE: All the following conditions maps to the ones in admin_settings_queue.js.php.
-                        if ( 'JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status'] ) {
+                        if ('JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status']) {
                             // SUCCESS: request has a valid result.
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request successful, remote id <' . $jprops['jid'] . '>, status now is <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request successful, remote id <'.$jprops['jid'].'>, status now is <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('STATUS_JOB_BAD' == $apireq['job']['status']) {
                             // ERROR: concurrent requests
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
-                            if ( $apireq['job']['error'] ) {
+                            if ($apireq['job']['error']) {
                                 $jprops['jrstat'] = $apireq['job']['error'];
                             } else {
                                 $jprops['jrstat'] = 'Baby did a bad bad thing';
                             }
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Concurrent requests when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'INVALID_JWT_TOKEN' == $apireq['errorCode'] ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Concurrent requests when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('INVALID_JWT_TOKEN' == $apireq['errorCode']) {
                             // ERROR: key validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['errorCode'];
                             $jprops['jrstat'] = $apireq['error'];
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'API key validation error when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( empty( $apireq ) ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('API key validation error when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif (empty($apireq)) {
                             // ERROR: no response
                             // Update job properties.
                             $jprops['jqstat'] = 'NO_RESPONSE';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                         } else {
                             // UNKNOWN: unhandled generate exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
                     } else {
                         // SUCCESS: Job hash is equal to a previous one, so it's done
                         // Update job status and finish time.
                         $jprops['jqstat'] = 'JOB_DONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> requires no further processing, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> requires no further processing, status now is <'.$jprops['jqstat'].'>', 3);
                     }
 
                     // Set queue update flag.
                     $update = true;
 
-                } elseif ( 'JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat'] ) {
+                } elseif ('JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat']) {
                     // Process QUEUED and ONGOING jobs
                     // Log the pending job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found PENDING job with local ID <' . $jprops['ljid'] . '>, continuing its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found PENDING job with local ID <'.$jprops['ljid'].'>, continuing its queue processing', 3);
 
                     // Dispatch the job result request and increment request count.
-                    $apireq = $this->ao_ccss_api_results( $jprops['jid'], $queue_debug, $qdobj['htcode'] );
+                    $apireq = $this->ao_ccss_api_results($jprops['jid'], $queue_debug, $qdobj['htcode']);
 
                     // NOTE: All the following condigitons maps to the ones in admin_settings_queue.js.php
                     // Replace API response values if queue debugging is enabled and some value is set.
-                    if ( $queue_debug ) {
-                        if ( $qdobj['status'] ) {
+                    if ($queue_debug) {
+                        if ($qdobj['status']) {
                             $apireq['status'] = $qdobj['status'];
                         }
-                        if ( $qdobj['resultStatus'] ) {
+                        if ($qdobj['resultStatus']) {
                             $apireq['resultStatus'] = $qdobj['resultStatus'];
                         }
-                        if ( $qdobj['validationStatus'] ) {
+                        if ($qdobj['validationStatus']) {
                             $apireq['validationStatus'] = $qdobj['validationStatus'];
                         }
                     }
 
-                    if ( 'JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status'] ) {
+                    if ('JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status']) {
                         // SUCCESS: request has a valid result
                         // Process a PENDING job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['status'];
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '> unchanged', 3 );
-                    } elseif ( 'JOB_DONE' == $apireq['status'] ) {
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'> unchanged', 3);
+                    } elseif ('JOB_DONE' == $apireq['status']) {
                         // Process a DONE job
                         // New resultStatus from ccss.com "HTML_404", consider as "GOOD" for now.
-                        if ( 'HTML_404' == $apireq['resultStatus'] ) {
+                        if ('HTML_404' == $apireq['resultStatus']) {
                             $apireq['resultStatus'] = 'GOOD';
                         }
 
-                        if ( 'GOOD' == $apireq['resultStatus'] && ( 'GOOD' == $apireq['validationStatus'] || 'WARN' == $apireq['validationStatus'] ) ) {
+                        if ('GOOD' == $apireq['resultStatus'] && ('GOOD' == $apireq['validationStatus'] || 'WARN' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with GOOD or WARN validation
                             // Update job properties.
-                            $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, false );
+                            $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, false);
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
+                            $jprops['jftime'] = microtime(true);
                             $rule_update      = true;
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '>, file saved <' . $jprops['file'] . '>', 3 );
-                        } elseif ( 'GOOD' == $apireq['resultStatus'] && ( 'BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'] ) ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'>, file saved <'.$jprops['file'].'>', 3);
+                        } elseif ('GOOD' == $apireq['resultStatus'] && ('BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with BAD or SCREENSHOT_WARN_BLANK validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            if ( apply_filters( 'autoptimize_filter_ccss_save_review_rules', true ) ) {
-                                $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, true );
+                            $jprops['jftime'] = microtime(true);
+                            if (apply_filters('autoptimize_filter_ccss_save_review_rules', true)) {
+                                $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, true);
                                 $rule_update      = true;
-                                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file saved <' . $jprops['file'] . '> but requires REVIEW', 3 );
+                                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file saved <'.$jprops['file'].'> but requires REVIEW', 3);
                             } else {
-                                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file not saved because it required REVIEW.', 3 );
+                                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file not saved because it required REVIEW.', 3);
                             }
-                        } elseif ( 'GOOD' != $apireq['resultStatus'] && ( 'GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'] ) ) {
+                        } elseif ('GOOD' != $apireq['resultStatus'] && ('GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'])) {
                             // ERROR: no GOOD, WARN or BAD results
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         } else {
                             // UNKNOWN: unhandled JOB_DONE exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job is UNKNOWN, status now is <' . $jprops['jqstat'] . '>', 2 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job is UNKNOWN, status now is <'.$jprops['jqstat'].'>', 2);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
-                    } elseif ( 'JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                    } elseif ('JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status']) {
                         // ERROR: failed job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['job']['status'];
-                        if ( $apireq['job']['error'] ) {
+                        if ($apireq['job']['error']) {
                             $jprops['jrstat'] = $apireq['job']['error'];
                         } else {
                             $jprops['jrstat'] = 'Baby did a bad bad thing';
                         }
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( 'This css no longer exists. Please re-generate it.' == $apireq['error'] ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif ('This css no longer exists. Please re-generate it.' == $apireq['error']) {
                         // ERROR: CSS doesn't exist
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_CSS';
                         $jprops['jrstat'] = $apireq['error'];
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( empty( $apireq ) ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif (empty($apireq)) {
                         // ERROR: no response
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_RESPONSE';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                     } else {
                         // UNKNOWN: unhandled results exception
                         // Update job properties.
                         $jprops['jqstat'] = 'JOB_UNKNOWN';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
                     }
 
                     // Set queue update flag.
@@ -315,40 +315,40 @@ 
                 }
 
                 // Mark DONE jobs for removal.
-                if ( 'JOB_DONE' == $jprops['jqstat'] ) {
+                if ('JOB_DONE' == $jprops['jqstat']) {
                     $update = true;
                     $deljob = true;
                 }
 
                 // Persist updated queue object.
-                if ( $update ) {
-                    if ( ! $deljob ) {
+                if ($update) {
+                    if (!$deljob) {
                         // Update properties of a NEW or PENDING job...
-                        $ao_ccss_queue[ $path ] = $jprops;
+                        $ao_ccss_queue[$path] = $jprops;
                     } else {
                         // ...or remove the DONE job.
-                        unset( $ao_ccss_queue[ $path ] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> is DONE and was removed from the queue', 3 );
+                        unset($ao_ccss_queue[$path]);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> is DONE and was removed from the queue', 3);
                     }
 
                     // Update queue object.
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue updated by job id <' . $jprops['ljid'] . '>', 3 );
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue updated by job id <'.$jprops['ljid'].'>', 3);
 
                     // Update target rule.
-                    if ( $rule_update ) {
-                        $this->ao_ccss_rule_update( $jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash'] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> updated the target rule <' . $jprops['rtarget'] . '>', 3 );
+                    if ($rule_update) {
+                        $this->ao_ccss_rule_update($jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash']);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> updated the target rule <'.$jprops['rtarget'].'>', 3);
                     }
                 } else {
                     // Or log no queue action.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Nothing to do on this job', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Nothing to do on this job', 3);
                 }
 
                 // Break the loop if request time limit is (almost exceeded).
-                if ( time() > $mt ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'The time limit of ' . $ao_ccss_rtimelimit . ' seconds was exceeded, queue control must finish now', 3 );
+                if (time() > $mt) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('The time limit of '.$ao_ccss_rtimelimit.' seconds was exceeded, queue control must finish now', 3);
                     break;
                 }
 
@@ -357,46 +357,46 @@ 
             }
 
             // Remove the lock file and log the queue end.
-            if ( file_exists( AO_CCSS_LOCK ) ) {
-                unlink( AO_CCSS_LOCK );
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control unlocked', 3 );
+            if (file_exists(AO_CCSS_LOCK)) {
+                unlink(AO_CCSS_LOCK);
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control unlocked', 3);
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control finished', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control finished', 3);
 
             // Log that queue is locked.
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue is already running, skipping the attempt to run it again', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue is already running, skipping the attempt to run it again', 3);
         }
     }
 
-    public function ao_ccss_diff_hashes( $ljid, $hash, $hashes, $rule ) {
+    public function ao_ccss_diff_hashes($ljid, $hash, $hashes, $rule) {
         // Compare job hashes
         // STEP 1: update job hashes.
-        if ( 1 == count( $hashes ) ) {
+        if (1 == count($hashes)) {
             // Job with a single hash
             // Set job hash.
             $hash = $hashes[0];
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with SINGLE hash <' . $hash . '>', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with SINGLE hash <'.$hash.'>', 3);
         } else {
             // Job with multiple hashes
             // Loop through hashes to concatenate them.
             $nhash = '';
-            foreach ( $hashes as $shash ) {
+            foreach ($hashes as $shash) {
                 $nhash .= $shash;
             }
 
             // Set job hash.
-            $hash = md5( $nhash );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with a COMPOSITE hash <' . $hash . '>', 3 );
+            $hash = md5($nhash);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with a COMPOSITE hash <'.$hash.'>', 3);
         }
 
         // STEP 2: compare job to existing jobs to prevent double submission for same type+hash.
         global $ao_ccss_queue;
 
-        foreach ( $ao_ccss_queue as $queue_item ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Comparing <' . $rule . $hash . '> with <' . $queue_item['rtarget'] . $queue_item['hash'] . '>', 3 );
-            if ( $queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array( $queue_item['jqstat'], array( 'JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE' ) ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the already pending job <' . $queue_item['ljid'] . '>', 3 );
+        foreach ($ao_ccss_queue as $queue_item) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Comparing <'.$rule.$hash.'> with <'.$queue_item['rtarget'].$queue_item['hash'].'>', 3);
+            if ($queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array($queue_item['jqstat'], array('JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE'))) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the already pending job <'.$queue_item['ljid'].'>', 3);
                 return false;
             }
         }
@@ -406,32 +406,32 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule = explode( '|', $rule );
-        $srule = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule = explode('|', $rule);
+        $srule = $ao_ccss_rules[$trule[0]][$trule[1]];
 
         // Check if a MANUAL rule exist and return false.
-        if ( ! empty( $srule ) && ( 0 == $srule['hash'] && 0 != $srule['file'] ) ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the MANUAL rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+        if (!empty($srule) && (0 == $srule['hash'] && 0 != $srule['file'])) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the MANUAL rule <'.$trule[0].'|'.$trule[1].'>', 3);
             return false;
-        } elseif ( ! empty( $srule ) ) {
+        } elseif (!empty($srule)) {
             // Check if an AUTO rule exist.
-            if ( $hash === $srule['hash'] && is_file( AO_CCSS_DIR . $srule['file'] ) && 0 != filesize( AO_CCSS_DIR . $srule['file'] ) ) {
+            if ($hash === $srule['hash'] && is_file(AO_CCSS_DIR.$srule['file']) && 0 != filesize(AO_CCSS_DIR.$srule['file'])) {
                 // Check if job hash matches rule, if the CCSS file exists said file is not empty and return FALSE is so.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> MATCH the one in rule <'.$trule[0].'|'.$trule[1].'>', 3);
                 return false;
             } else {
                 // Or return the new hash if they differ.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> DOES NOT MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '> or rule\'s CCSS file was invalid.', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> DOES NOT MATCH the one in rule <'.$trule[0].'|'.$trule[1].'> or rule\'s CCSS file was invalid.', 3);
                 return $hash;
             }
         } else {
             // Or just return the hash if no rule exist yet.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> has no rule yet', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> has no rule yet', 3);
             return $hash;
         }
     }
 
-    public function ao_ccss_api_generate( $path, $debug, $dcode ) {
+    public function ao_ccss_api_generate($path, $debug, $dcode) {
         // POST jobs to criticalcss.com and return responses
         // Get key and key status.
         global $ao_ccss_key;
@@ -443,35 +443,35 @@ 
         global $ao_ccss_noptimize;
 
         $site_host = get_site_url();
-        $site_path = parse_url( $site_host, PHP_URL_PATH );
+        $site_path = parse_url($site_host, PHP_URL_PATH);
 
-        if ( ! empty( $site_path ) ) {
-            $site_host = str_replace( $site_path, '', $site_host );
+        if (!empty($site_path)) {
+            $site_host = str_replace($site_path, '', $site_host);
         }
 
         // Logic to bind to one domain to avoid site clones of sites would
         // automatically begin spawning requests to criticalcss.com which has
         // a per domain cost.
         global $ao_ccss_domain;
-        if ( empty( $ao_ccss_domain ) ) {
+        if (empty($ao_ccss_domain)) {
             // first request being done, update option to allow future requests are only allowed if from same domain.
-            update_option( 'autoptimize_ccss_domain', str_rot13( $site_host ) );
-        } elseif ( trim( $ao_ccss_domain, '\'"' ) !== 'none' && parse_url( $site_host, PHP_URL_HOST ) !== parse_url( $ao_ccss_domain, PHP_URL_HOST ) && apply_filters( 'autoptimize_filter_ccss_bind_domain', true ) ) {
+            update_option('autoptimize_ccss_domain', str_rot13($site_host));
+        } elseif (trim($ao_ccss_domain, '\'"') !== 'none' && parse_url($site_host, PHP_URL_HOST) !== parse_url($ao_ccss_domain, PHP_URL_HOST) && apply_filters('autoptimize_filter_ccss_bind_domain', true)) {
             // not the same domain, log as error and return without posting to criticalcss.com.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Request for domain ' . $site_host . ' does not match bound domain ' . $ao_ccss_domain . ' so not proceeding.', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Request for domain '.$site_host.' does not match bound domain '.$ao_ccss_domain.' so not proceeding.', 2);
             return false;
         }
 
-        $src_url = $site_host . $path;
+        $src_url = $site_host.$path;
 
         // Avoid AO optimizations if required by config or avoid lazyload if lazyload is active in AO.
-        if ( ! empty( $ao_ccss_noptimize ) ) {
+        if (!empty($ao_ccss_noptimize)) {
             $src_url .= '?ao_noptirocket=1';
-        } elseif ( class_exists( 'autoptimizeImages', false ) && autoptimizeImages::should_lazyload_wrapper() ) {
+        } elseif (class_exists('autoptimizeImages', false) && autoptimizeImages::should_lazyload_wrapper()) {
             $src_url .= '?ao_nolazy=1';
         }
 
-        $src_url = apply_filters( 'autoptimize_filter_ccss_cron_srcurl', $src_url );
+        $src_url = apply_filters('autoptimize_filter_ccss_cron_srcurl', $src_url);
 
         // Initialize request body.
         $body           = array();
@@ -481,88 +481,88 @@ 
 
         // Prepare and add viewport size to the body if available.
         $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
-        if ( ! empty( $viewport['w'] ) && ! empty( $viewport['h'] ) ) {
+        if (!empty($viewport['w']) && !empty($viewport['h'])) {
             $body['width']  = $viewport['w'];
             $body['height'] = $viewport['h'];
         }
 
         // Prepare and add forceInclude to the body if available.
         global $ao_ccss_finclude;
-        $finclude = $this->ao_ccss_finclude( $ao_ccss_finclude );
-        if ( ! empty( $finclude ) ) {
+        $finclude = $this->ao_ccss_finclude($ao_ccss_finclude);
+        if (!empty($finclude)) {
             $body['forceInclude'] = $finclude;
         }
 
         // Add filter to allow the body array to be altered (e.g. to add customPageHeaders).
-        $body = apply_filters( 'autoptimize_ccss_cron_api_generate_body', $body );
+        $body = apply_filters('autoptimize_ccss_cron_api_generate_body', $body);
 
         // Body must be json and log it.
-        $body = json_encode( $body );
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request body is ' . $body, 3 );
+        $body = json_encode($body);
+        autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request body is '.$body, 3);
 
         // Prepare the request.
-        $url  = esc_url_raw( AO_CCSS_API . 'generate?aover=' . AO_CCSS_VER );
+        $url  = esc_url_raw(AO_CCSS_API.'generate?aover='.AO_CCSS_VER);
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize v' . AO_CCSS_VER,
+                'User-Agent'    => 'Autoptimize v'.AO_CCSS_VER,
                 'Content-type'  => 'application/json; charset=utf-8',
-                'Authorization' => 'JWT ' . $key,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
             'body'    => $body,
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_post( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_post($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
             // Workaround criticalcss.com non-RESTful reponses.
-            if ( 'JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) {
+            if ('JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status']) {
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied successfully', 3);
 
                 // This code also means the key is valid, so cache key status for 24h if not already cached.
-                if ( ( ! $key_status || 2 != $key_status ) && $key ) {
-                    update_option( 'autoptimize_ccss_keyst', 2 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is valid, updating key status', 3 );
+                if ((!$key_status || 2 != $key_status) && $key) {
+                    update_option('autoptimize_ccss_keyst', 2);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is valid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log successful requests with invalid reponses.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return $body;
             }
         } else {
             // Response code is anything else.
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
 
-                if ( 401 == $code ) {
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> has no response, this could be a service timeout', 2 );
-                if ( is_wp_error( $req ) ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( $req->get_error_message(), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> has no response, this could be a service timeout', 2);
+                if (is_wp_error($req)) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log($req->get_error_message(), 2);
                 }
 
                 return false;
@@ -570,76 +570,76 @@ 
         }
     }
 
-    public function ao_ccss_api_results( $jobid, $debug, $dcode ) {
+    public function ao_ccss_api_results($jobid, $debug, $dcode) {
         // GET jobs from criticalcss.com and return responses
         // Get key.
         global $ao_ccss_key;
         $key = $ao_ccss_key;
 
         // Prepare the request.
-        $url  = AO_CCSS_API . 'results?resultId=' . $jobid;
+        $url  = AO_CCSS_API.'results?resultId='.$jobid;
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v' . AO_CCSS_VER,
-                'Authorization' => 'JWT ' . $key,
+                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v'.AO_CCSS_VER,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_get( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_get($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
-            if ( is_array( $body ) && ( array_key_exists( 'status', $body ) || array_key_exists( 'job', $body ) ) && ( 'JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) ) {
+            if (is_array($body) && (array_key_exists('status', $body) || array_key_exists('job', $body)) && ('JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'])) {
                 // Workaround criticalcss.com non-RESTful reponses
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully', 3);
                 return $body;
-            } elseif ( is_array( $body ) && ( array_key_exists( 'error', $body ) && 'This css no longer exists. Please re-generate it.' == $body['error'] ) ) {
+            } elseif (is_array($body) && (array_key_exists('error', $body) && 'This css no longer exists. Please re-generate it.' == $body['error'])) {
                 // Handle no CSS reply
                 // Log no CSS error and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully but the CSS for it does not exist anymore', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully but the CSS for it does not exist anymore', 3);
                 return $body;
             } else {
                 // Log failed request and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return false;
             }
         } else {
             // Response code is anything else
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
-                if ( 401 == $code ) {
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> has no response, this could be a service timeout', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> has no response, this could be a service timeout', 2);
                 return false;
             }
         }
     }
 
-    public function ao_ccss_save_file( $ccss, $target, $review ) {
+    public function ao_ccss_save_file($ccss, $target, $review) {
         // Save critical CSS into the filesystem and return its filename
         // Prepare review mark.
-        if ( $review ) {
+        if ($review) {
             $rmark = '_R';
         } else {
             $rmark = '';
@@ -649,21 +649,21 @@ 
         $filename = false;
         $content  = $ccss;
 
-        if ( autoptimizeCriticalCSSCore::ao_ccss_check_contents( $content ) ) {
+        if (autoptimizeCriticalCSSCore::ao_ccss_check_contents($content)) {
             // Sanitize content, set filename and try to save file.
-            $file     = AO_CCSS_DIR . 'ccss_' . md5( $ccss . $target[1] ) . $rmark . '.css';
-            $status   = file_put_contents( $file, $content, LOCK_EX );
-            $filename = pathinfo( $file, PATHINFO_BASENAME );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file for the rule <' . $target[0] . '|' . $target[1] . '> was saved as <' . $filename . '>, size in bytes is <' . $status . '>', 3 );
+            $file     = AO_CCSS_DIR.'ccss_'.md5($ccss.$target[1]).$rmark.'.css';
+            $status   = file_put_contents($file, $content, LOCK_EX);
+            $filename = pathinfo($file, PATHINFO_BASENAME);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file for the rule <'.$target[0].'|'.$target[1].'> was saved as <'.$filename.'>, size in bytes is <'.$status.'>', 3);
 
-            if ( ! $status ) {
+            if (!$status) {
                 // If file has not been saved, reset filename.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file <' . $filename . '> could not be not saved', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file <'.$filename.'> could not be not saved', 2);
                 $filename = false;
                 return $filename;
             }
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received did not pass content check', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received did not pass content check', 2);
             return $filename;
         }
 
@@ -673,15 +673,15 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $srule   = $ao_ccss_rules[ $target[0] ][ $target[1] ];
+        $srule   = $ao_ccss_rules[$target[0]][$target[1]];
         $oldfile = $srule['file'];
 
-        if ( $oldfile && $oldfile !== $filename ) {
-            $delfile = AO_CCSS_DIR . $oldfile;
-            if ( file_exists( $delfile ) ) {
-                $unlinkst = unlink( $delfile );
-                if ( $unlinkst ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A previous critical CSS file <' . $oldfile . '> was removed for the rule <' . $target[0] . '|' . $target[1] . '>', 3 );
+        if ($oldfile && $oldfile !== $filename) {
+            $delfile = AO_CCSS_DIR.$oldfile;
+            if (file_exists($delfile)) {
+                $unlinkst = unlink($delfile);
+                if ($unlinkst) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A previous critical CSS file <'.$oldfile.'> was removed for the rule <'.$target[0].'|'.$target[1].'>', 3);
                 }
             }
         }
@@ -690,29 +690,29 @@ 
         return $filename;
     }
 
-    public function ao_ccss_rule_update( $ljid, $srule, $file, $hash ) {
+    public function ao_ccss_rule_update($ljid, $srule, $file, $hash) {
         // Update or create a rule
         // Attach required arrays.
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule  = explode( '|', $srule );
-        $rule   = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule  = explode('|', $srule);
+        $rule   = $ao_ccss_rules[$trule[0]][$trule[1]];
         $action = false;
         $rtype  = '';
 
-        if ( 0 === $rule['hash'] && 0 !== $rule['file'] ) {
+        if (0 === $rule['hash'] && 0 !== $rule['file']) {
             // manual rule, don't ever overwrite.
             $action = 'NOT UPDATED';
             $rtype  = 'MANUAL';
-        } elseif ( 0 === $rule['hash'] && 0 === $rule['file'] ) {
+        } elseif (0 === $rule['hash'] && 0 === $rule['file']) {
             // If this is an user created AUTO rule with no hash and file yet, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
             $rule['file'] = $file;
             $action       = 'UPDATED';
             $rtype        = 'AUTO';
-        } elseif ( 0 !== $rule['hash'] && ctype_alnum( $rule['hash'] ) ) {
+        } elseif (0 !== $rule['hash'] && ctype_alnum($rule['hash'])) {
             // If this is an genuine AUTO rule, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
@@ -722,7 +722,7 @@ 
         } else {
             // If rule doesn't exist, create an AUTO rule
             // AUTO rules were only for types, but will now also work for paths.
-            if ( ( 'types' == $trule[0] || 'paths' == $trule[0] ) && ! empty( $trule[1] ) ) {
+            if (('types' == $trule[0] || 'paths' == $trule[0]) && !empty($trule[1])) {
                 // Set rule hash and file and action flag.
                 $rule['hash'] = $hash;
                 $rule['file'] = $file;
@@ -730,47 +730,47 @@ 
                 $rtype        = 'AUTO';
             } else {
                 // Log that no rule was created.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Exception, no AUTO rule created', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Exception, no AUTO rule created', 3);
             }
         }
 
-        if ( $action ) {
+        if ($action) {
             // If a rule creation/update is required, persist updated rules object.
-            $ao_ccss_rules[ $trule[0] ][ $trule[1] ] = $rule;
-            $ao_ccss_rules_raw                       = json_encode( $ao_ccss_rules );
-            update_option( 'autoptimize_ccss_rules', $ao_ccss_rules_raw );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Target rule <' . $srule . '> of type <' . $rtype . '> was ' . $action . ' for job id <' . $ljid . '>', 3 );
+            $ao_ccss_rules[$trule[0]][$trule[1]] = $rule;
+            $ao_ccss_rules_raw                       = json_encode($ao_ccss_rules);
+            update_option('autoptimize_ccss_rules', $ao_ccss_rules_raw);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Target rule <'.$srule.'> of type <'.$rtype.'> was '.$action.' for job id <'.$ljid.'>', 3);
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No rule action required', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No rule action required', 3);
         }
     }
 
-    function ao_ccss_finclude( $finclude_raw ) {
+    function ao_ccss_finclude($finclude_raw) {
         // Prepare forceInclude object.
-        if ( ! empty( $finclude_raw ) ) {
+        if (!empty($finclude_raw)) {
             // If there are any content
             // Convert raw string into arra and initialize the returning object.
-            $fincludes = explode( ',', $finclude_raw );
+            $fincludes = explode(',', $finclude_raw);
             $finclude  = array();
 
             // Interacts over every rule.
             $i = 0;
-            foreach ( $fincludes as $include ) {
+            foreach ($fincludes as $include) {
                 // Trim leading and trailing whitespaces.
-                $include = trim( $include );
+                $include = trim($include);
 
-                if ( substr( $include, 0, 2 ) === '//' ) {
+                if (substr($include, 0, 2) === '//') {
                     // Regex rule
                     // Format value as required.
-                    $include = str_replace( '//', '/', $include );
-                    $include = $include . '/i';
+                    $include = str_replace('//', '/', $include);
+                    $include = $include.'/i';
 
                     // Store regex object.
-                    $finclude[ $i ]['type']  = 'RegExp';
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['type']  = 'RegExp';
+                    $finclude[$i]['value'] = $include;
                 } else {
                     // Simple value rule.
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['value'] = $include;
                 }
 
                 $i++;
@@ -787,54 +787,54 @@ 
     public function ao_ccss_cleaning() {
         // Perform plugin maintenance
         // Truncate log file >= 1MB .
-        if ( file_exists( AO_CCSS_LOG ) ) {
-            if ( filesize( AO_CCSS_LOG ) >= 1048576 ) {
-                $logfile = fopen( AO_CCSS_LOG, 'w' );
-                fclose( $logfile );
+        if (file_exists(AO_CCSS_LOG)) {
+            if (filesize(AO_CCSS_LOG) >= 1048576) {
+                $logfile = fopen(AO_CCSS_LOG, 'w');
+                fclose($logfile);
             }
         }
 
         // Remove lock file.
-        if ( file_exists( AO_CCSS_LOCK ) ) {
-            unlink( AO_CCSS_LOCK );
+        if (file_exists(AO_CCSS_LOCK)) {
+            unlink(AO_CCSS_LOCK);
         }
 
         // Make sure queue processing is scheduled, recreate if not.
-        if ( ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (!wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Queue cleaning.
         global $ao_ccss_queue;
         $queue_purge_threshold = 100;
-        $queue_purge_age       = 24 * 60 * 60;
-        $queue_length          = count( $ao_ccss_queue );
-        $timestamp_yesterday   = microtime( true ) - $queue_purge_age;
+        $queue_purge_age       = 24*60*60;
+        $queue_length          = count($ao_ccss_queue);
+        $timestamp_yesterday   = microtime(true) - $queue_purge_age;
         $remove_old_new        = false;
         $queue_altered         = false;
 
-        if ( $queue_length > $queue_purge_threshold ) {
+        if ($queue_length > $queue_purge_threshold) {
             $remove_old_new = true;
         }
 
-        foreach ( $ao_ccss_queue as $path => $job ) {
-            if ( ( $remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday ) || in_array( $job['jqstat'], array( 'JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE' ) ) ) {
-                unset( $ao_ccss_queue[ $path ] );
+        foreach ($ao_ccss_queue as $path => $job) {
+            if (($remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday) || in_array($job['jqstat'], array('JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE'))) {
+                unset($ao_ccss_queue[$path]);
                 $queue_altered = true;
             }
         }
 
         // save queue to options!
-        if ( $queue_altered ) {
-            $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-            update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue cleaning done.', 3 );
+        if ($queue_altered) {
+            $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+            update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue cleaning done.', 3);
         }
 
         // re-check key if invalid.
         global $ao_ccss_keyst;
-        if ( 1 == $ao_ccss_keyst ) {
-            $this->ao_ccss_api_generate( '', '', '' );
+        if (1 == $ao_ccss_keyst) {
+            $this->ao_ccss_api_generate('', '', '');
         }
     }
 }

classes/autoptimizeCache.php

Spacing +183 added lines, -183 removed lines

@@ -3,7 +3,7 @@ 
  * Handles disk-cache-related operations.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -38,22 +38,22 @@ 
      * @param string $md5 Hash.
      * @param string $ext Extension.
      */
-    public function __construct( $md5, $ext = 'php' )
+    public function __construct($md5, $ext = 'php')
     {
         $_min_ext = '';
-        if ( apply_filters( 'autoptimize_filter_cache_url_add_min_ext', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_url_add_min_ext', false)) {
             $_min_ext = '.min';
         }
 
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->nogzip   = AUTOPTIMIZE_CACHE_NOGZIP;
-        if ( ! $this->nogzip ) {
-            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.php';
+        if (!$this->nogzip) {
+            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.php';
         } else {
-            if ( in_array( $ext, array( 'js', 'css' ) ) ) {
-                $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+            if (in_array($ext, array('js', 'css'))) {
+                $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             } else {
-                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             }
         }
     }
@@ -65,7 +65,7 @@ 
      */
     public function check()
     {
-        return file_exists( $this->cachedir . $this->filename );
+        return file_exists($this->cachedir.$this->filename);
     }
 
     /**
@@ -75,11 +75,11 @@ 
      */
     public function retrieve()
     {
-        if ( $this->check() ) {
-            if ( false == $this->nogzip ) {
-                return file_get_contents( $this->cachedir . $this->filename . '.none' );
+        if ($this->check()) {
+            if (false == $this->nogzip) {
+                return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
-                return file_get_contents( $this->cachedir . $this->filename );
+                return file_get_contents($this->cachedir.$this->filename);
             }
         }
         return false;
@@ -93,10 +93,10 @@ 
      *
      * @return void
      */
-    public function cache( $data, $mime )
+    public function cache($data, $mime)
     {
         // readonly FS explicitly OK'ed by developer, so just pretend all is OK.
-        if ( defined( 'AUTOPTIMIZE_CACHE_READONLY' ) ) {
+        if (defined('AUTOPTIMIZE_CACHE_READONLY')) {
             return true;
         }
 
@@ -104,44 +104,44 @@ 
         //
         // to be activated for users that experience these ugly errors;
         // PHP Warning: file_put_contents failed to open stream: No such file or directory.
-        if ( apply_filters( 'autoptimize_filter_cache_checkdirs_on_write', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_checkdirs_on_write', false)) {
             $this->check_and_create_dirs();
         }
 
-        if ( false === $this->nogzip ) {
+        if (false === $this->nogzip) {
             // We handle gzipping ourselves.
             $file    = 'default.php';
-            $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file );
-            $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode );
+            $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file);
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
 
-            file_put_contents( $this->cachedir . $this->filename, $phpcode );
-            file_put_contents( $this->cachedir . $this->filename . '.none', $data );
+            file_put_contents($this->cachedir.$this->filename, $phpcode);
+            file_put_contents($this->cachedir.$this->filename.'.none', $data);
         } else {
             // Write code to cache without doing anything else.
-            file_put_contents( $this->cachedir . $this->filename, $data );
+            file_put_contents($this->cachedir.$this->filename, $data);
 
             // save fallback .js or .css file if filter true (to be false by default) but not if snippet or single.
-            if ( self::do_fallback() && strpos( $this->filename, '_snippet_' ) === false && strpos( $this->filename, '_single_' ) === false ) {
-                $_extension     = pathinfo( $this->filename, PATHINFO_EXTENSION );
-                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX . 'fallback.' . $_extension;
-                if ( ( 'css' === $_extension || 'js' === $_extension ) && ! file_exists( $this->cachedir . $_extension . '/' . $_fallback_file ) ) {
-                    file_put_contents( $this->cachedir . $_extension . '/' . $_fallback_file, $data );
+            if (self::do_fallback() && strpos($this->filename, '_snippet_') === false && strpos($this->filename, '_single_') === false) {
+                $_extension     = pathinfo($this->filename, PATHINFO_EXTENSION);
+                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX.'fallback.'.$_extension;
+                if (('css' === $_extension || 'js' === $_extension) && !file_exists($this->cachedir.$_extension.'/'.$_fallback_file)) {
+                    file_put_contents($this->cachedir.$_extension.'/'.$_fallback_file, $data);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) {
+            if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file.
-                file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) );
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP));
                 // If PHP Brotli extension is installed, create an additional cached Brotli file.
-                if ( function_exists( 'brotli_compress' ) ) {
-                    file_put_contents( $this->cachedir . $this->filename . '.br', brotli_compress( $data, 11, BROTLI_GENERIC ) );
+                if (function_exists('brotli_compress')) {
+                    file_put_contents($this->cachedir.$this->filename.'.br', brotli_compress($data, 11, BROTLI_GENERIC));
                 }
             }
         }
 
         // Provide 3rd party action hook for every cache file that is created.
         // This hook can for example be used to inject a copy of the created cache file to a other domain.
-        do_action( 'autoptimize_action_cache_file_created', $this->cachedir . $this->filename );
+        do_action('autoptimize_action_cache_file_created', $this->cachedir.$this->filename);
     }
 
     /**
@@ -156,7 +156,7 @@ 
         // The original idea here was to provide 3rd party code a hook so that
         // it can "listen" to all the complete autoptimized-urls that the page
         // will emit... Or something to that effect I think?
-        apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename );
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
 
         return $this->filename;
     }
@@ -169,11 +169,11 @@ 
      * @param string $file Filename.
      * @return bool
      */
-    protected static function is_valid_cache_file( $dir, $file )
+    protected static function is_valid_cache_file($dir, $file)
     {
-        if ( '.' !== $file && '..' !== $file &&
-            false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) &&
-            is_file( $dir . $file ) ) {
+        if ('.' !== $file && '..' !== $file &&
+            false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) &&
+            is_file($dir.$file)) {
 
             // It's a valid file!
             return true;
@@ -191,16 +191,16 @@ 
     protected static function clear_cache_classic()
     {
         $contents = self::get_cache_contents();
-        foreach ( $contents as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    @unlink( $dir . $file ); // @codingStandardsIgnoreLine
+        foreach ($contents as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    @unlink($dir.$file); // @codingStandardsIgnoreLine
                 }
             }
         }
 
-        @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine
+        @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -211,19 +211,19 @@ 
      *
      * @return bool
      */
-    protected static function rmdir( $pathname )
+    protected static function rmdir($pathname)
     {
-        $files = self::get_dir_contents( $pathname );
-        foreach ( $files as $file ) {
-            $path = $pathname . '/' . $file;
-            if ( is_dir( $path ) ) {
-                self::rmdir( $path );
+        $files = self::get_dir_contents($pathname);
+        foreach ($files as $file) {
+            $path = $pathname.'/'.$file;
+            if (is_dir($path)) {
+                self::rmdir($path);
             } else {
-                unlink( $path );
+                unlink($path);
             }
         }
 
-        return rmdir( $pathname );
+        return rmdir($pathname);
     }
 
     /**
@@ -244,12 +244,12 @@ 
         $new_name = self::get_unique_name();
 
         // Makes sure the new pathname is on the same level...
-        $new_pathname = dirname( $dir ) . '/' . $new_name;
-        $renamed      = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine
+        $new_pathname = dirname($dir).'/'.$new_name;
+        $renamed      = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine
 
         // When renamed, re-create the default cache directory back so it's
         // available again...
-        if ( $renamed ) {
+        if ($renamed) {
             $ok = self::cacheavail();
         }
 
@@ -263,7 +263,7 @@ 
      */
     public static function advanced_cache_clear_enabled()
     {
-        return apply_filters( 'autoptimize_filter_cache_clear_advanced', false );
+        return apply_filters('autoptimize_filter_cache_clear_advanced', false);
     }
 
     /**
@@ -274,7 +274,7 @@ 
     protected static function get_unique_name()
     {
         $prefix   = self::get_advanced_cache_clear_prefix();
-        $new_name = uniqid( $prefix, true );
+        $new_name = uniqid($prefix, true);
 
         return $new_name;
     }
@@ -287,8 +287,8 @@ 
     protected static function get_advanced_cache_clear_prefix()
     {
         $pathname = self::get_pathname_base();
-        $basename = basename( $pathname );
-        $prefix   = $basename . '-artifact-';
+        $basename = basename($pathname);
+        $prefix   = $basename.'-artifact-';
 
         return $prefix;
     }
@@ -301,9 +301,9 @@ 
      *
      * @return array
      */
-    protected static function get_dir_contents( $pathname )
+    protected static function get_dir_contents($pathname)
     {
-        return array_slice( scandir( $pathname ), 2 );
+        return array_slice(scandir($pathname), 2);
     }
 
     /**
@@ -316,24 +316,24 @@ 
     public static function delete_advanced_cache_clear_artifacts()
     {
         // Don't go through these motions (called from the cachechecker) if advanced cache clear isn't even active.
-        if ( ! self::advanced_cache_clear_enabled() ) {
+        if (!self::advanced_cache_clear_enabled()) {
             return false;
         }
 
         $dir    = self::get_pathname_base();
         $prefix = self::get_advanced_cache_clear_prefix();
-        $parent = dirname( $dir );
+        $parent = dirname($dir);
         $ok     = false;
 
         // Returns the list of files without '.' and '..' elements.
-        $files = self::get_dir_contents( $parent );
-        if ( is_array( $files ) && ! empty( $files ) ) {
-            foreach ( $files as $file ) {
-                $path     = $parent . '/' . $file;
-                $prefixed = ( false !== strpos( $path, $prefix ) );
+        $files = self::get_dir_contents($parent);
+        if (is_array($files) && !empty($files)) {
+            foreach ($files as $file) {
+                $path     = $parent.'/'.$file;
+                $prefixed = (false !== strpos($path, $prefix));
                 // Removing only our own (prefixed) directories...
-                if ( is_dir( $path ) && $prefixed ) {
-                    $ok = self::rmdir( $path );
+                if (is_dir($path) && $prefixed) {
+                    $ok = self::rmdir($path);
                 }
             }
         }
@@ -353,9 +353,9 @@ 
     {
         $pathname = self::get_pathname_base();
 
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
 
         return $pathname;
@@ -368,7 +368,7 @@ 
      */
     protected static function get_pathname_base()
     {
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
 
         return $pathname;
     }
@@ -380,46 +380,46 @@ 
      *
      * @return bool
      */
-    public static function clearall( $propagate = true )
+    public static function clearall($propagate = true)
     {
-        if ( ! self::cacheavail() ) {
+        if (!self::cacheavail()) {
             return false;
         }
 
         // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically?
-        if ( self::advanced_cache_clear_enabled() ) {
+        if (self::advanced_cache_clear_enabled()) {
             self::clear_cache_via_rename();
         } else {
             self::clear_cache_classic();
         }
 
         // Remove 404 handler if required.
-        if ( self::do_fallback() ) {
-            $_fallback_php = trailingslashit( WP_CONTENT_DIR ) . 'autoptimize_404_handler.php';
-            @unlink( $_fallback_php ); // @codingStandardsIgnoreLine
+        if (self::do_fallback()) {
+            $_fallback_php = trailingslashit(WP_CONTENT_DIR).'autoptimize_404_handler.php';
+            @unlink($_fallback_php); // @codingStandardsIgnoreLine
         }
 
         // Remove the transient so it gets regenerated...
-        delete_transient( 'autoptimize_stats' );
+        delete_transient('autoptimize_stats');
 
         // Cache was just purged, clear page cache and allow others to hook into our purging...
-        if ( true === $propagate ) {
-            if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) {
+        if (true === $propagate) {
+            if (!function_exists('autoptimize_do_cachepurged_action')) {
                 function autoptimize_do_cachepurged_action() {
-                    do_action( 'autoptimize_action_cachepurged' );
+                    do_action('autoptimize_action_cachepurged');
                 }
             }
-            add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 );
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 );
+            add_action('shutdown', 'autoptimize_do_cachepurged_action', 11);
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0);
         }
 
         // Warm cache (part of speedupper)!
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) && false == get_transient( 'autoptimize_cache_warmer_protector' ) ) {
-            set_transient( 'autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60 * 10 );
-            $url   = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 );
-            $url   = apply_filters( 'autoptimize_filter_cache_warmer_url', $url );
-            $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine
-            unset( $cache );
+        if (apply_filters('autoptimize_filter_speedupper', true) && false == get_transient('autoptimize_cache_warmer_protector')) {
+            set_transient('autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60*10);
+            $url   = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000);
+            $url   = apply_filters('autoptimize_filter_cache_warmer_url', $url);
+            $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine
+            unset($cache);
         }
 
         return true;
@@ -434,7 +434,7 @@ 
      */
     public static function clearall_actionless()
     {
-        return self::clearall( false );
+        return self::clearall(false);
     }
 
     /**
@@ -446,8 +446,8 @@ 
     {
         $contents = array();
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir );
+        foreach (array('', 'js', 'css') as $dir) {
+            $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir);
         }
 
         return $contents;
@@ -460,21 +460,21 @@ 
      */
     public static function stats()
     {
-        $stats = get_transient( 'autoptimize_stats' );
+        $stats = get_transient('autoptimize_stats');
 
         // If no transient, do the actual scan!
-        if ( ! is_array( $stats ) ) {
-            if ( ! self::cacheavail() ) {
+        if (!is_array($stats)) {
+            if (!self::cacheavail()) {
                 return 0;
             }
             $stats = self::stats_scan();
             $count = $stats[0];
-            if ( $count > 100 ) {
+            if ($count > 100) {
                 // Store results in transient.
                 set_transient(
                     'autoptimize_stats',
                     $stats,
-                    apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS )
+                    apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS)
                 );
             }
         }
@@ -497,30 +497,30 @@ 
         $size  = 0;
 
         // Scan everything in our cache directories.
-        foreach ( self::get_cache_contents() as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    if ( AUTOPTIMIZE_CACHE_NOGZIP &&
+        foreach (self::get_cache_contents() as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    if (AUTOPTIMIZE_CACHE_NOGZIP &&
                         (
-                            false !== strpos( $file, '.js' ) ||
-                            false !== strpos( $file, '.css' ) ||
-                            false !== strpos( $file, '.img' ) ||
-                            false !== strpos( $file, '.txt' )
+                            false !== strpos($file, '.js') ||
+                            false !== strpos($file, '.css') ||
+                            false !== strpos($file, '.img') ||
+                            false !== strpos($file, '.txt')
                         )
                     ) {
                         // Web server is gzipping, we count .js|.css|.img|.txt files.
                         $count++;
-                    } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) {
+                    } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) {
                         // We are gzipping ourselves via php, counting only .none files.
                         $count++;
                     }
-                    $size += filesize( $dir . $file );
+                    $size += filesize($dir.$file);
                 }
             }
         }
 
-        $stats = array( $count, $size, time() );
+        $stats = array($count, $size, time());
 
         return $stats;
     }
@@ -535,26 +535,26 @@ 
     public static function cacheavail()
     {
         // readonly FS explicitly OK'ed by dev, let's assume the cache dirs are there!
-        if ( defined( 'AUTOPTIMIZE_CACHE_READONLY' ) ) {
+        if (defined('AUTOPTIMIZE_CACHE_READONLY')) {
             return true;
         }
 
-        if ( false === autoptimizeCache::check_and_create_dirs() ) {
+        if (false === autoptimizeCache::check_and_create_dirs()) {
             return false;
         }
 
         // Using .htaccess inside our cache folder to overrule wp-super-cache.
-        $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess';
-        if ( ! is_file( $htaccess ) ) {
+        $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htaccess)) {
             /**
              * Create `wp-content/AO_htaccess_tmpl` file with
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl';
-            if ( is_file( $htaccess_tmpl ) ) {
-                $content = file_get_contents( $htaccess_tmpl );
-            } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) {
+            $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl';
+            if (is_file($htaccess_tmpl)) {
+                $content = file_get_contents($htaccess_tmpl);
+            } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) {
                 $content = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
@@ -608,13 +608,13 @@ 
 </IfModule>';
             }
 
-            if ( self::do_fallback() === true ) {
-                $content .= "\nErrorDocument 404 " . trailingslashit( parse_url( content_url(), PHP_URL_PATH ) ) . 'autoptimize_404_handler.php';
+            if (self::do_fallback() === true) {
+                $content .= "\nErrorDocument 404 ".trailingslashit(parse_url(content_url(), PHP_URL_PATH)).'autoptimize_404_handler.php';
             }
-            @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine
+            @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine
         }
 
-        if ( self::do_fallback() ) {
+        if (self::do_fallback()) {
             self::check_fallback_php();
         }
 
@@ -629,17 +629,17 @@ 
      */
     public static function check_fallback_php() {
         $_fallback_filename = 'autoptimize_404_handler.php';
-        $_fallback_php      = trailingslashit( WP_CONTENT_DIR ) . $_fallback_filename;
+        $_fallback_php      = trailingslashit(WP_CONTENT_DIR).$_fallback_filename;
         $_fallback_status   = true;
 
-        if ( ! file_exists( $_fallback_php ) && is_writable( WP_CONTENT_DIR ) ) {
-            $_fallback_php_contents = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $_fallback_filename );
-            $_fallback_php_contents = str_replace( '<?php exit;', '<?php', $_fallback_php_contents );
-            $_fallback_php_contents = str_replace( '<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents );
-            if ( apply_filters( 'autoptimize_filter_cache_fallback_log_errors', false ) ) {
-                $_fallback_php_contents = str_replace( '// error_log', 'error_log', $_fallback_php_contents );
+        if (!file_exists($_fallback_php) && is_writable(WP_CONTENT_DIR)) {
+            $_fallback_php_contents = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$_fallback_filename);
+            $_fallback_php_contents = str_replace('<?php exit;', '<?php', $_fallback_php_contents);
+            $_fallback_php_contents = str_replace('<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents);
+            if (apply_filters('autoptimize_filter_cache_fallback_log_errors', false)) {
+                $_fallback_php_contents = str_replace('// error_log', 'error_log', $_fallback_php_contents);
             }
-            $_fallback_status = file_put_contents( $_fallback_php, $_fallback_php_contents );
+            $_fallback_status = file_put_contents($_fallback_php, $_fallback_php_contents);
         }
 
         return $_fallback_status;
@@ -656,8 +656,8 @@ 
     public static function do_fallback() {
         static $_do_fallback = null;
 
-        if ( null === $_do_fallback ) {
-            $_do_fallback = (bool) apply_filters( 'autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '1' ) );
+        if (null === $_do_fallback) {
+            $_do_fallback = (bool) apply_filters('autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', '1'));
         }
 
         return $_do_fallback;
@@ -669,31 +669,31 @@ 
      * and 410'ing ("Gone") if fallback not available.
      */
     public static function wordpress_notfound_fallback() {
-        $original_request = strtok( $_SERVER['REQUEST_URI'], '?' );
-        if ( strpos( $original_request, wp_basename( WP_CONTENT_DIR ) . AUTOPTIMIZE_CACHE_CHILD_DIR ) !== false && is_404() ) {
+        $original_request = strtok($_SERVER['REQUEST_URI'], '?');
+        if (strpos($original_request, wp_basename(WP_CONTENT_DIR).AUTOPTIMIZE_CACHE_CHILD_DIR) !== false && is_404()) {
             // make sure this is not considered a 404.
             global $wp_query;
             $wp_query->is_404 = false;
 
             // set fallback path.
-            $js_or_css     = pathinfo( $original_request, PATHINFO_EXTENSION );
-            $fallback_path = AUTOPTIMIZE_CACHE_DIR . $js_or_css . '/autoptimize_fallback.' . $js_or_css;
+            $js_or_css     = pathinfo($original_request, PATHINFO_EXTENSION);
+            $fallback_path = AUTOPTIMIZE_CACHE_DIR.$js_or_css.'/autoptimize_fallback.'.$js_or_css;
 
             // prepare for Shakeeb's Unused CSS files to be 404-handled as well.
-            if ( strpos( $original_request, 'uucss/uucss-' ) !== false ) {
-                $original_request = preg_replace( '/uucss\/uucss-[a-z0-9]{32}-/', 'css/', $original_request  );
+            if (strpos($original_request, 'uucss/uucss-') !== false) {
+                $original_request = preg_replace('/uucss\/uucss-[a-z0-9]{32}-/', 'css/', $original_request);
             }
 
             // set fallback URL.
-            $fallback_target = preg_replace( '/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request );
+            $fallback_target = preg_replace('/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request);
 
             // redirect to fallback if possible.
-            if ( $original_request !== $fallback_target && file_exists( $fallback_path ) ) {
+            if ($original_request !== $fallback_target && file_exists($fallback_path)) {
                 // redirect to fallback.
-                wp_redirect( $fallback_target, 302 );
+                wp_redirect($fallback_target, 302);
             } else {
                 // return HTTP 410 (gone) reponse.
-                status_header( 410 );
+                status_header(410);
             }
         }
     }
@@ -705,13 +705,13 @@ 
      * @return bool
      */
     public static function check_and_create_dirs() {
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache.
             return false;
         }
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) {
+        foreach (array('', 'js', 'css') as $dir) {
+            if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) {
                 return false;
             }
         }
@@ -726,25 +726,25 @@ 
      *
      * @return bool
      */
-    protected static function check_cache_dir( $dir )
+    protected static function check_cache_dir($dir)
     {
         // Try creating the dir if it doesn't exist.
-        if ( ! file_exists( $dir ) ) {
-            @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine
-            if ( ! file_exists( $dir ) ) {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // If we still cannot write, bail.
-        if ( ! is_writable( $dir ) ) {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // Create an index.html in there to avoid prying eyes!
-        $idx_file = rtrim( $dir, '/\\' ) . '/index.html';
-        if ( ! is_file( $idx_file ) ) {
-            @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine
+        $idx_file = rtrim($dir, '/\\').'/index.html';
+        if (!is_file($idx_file)) {
+            @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine
         }
 
         return true;
@@ -758,54 +758,54 @@ 
     // @codingStandardsIgnoreStart
     public static function flushPageCache()
     {
-        if ( function_exists( 'wp_cache_clear_cache' ) ) {
-            if ( is_multisite() ) {
+        if (function_exists('wp_cache_clear_cache')) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                wp_cache_clear_cache( $blog_id );
+                wp_cache_clear_cache($blog_id);
             } else {
                 wp_cache_clear_cache();
             }
-        } elseif ( has_action( 'cachify_flush_cache' ) ) {
-            do_action( 'cachify_flush_cache' );
-        } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) {
+        } elseif (has_action('cachify_flush_cache')) {
+            do_action('cachify_flush_cache');
+        } elseif (function_exists('w3tc_pgcache_flush')) {
             w3tc_pgcache_flush();
-        } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) {
+        } elseif (function_exists('wp_fast_cache_bulk_delete_all')) {
             wp_fast_cache_bulk_delete_all();
-        } elseif ( function_exists( 'rapidcache_clear_cache' ) ) {
+        } elseif (function_exists('rapidcache_clear_cache')) {
             rapidcache_clear_cache();
-        } elseif ( class_exists( 'Swift_Performance_Cache' ) ) {
+        } elseif (class_exists('Swift_Performance_Cache')) {
             Swift_Performance_Cache::clear_all_cache();
-        } elseif ( class_exists( 'WpFastestCache' ) ) {
+        } elseif (class_exists('WpFastestCache')) {
             $wpfc = new WpFastestCache();
             $wpfc->deleteCache();
-        } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) {
+        } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) {
             c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache
-        } elseif ( class_exists( 'zencache' ) ) {
+        } elseif (class_exists('zencache')) {
             zencache::clear();
-        } elseif ( class_exists( 'comet_cache' ) ) {
+        } elseif (class_exists('comet_cache')) {
             comet_cache::clear();
-        } elseif ( class_exists( 'WpeCommon' ) ) {
+        } elseif (class_exists('WpeCommon')) {
             // WPEngine cache purge/flush methods to call by default
             $wpe_methods = array(
                 'purge_varnish_cache',
             );
 
             // More agressive clear/flush/purge behind a filter
-            if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) {
-                $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) );
+            if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+                $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache'));
             }
 
             // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing)
-            $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods );
+            $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods);
 
-            foreach ( $wpe_methods as $wpe_method ) {
-                if ( method_exists( 'WpeCommon', $wpe_method ) ) {
+            foreach ($wpe_methods as $wpe_method) {
+                if (method_exists('WpeCommon', $wpe_method)) {
                     WpeCommon::$wpe_method();
                 }
             }
-        } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) {
+        } elseif (function_exists('sg_cachepress_purge_cache')) {
             sg_cachepress_purge_cache();
-        } elseif ( array_key_exists( 'KINSTA_CACHE_ZONE', $_SERVER ) ) {
+        } elseif (array_key_exists('KINSTA_CACHE_ZONE', $_SERVER)) {
             $_kinsta_clear_cache_url = 'https://localhost/kinsta-clear-cache-all';
             $_kinsta_response        = wp_remote_get(
                 $_kinsta_clear_cache_url,
@@ -814,20 +814,20 @@ 
                     'timeout' => 5,
                     )
             );
-        } elseif ( defined('NGINX_HELPER_BASENAME') ) {
-            do_action( 'rt_nginx_helper_purge_all' );
-        } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) {
+        } elseif (defined('NGINX_HELPER_BASENAME')) {
+            do_action('rt_nginx_helper_purge_all');
+        } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
             // fallback for WP-Super-Cache
             global $cache_path;
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                prune_super_cache( get_supercache_dir( $blog_id ), true );
-                prune_super_cache( $cache_path . 'blogs/', true );
+                prune_super_cache(get_supercache_dir($blog_id), true);
+                prune_super_cache($cache_path.'blogs/', true);
             } else {
-                prune_super_cache( $cache_path . 'supercache/', true );
-                prune_super_cache( $cache_path, true );
+                prune_super_cache($cache_path.'supercache/', true);
+                prune_super_cache($cache_path, true);
             }
-        } elseif ( class_exists( 'NginxCache' ) ) {
+        } elseif (class_exists('NginxCache')) {
             $nginx_cache = new NginxCache();
             $nginx_cache->purge_zone_once();
         }