futtta / autoptimize

classes/autoptimizeStyles.php

Spacing +308 added lines, -308 removed lines

@@ -3,7 +3,7 @@ 
  * Class for CSS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -48,53 +48,53 @@ 
     // public $cdn_url; // Used all over the place implicitly, so will have to be either public or protected :/ .
 
     // Reads the page and collects style tags.
-    public function read( $options )
+    public function read($options)
     {
-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
-        if ( $noptimizeCSS ) {
+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
+        if ($noptimizeCSS) {
             return false;
         }
 
-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );
-        if ( ! empty( $whitelistCSS ) ) {
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistCSS ) ) );
+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
+        if (!empty($whitelistCSS)) {
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistCSS)));
         }
 
-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', '' );
-        if ( ! empty( $removableCSS ) ) {
-            $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removableCSS ) ) );
+        $removableCSS = apply_filters('autoptimize_filter_css_removables', '');
+        if (!empty($removableCSS)) {
+            $this->cssremovables = array_filter(array_map('trim', explode(',', $removableCSS)));
         }
 
-        $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 );
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
 
         // filter to "late inject minified CSS", default to true for now (it is faster).
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true );
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
 
         // Remove everything that's not the header.
-        if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing CSS-files aggregation or not.
-        if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) {
+        if (isset($options['aggregate']) && !$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) {
             $this->aggregate = false;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) {
             $this->include_inline = true;
         }
 
         // List of CSS strings which are excluded from autoptimization.
-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content );
-        if ( '' !== $excludeCSS ) {
-            $this->dontmove = array_filter( array_map( 'trim', explode( ',', $excludeCSS ) ) );
+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content);
+        if ('' !== $excludeCSS) {
+            $this->dontmove = array_filter(array_map('trim', explode(',', $excludeCSS)));
         } else {
             $this->dontmove = array();
         }
@@ -105,16 +105,16 @@ 
         // Should we defer css?
         // value: true / false.
         $this->defer = $options['defer'];
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
 
         // Should we inline while deferring?
         // value: inlined CSS.
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content);
 
         // Should we inline?
         // value: true / false.
         $this->inline = $options['inline'];
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
 
         // Store cdn url.
         $this->cdn_url = $options['cdn_url'];
@@ -123,7 +123,7 @@ 
         $this->datauris = $options['datauris'];
 
         // noptimize me.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Exclude (no)script, as those may contain CSS which should be left as is.
         $this->content = $this->replace_contents_with_marker_if_exists(
@@ -134,26 +134,26 @@ 
         );
 
         // Save IE hacks.
-        $this->content = $this->hide_iehacks( $this->content );
+        $this->content = $this->hide_iehacks($this->content);
 
         // Hide HTML comments.
-        $this->content = $this->hide_comments( $this->content );
+        $this->content = $this->hide_comments($this->content);
 
         // Get <style> and <link>.
-        if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) {
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
 
-            foreach ( $matches[0] as $tag ) {
-                if ( $this->isremovable( $tag, $this->cssremovables ) ) {
-                    $this->content = str_replace( $tag, '', $this->content );
-                } elseif ( $this->ismovable( $tag ) ) {
+            foreach ($matches[0] as $tag) {
+                if ($this->isremovable($tag, $this->cssremovables)) {
+                    $this->content = str_replace($tag, '', $this->content);
+                } elseif ($this->ismovable($tag)) {
                     // Get the media.
-                    if ( false !== strpos( $tag, 'media=' ) ) {
-                        preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias );
-                        $medias = explode( ',', $medias[1] );
+                    if (false !== strpos($tag, 'media=')) {
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
+                        $medias = explode(',', $medias[1]);
                         $media = array();
-                        foreach ( $medias as $elem ) {
+                        foreach ($medias as $elem) {
                             /* $media[] = current(explode(' ',trim($elem),2)); */
-                            if ( empty( $elem ) ) {
+                            if (empty($elem)) {
                                 $elem = 'all';
                             }
 
@@ -161,64 +161,64 @@ 
                         }
                     } else {
                         // No media specified - applies to all.
-                        $media = array( 'all' );
+                        $media = array('all');
                     }
 
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag );
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
 
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
                         // <link>.
-                        $url  = current( explode( '?', $source[2], 2 ) );
-                        $path = $this->getpath( $url );
+                        $url  = current(explode('?', $source[2], 2));
+                        $path = $this->getpath($url);
 
-                        if ( false !== $path && preg_match( '#\.css$#', $path ) ) {
+                        if (false !== $path && preg_match('#\.css$#', $path)) {
                             // Good link.
-                            $this->css[] = array( $media, $path );
+                            $this->css[] = array($media, $path);
                         } else {
                             // Link is dynamic (.php etc).
                             $tag = '';
                         }
                     } else {
                         // Inline css in style tags can be wrapped in comment tags, so restore comments.
-                        $tag = $this->restore_comments( $tag );
-                        preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code );
+                        $tag = $this->restore_comments($tag);
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
 
                         // And re-hide them to be able to to the removal based on tag.
-                        $tag = $this->hide_comments( $tag );
+                        $tag = $this->hide_comments($tag);
 
-                        if ( $this->include_inline ) {
-                            $code = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] );
-                            $this->css[] = array( $media, 'INLINE;' . $code );
+                        if ($this->include_inline) {
+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
+                            $this->css[] = array($media, 'INLINE;'.$code);
                         } else {
                             $tag = '';
                         }
                     }
 
                     // Remove the original style tag.
-                    $this->content = str_replace( $tag, '', $this->content );
+                    $this->content = str_replace($tag, '', $this->content);
                 } else {
                     // Excluded CSS, minify if getpath and filter says so...
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
-                        $exploded_url = explode( '?', $source[2], 2 );
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
+                        $exploded_url = explode('?', $source[2], 2);
                         $url          = $exploded_url[0];
-                        $path         = $this->getpath( $url );
+                        $path         = $this->getpath($url);
 
-                        if ( $path && apply_filters( 'autoptimize_filter_css_minify_excluded', true, $url ) ) {
-                            $minified_url = $this->minify_single( $path );
-                            if ( ! empty( $minified_url ) ) {
+                        if ($path && apply_filters('autoptimize_filter_css_minify_excluded', true, $url)) {
+                            $minified_url = $this->minify_single($path);
+                            if (!empty($minified_url)) {
                                 // Replace orig URL with cached minified URL.
-                                $new_tag = str_replace( $url, $minified_url, $tag );
+                                $new_tag = str_replace($url, $minified_url, $tag);
                             } else {
                                 $new_tag = $tag;
                             }
 
                             // Removes querystring from URL.
-                            if ( ! empty( $exploded_url[1] ) ) {
-                                $new_tag = str_replace( '?' . $exploded_url[1], '', $new_tag );
+                            if (!empty($exploded_url[1])) {
+                                $new_tag = str_replace('?'.$exploded_url[1], '', $new_tag);
                             }
 
                             // Defer single CSS if "inline & defer" is ON and there is inline CSS.
-                            if ( $this->defer && ! empty( $this->defer_inline ) ) {
+                            if ($this->defer && !empty($this->defer_inline)) {
                                 // Get/ set (via filter) the JS to be triggers onload of the preloaded CSS.
                                 $_preload_onload = apply_filters(
                                     'autoptimize_filter_css_preload_onload',
@@ -226,18 +226,18 @@ 
                                     $url
                                 );
                                 // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
-                                $new_tag = '<noscript>' . $new_tag . '</noscript>' . str_replace(
+                                $new_tag = '<noscript>'.$new_tag.'</noscript>'.str_replace(
                                     array(
                                         "rel='stylesheet'",
                                         'rel="stylesheet"',
                                     ),
-                                    "rel='preload' as='style' onload=\"" . $_preload_onload . "\"",
+                                    "rel='preload' as='style' onload=\"".$_preload_onload."\"",
                                     $new_tag
                                 );
                             }
 
                             // And replace!
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
+                            $this->content = str_replace($tag, $new_tag, $this->content);
                         }
                     }
                 }
@@ -256,22 +256,22 @@ 
      * @param string $path
      * @return boolean
      */
-    private function is_datauri_candidate( $path )
+    private function is_datauri_candidate($path)
     {
         // Call only once since it's called from a loop.
         static $max_size = null;
-        if ( null === $max_size ) {
+        if (null === $max_size) {
             $max_size = $this->get_datauri_maxsize();
         }
 
-        if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) &&
-            file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) {
+        if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) &&
+            file_exists($path) && is_readable($path) && filesize($path) <= $max_size) {
 
             // Seems we have a candidate.
             $is_candidate = true;
         } else {
             // Filter allows overriding default decision (which checks for local file existence).
-            $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path );
+            $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path);
         }
 
         return $is_candidate;
@@ -296,29 +296,29 @@ 
          * of thing you're probably better of building assets completely
          * outside of WordPress anyway.
          */
-        if ( null === $max_size ) {
-            $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 );
+        if (null === $max_size) {
+            $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096);
         }
 
         return $max_size;
     }
 
-    private function check_datauri_exclude_list( $url )
+    private function check_datauri_exclude_list($url)
     {
         static $exclude_list = null;
         $no_datauris         = array();
 
         // Again, skip doing certain stuff repeatedly when loop-called.
-        if ( null === $exclude_list ) {
-            $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' );
-            $no_datauris = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) );
+        if (null === $exclude_list) {
+            $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', '');
+            $no_datauris = array_filter(array_map('trim', explode(',', $exclude_list)));
         }
 
         $matched = false;
 
-        if ( ! empty( $exclude_list ) ) {
-            foreach ( $no_datauris as $no_datauri ) {
-                if ( false !== strpos( $url, $no_datauri ) ) {
+        if (!empty($exclude_list)) {
+            foreach ($no_datauris as $no_datauri) {
+                if (false !== strpos($url, $no_datauri)) {
                     $matched = true;
                     break;
                 }
@@ -328,7 +328,7 @@ 
         return $matched;
     }
 
-    private function build_or_get_datauri_image( $path )
+    private function build_or_get_datauri_image($path)
     {
         /**
          * TODO/FIXME: document the required return array format, or better yet,
@@ -337,27 +337,27 @@ 
          */
 
         // Allows short-circuiting datauri generation for an image.
-        $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path );
-        if ( ! empty( $result ) ) {
-            if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) {
+        $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path);
+        if (!empty($result)) {
+            if (is_array($result) && isset($result['full']) && isset($result['base64data'])) {
                 return $result;
             }
         }
 
-        $hash = md5( $path );
-        $check = new autoptimizeCache( $hash, 'img' );
-        if ( $check->check() ) {
+        $hash = md5($path);
+        $check = new autoptimizeCache($hash, 'img');
+        if ($check->check()) {
             // we have the base64 image in cache.
             $headAndData = $check->retrieve();
-            $_base64data = explode( ';base64,', $headAndData );
+            $_base64data = explode(';base64,', $headAndData);
             $base64data  = $_base64data[1];
-            unset( $_base64data );
+            unset($_base64data);
         } else {
             // It's an image and we don't have it in cache, get the type by extension.
-            $exploded_path = explode( '.', $path );
-            $type = end( $exploded_path );
+            $exploded_path = explode('.', $path);
+            $type = end($exploded_path);
 
-            switch ( $type ) {
+            switch ($type) {
                 case 'jpg':
                 case 'jpeg':
                     $dataurihead = 'data:image/jpeg;base64,';
@@ -379,15 +379,15 @@ 
             }
 
             // Encode the data.
-            $base64data  = base64_encode( file_get_contents( $path ) );
-            $headAndData = $dataurihead . $base64data;
+            $base64data  = base64_encode(file_get_contents($path));
+            $headAndData = $dataurihead.$base64data;
 
             // Save in cache.
-            $check->cache( $headAndData, 'text/plain' );
+            $check->cache($headAndData, 'text/plain');
         }
-        unset( $check );
+        unset($check);
 
-        return array( 'full' => $headAndData, 'base64data' => $base64data );
+        return array('full' => $headAndData, 'base64data' => $base64data);
     }
 
     /**
@@ -399,13 +399,13 @@ 
      *
      * @return string
      */
-    protected static function replace_longest_matches_first( $string, $replacements = array() )
+    protected static function replace_longest_matches_first($string, $replacements = array())
     {
-        if ( ! empty( $replacements ) ) {
+        if (!empty($replacements)) {
             // Sort the replacements array by key length in desc order (so that the longest strings are replaced first).
-            $keys = array_map( 'strlen', array_keys( $replacements ) );
-            array_multisort( $keys, SORT_DESC, $replacements );
-            $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string );
+            $keys = array_map('strlen', array_keys($replacements));
+            array_multisort($keys, SORT_DESC, $replacements);
+            $string = str_replace(array_keys($replacements), array_values($replacements), $string);
         }
 
         return $string;
@@ -421,15 +421,15 @@ 
      *
      * @return string
      */
-    public function replace_urls( $code = '' )
+    public function replace_urls($code = '')
     {
         $replacements = array();
 
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 /**
                  * TODO/FIXME: Add a way for other code / callable to be called here
@@ -447,17 +447,17 @@ 
                  */
 
                 // Do CDN replacement if needed.
-                if ( ! empty( $this->cdn_url ) ) {
-                    $replacement_url = $this->url_replace_cdn( $url );
+                if (!empty($this->cdn_url)) {
+                    $replacement_url = $this->url_replace_cdn($url);
                     // Prepare replacements array.
-                    $replacements[ $url_src_matches[1][ $count ] ] = str_replace(
+                    $replacements[$url_src_matches[1][$count]] = str_replace(
                         $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $replacements );
+        $code = self::replace_longest_matches_first($code, $replacements);
 
         return $code;
     }
@@ -470,26 +470,26 @@ 
      * @param string $code
      * @return string
      */
-    public function hide_fontface_and_maybe_cdn( $code )
+    public function hide_fontface_and_maybe_cdn($code)
     {
         // Proceed only if @font-face declarations exist within $code.
-        preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces );
-        if ( isset( $fontfaces[0] ) ) {
+        preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces);
+        if (isset($fontfaces[0])) {
             // Check if we need to cdn fonts or not.
-            $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false );
+            $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false);
 
-            foreach ( $fontfaces[0] as $full_match ) {
+            foreach ($fontfaces[0] as $full_match) {
                 // Keep original match so we can search/replace it.
                 $match_search = $full_match;
 
                 // Do font cdn if needed.
-                if ( $do_font_cdn ) {
-                    $full_match = $this->replace_urls( $full_match );
+                if ($do_font_cdn) {
+                    $full_match = $this->replace_urls($full_match);
                 }
 
                 // Replace declaration with its base64 encoded string.
-                $replacement = self::build_marker( 'FONTFACE', $full_match );
-                $code = str_replace( $match_search, $replacement, $code );
+                $replacement = self::build_marker('FONTFACE', $full_match);
+                $code = str_replace($match_search, $replacement, $code);
             }
         }
 
@@ -503,16 +503,16 @@ 
      * @param string $code
      * @return string
      */
-    public function restore_fontface( $code )
+    public function restore_fontface($code)
     {
-        return $this->restore_marked_content( 'FONTFACE', $code );
+        return $this->restore_marked_content('FONTFACE', $code);
     }
 
     // Re-write (and/or inline) referenced assets.
-    public function rewrite_assets( $code )
+    public function rewrite_assets($code)
     {
         // Handle @font-face rules by hiding and processing them separately.
-        $code = $this->hide_fontface_and_maybe_cdn( $code );
+        $code = $this->hide_fontface_and_maybe_cdn($code);
 
         /**
          * TODO/FIXME:
@@ -528,30 +528,30 @@ 
         $url_src_matches = array();
         $imgreplace = array();
         // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs.
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 // If datauri inlining is turned on, do it.
                 $inlined = false;
-                if ( $this->datauris ) {
+                if ($this->datauris) {
                     $iurl = $url;
-                    if ( false !== strpos( $iurl, '?' ) ) {
-                        $iurl = strtok( $iurl, '?' );
+                    if (false !== strpos($iurl, '?')) {
+                        $iurl = strtok($iurl, '?');
                     }
 
-                    $ipath = $this->getpath( $iurl );
+                    $ipath = $this->getpath($iurl);
 
-                    $excluded = $this->check_datauri_exclude_list( $ipath );
-                    if ( ! $excluded ) {
-                        $is_datauri_candidate = $this->is_datauri_candidate( $ipath );
-                        if ( $is_datauri_candidate ) {
-                            $datauri     = $this->build_or_get_datauri_image( $ipath );
+                    $excluded = $this->check_datauri_exclude_list($ipath);
+                    if (!$excluded) {
+                        $is_datauri_candidate = $this->is_datauri_candidate($ipath);
+                        if ($is_datauri_candidate) {
+                            $datauri     = $this->build_or_get_datauri_image($ipath);
                             $base64data  = $datauri['base64data'];
                             // Add it to the list for replacement.
-                            $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
+                            $imgreplace[$url_src_matches[1][$count]] = str_replace(
                                     $original_url,
                                     $datauri['full'],
                                     $url_src_matches[1][$count]
@@ -567,20 +567,20 @@ 
                  * inlining isn't turned on, or if a resource is skipped from
                  * being inlined for whatever reason above.
                  */
-                if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) {
+                if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) {
                     // Just do the "simple" CDN replacement.
-                    $replacement_url = $this->url_replace_cdn( $url );
-                    $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
+                    $replacement_url = $this->url_replace_cdn($url);
+                    $imgreplace[$url_src_matches[1][$count]] = str_replace(
                         $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $imgreplace );
+        $code = self::replace_longest_matches_first($code, $imgreplace);
 
         // Replace back font-face markers with actual font-face declarations.
-        $code = $this->restore_fontface( $code );
+        $code = $this->restore_fontface($code);
 
         return $code;
     }
@@ -588,29 +588,29 @@ 
     // Joins and optimizes CSS.
     public function minify()
     {
-        foreach ( $this->css as $group ) {
-            list( $media, $css ) = $group;
-            if ( preg_match( '#^INLINE;#', $css ) ) {
+        foreach ($this->css as $group) {
+            list($media, $css) = $group;
+            if (preg_match('#^INLINE;#', $css)) {
                 // <style>.
-                $css = preg_replace( '#^INLINE;#', '', $css );
-                $css = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash.
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' );
-                if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                $css = preg_replace('#^INLINE;#', '', $css);
+                $css = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash.
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, '');
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                     $css = $tmpstyle;
                     $this->alreadyminified = true;
                 }
             } else {
                 // <link>
-                if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) {
+                if (false !== $css && file_exists($css) && is_readable($css)) {
                     $cssPath = $css;
-                    $css = self::fixurls( $cssPath, file_get_contents( $cssPath ) );
-                    $css = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css );
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );
-                    if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                    $css = self::fixurls($cssPath, file_get_contents($cssPath));
+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
+                    if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                         $css = $tmpstyle;
                         $this->alreadyminified = true;
-                    } elseif ( $this->can_inject_late( $cssPath, $css ) ) {
-                        $css = self::build_injectlater_marker( $cssPath, md5( $css ) );
+                    } elseif ($this->can_inject_late($cssPath, $css)) {
+                        $css = self::build_injectlater_marker($cssPath, md5($css));
                     }
                 } else {
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -618,12 +618,12 @@ 
                 }
             }
 
-            foreach ( $media as $elem ) {
-                if ( ! empty( $css ) ) {
-                    if ( ! isset( $this->csscode[$elem] ) ) {
+            foreach ($media as $elem) {
+                if (!empty($css)) {
+                    if (!isset($this->csscode[$elem])) {
                         $this->csscode[$elem] = '';
                     }
-                    $this->csscode[$elem] .= "\n/*FILESTART*/" . $css;
+                    $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
                 }
             }
         }
@@ -631,133 +631,133 @@ 
         // Check for duplicate code.
         $md5list = array();
         $tmpcss  = $this->csscode;
-        foreach ( $tmpcss as $media => $code ) {
-            $md5sum    = md5( $code );
+        foreach ($tmpcss as $media => $code) {
+            $md5sum    = md5($code);
             $medianame = $media;
-            foreach ( $md5list as $med => $sum ) {
+            foreach ($md5list as $med => $sum) {
                 // If same code.
-                if ( $sum === $md5sum ) {
+                if ($sum === $md5sum) {
                     // Add the merged code.
-                    $medianame                 = $med . ', ' . $media;
+                    $medianame                 = $med.', '.$media;
                     $this->csscode[$medianame] = $code;
                     $md5list[$medianame]       = $md5list[$med];
-                    unset( $this->csscode[$med], $this->csscode[$media], $md5list[$med] );
+                    unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]);
                 }
             }
             $md5list[$medianame] = $md5sum;
         }
-        unset( $tmpcss );
+        unset($tmpcss);
 
         // Manage @imports, while is for recursive import management.
-        foreach ( $this->csscode as &$thiscss ) {
+        foreach ($this->csscode as &$thiscss) {
             // Flag to trigger import reconstitution and var to hold external imports.
             $fiximports       = false;
             $external_imports = '';
 
             // remove comments to avoid importing commented-out imports.
-            $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
-            while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) {
-                foreach ( $matches[0] as $import ) {
-                    if ( $this->isremovable( $import, $this->cssremovables ) ) {
-                        $thiscss = str_replace( $import, '', $thiscss );
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
+            while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) {
+                foreach ($matches[0] as $import) {
+                    if ($this->isremovable($import, $this->cssremovables)) {
+                        $thiscss = str_replace($import, '', $thiscss);
                         $import_ok = true;
                     } else {
-                        $url = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" );
-                        $path = $this->getpath( $url );
+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
+                        $path = $this->getpath($url);
                         $import_ok = false;
-                        if ( file_exists( $path ) && is_readable( $path ) ) {
-                            $code = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), "\\" );
-                            $code = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code );
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' );
-                            if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                        if (file_exists($path) && is_readable($path)) {
+                            $code = addcslashes(self::fixurls($path, file_get_contents($path)), "\\");
+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, '');
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                                 $code = $tmpstyle;
                                 $this->alreadyminified = true;
-                            } elseif ( $this->can_inject_late( $path, $code ) ) {
-                                $code = self::build_injectlater_marker( $path, md5( $code ) );
+                            } elseif ($this->can_inject_late($path, $code)) {
+                                $code = self::build_injectlater_marker($path, md5($code));
                             }
 
-                            if ( ! empty( $code ) ) {
-                                $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss );
-                                if ( ! empty( $tmp_thiscss ) ) {
+                            if (!empty($code)) {
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
+                                if (!empty($tmp_thiscss)) {
                                     $thiscss = $tmp_thiscss;
                                     $import_ok = true;
-                                    unset( $tmp_thiscss );
+                                    unset($tmp_thiscss);
                                 }
                             }
-                            unset( $code );
+                            unset($code);
                         }
                     }
-                    if ( ! $import_ok ) {
+                    if (!$import_ok) {
                         // External imports and general fall-back.
                         $external_imports .= $import;
 
-                        $thiscss    = str_replace( $import, '', $thiscss );
+                        $thiscss    = str_replace($import, '', $thiscss);
                         $fiximports = true;
                     }
                 }
-                $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss );
-                $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss );
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
 
                 // and update $thiscss_nocomments before going into next iteration in while loop.
-                $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
             }
-            unset( $thiscss_nocomments );
+            unset($thiscss_nocomments);
 
             // Add external imports to top of aggregated CSS.
-            if ( $fiximports ) {
-                $thiscss = $external_imports . $thiscss;
+            if ($fiximports) {
+                $thiscss = $external_imports.$thiscss;
             }
         }
-        unset( $thiscss );
+        unset($thiscss);
 
         // $this->csscode has all the uncompressed code now.
-        foreach ( $this->csscode as &$code ) {
+        foreach ($this->csscode as &$code) {
             // Check for already-minified code.
-            $hash = md5( $code );
-            do_action( 'autoptimize_action_css_hash', $hash );
-            $ccheck = new autoptimizeCache( $hash, 'css' );
-            if ( $ccheck->check() ) {
+            $hash = md5($code);
+            do_action('autoptimize_action_css_hash', $hash);
+            $ccheck = new autoptimizeCache($hash, 'css');
+            if ($ccheck->check()) {
                 $code = $ccheck->retrieve();
-                $this->hashmap[md5( $code )] = $hash;
+                $this->hashmap[md5($code)] = $hash;
                 continue;
             }
-            unset( $ccheck );
+            unset($ccheck);
 
             // Rewrite and/or inline referenced assets.
-            $code = $this->rewrite_assets( $code );
+            $code = $this->rewrite_assets($code);
 
             // Minify.
-            $code = $this->run_minifier_on( $code );
+            $code = $this->run_minifier_on($code);
 
             // Bring back INJECTLATER stuff.
-            $code = $this->inject_minified( $code );
+            $code = $this->inject_minified($code);
 
             // Filter results.
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
-            if ( ! empty( $tmp_code ) ) {
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
+            if (!empty($tmp_code)) {
                 $code = $tmp_code;
-                unset( $tmp_code );
+                unset($tmp_code);
             }
 
-            $this->hashmap[md5( $code )] = $hash;
+            $this->hashmap[md5($code)] = $hash;
         }
 
-        unset( $code );
+        unset($code);
         return true;
     }
 
-    public function run_minifier_on( $code )
+    public function run_minifier_on($code)
     {
-        if ( ! $this->alreadyminified ) {
-            $do_minify = apply_filters( 'autoptimize_css_do_minify', true );
+        if (!$this->alreadyminified) {
+            $do_minify = apply_filters('autoptimize_css_do_minify', true);
 
-            if ( $do_minify ) {
+            if ($do_minify) {
                 $cssmin   = new autoptimizeCSSmin();
-                $tmp_code = trim( $cssmin->run( $code ) );
+                $tmp_code = trim($cssmin->run($code));
 
-                if ( ! empty( $tmp_code ) ) {
+                if (!empty($tmp_code)) {
                     $code = $tmp_code;
-                    unset( $tmp_code );
+                    unset($tmp_code);
                 }
             }
         }
@@ -769,14 +769,14 @@ 
     public function cache()
     {
         // CSS cache.
-        foreach ( $this->csscode as $media => $code ) {
-            $md5 = $this->hashmap[md5( $code )];
-            $cache = new autoptimizeCache( $md5, 'css' );
-            if ( ! $cache->check() ) {
+        foreach ($this->csscode as $media => $code) {
+            $md5 = $this->hashmap[md5($code)];
+            $cache = new autoptimizeCache($md5, 'css');
+            if (!$cache->check()) {
                 // Cache our code.
-                $cache->cache( $code, 'text/css' );
+                $cache->cache($code, 'text/css');
             }
-            $this->url[$media] = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+            $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         }
     }
 
@@ -784,88 +784,88 @@ 
     public function getcontent()
     {
         // restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // restore (no)script.
-        $this->content = $this->restore_marked_content( 'SCRIPT', $this->content );
+        $this->content = $this->restore_marked_content('SCRIPT', $this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Restore the full content.
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // Inject the new stylesheets.
-        $replaceTag = array( '<title', 'before' );
-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content );
+        $replaceTag = array('<title', 'before');
+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
 
-        if ( $this->inline ) {
-            foreach ( $this->csscode as $media => $code ) {
-                $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $code . '</style>', $replaceTag );
+        if ($this->inline) {
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
             }
         } else {
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preloadCssBlock = '';
                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";
 
                 $defer_inline_code = $this->defer_inline;
-                if ( ! empty( $defer_inline_code ) ) {
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
-                        $iCssHash = md5( $defer_inline_code );
-                        $iCssCache = new autoptimizeCache( $iCssHash, 'css' );
-                        if ( $iCssCache->check() ) {
+                if (!empty($defer_inline_code)) {
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
+                        $iCssHash = md5($defer_inline_code);
+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');
+                        if ($iCssCache->check()) {
                             // we have the optimized inline CSS in cache.
                             $defer_inline_code = $iCssCache->retrieve();
                         } else {
                             $cssmin   = new autoptimizeCSSmin();
-                            $tmp_code = trim( $cssmin->run( $defer_inline_code ) );
+                            $tmp_code = trim($cssmin->run($defer_inline_code));
 
-                            if ( ! empty( $tmp_code ) ) {
+                            if (!empty($tmp_code)) {
                                 $defer_inline_code = $tmp_code;
-                                $iCssCache->cache( $defer_inline_code, 'text/css' );
-                                unset( $tmp_code );
+                                $iCssCache->cache($defer_inline_code, 'text/css');
+                                unset($tmp_code);
                             }
                         }
                     }
-                    $code_out = '<style type="text/css" id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
-                    $this->inject_in_html( $code_out, $replaceTag );
+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
+                    $this->inject_in_html($code_out, $replaceTag);
                 }
             }
 
-            foreach ( $this->url as $media => $url ) {
-                $url = $this->url_replace_cdn( $url );
+            foreach ($this->url as $media => $url) {
+                $url = $this->url_replace_cdn($url);
 
                 // Add the stylesheet either deferred (import at bottom) or normal links in head.
-                if ( $this->defer ) {
+                if ($this->defer) {
                     $preloadOnLoad = autoptimizeConfig::get_ao_css_preload_onload();
 
-                    $preloadCssBlock .= '<link rel="preload" as="style" media="' . $media . '" href="' . $url . '" onload="' . $preloadOnLoad . '" />';
-                    $noScriptCssBlock .= '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
+                    $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preloadOnLoad.'" />';
+                    $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
                 } else {
                     // $this->inject_in_html('<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag);
-                    if ( strlen( $this->csscode[$media] ) > $this->cssinlinesize ) {
-                        $this->inject_in_html( '<link type="text/css" media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag );
-                    } elseif ( strlen( $this->csscode[$media] ) > 0 ) {
-                        $this->inject_in_html( '<style type="text/css" media="' . $media . '">' . $this->csscode[$media] . '</style>', $replaceTag );
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
+                    } elseif (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
                     }
                 }
             }
 
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
                 $noScriptCssBlock .= '</noscript>';
-                $this->inject_in_html( $preloadCssBlock . $noScriptCssBlock, $replaceTag );
+                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag);
 
                 // Adds preload polyfill at end of body tag.
                 $this->inject_in_html(
-                    apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ),
-                    array( '</body>', 'before' )
+                    apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill),
+                    array('</body>', 'before')
                 );
             }
         }
@@ -874,44 +874,44 @@ 
         return $this->content;
     }
 
-    static function fixurls( $file, $code )
+    static function fixurls($file, $code)
     {
         // Switch all imports to the url() syntax.
-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
 
-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
-            $file = str_replace( WP_ROOT_DIR, '/', $file );
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
             /**
              * rollback as per https://github.com/futtta/autoptimize/issues/94
              * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file );
              */
-            $dir = dirname( $file ); // Like /themes/expound/css.
+            $dir = dirname($file); // Like /themes/expound/css.
 
             /**
              * $dir should not contain backslashes, since it's used to replace
              * urls, but it can contain them when running on Windows because
              * fixurls() is sometimes called with `ABSPATH . 'index.php'`
              */
-            $dir = str_replace( '\\', '/', $dir );
-            unset( $file ); // not used below at all.
+            $dir = str_replace('\\', '/', $dir);
+            unset($file); // not used below at all.
 
             $replace = array();
-            foreach ( $matches[1] as $k => $url ) {
+            foreach ($matches[1] as $k => $url) {
                 // Remove quotes.
-                $url    = trim( $url, " \t\n\r\0\x0B\"'" );
-                $noQurl = trim( $url, "\"'" );
-                if ( $url !== $noQurl ) {
+                $url    = trim($url, " \t\n\r\0\x0B\"'");
+                $noQurl = trim($url, "\"'");
+                if ($url !== $noQurl) {
                     $removedQuotes = true;
                 } else {
                     $removedQuotes = false;
                 }
 
-                if ( '' === $noQurl ) {
+                if ('' === $noQurl) {
                     continue;
                 }
 
                 $url = $noQurl;
-                if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
+                if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
                     // URL is protocol-relative, host-relative or something we don't touch.
                     continue;
                 } else {
@@ -920,49 +920,49 @@ 
                      * rollback as per https://github.com/futtta/autoptimize/issues/94
                      * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
                      */
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
-                    $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl );
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
+                    $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl);
 
                     /**
                      * Hash the url + whatever was behind potentially for replacement
                      * We must do this, or different css classes referencing the same bg image (but
                      * different parts of it, say, in sprites and such) loose their stuff...
                      */
-                    $hash = md5( $url . $matches[2][$k] );
-                    $code = str_replace( $matches[0][$k], $hash, $code );
+                    $hash = md5($url.$matches[2][$k]);
+                    $code = str_replace($matches[0][$k], $hash, $code);
 
-                    if ( $removedQuotes ) {
-                        $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
+                    if ($removedQuotes) {
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
                     } else {
-                        $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
                     }
                 }
             }
 
-            $code = self::replace_longest_matches_first( $code, $replace );
+            $code = self::replace_longest_matches_first($code, $replace);
         }
 
         return $code;
     }
 
-    private function ismovable( $tag )
+    private function ismovable($tag)
     {
-        if ( ! $this->aggregate ) {
+        if (!$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->whitelist ) ) {
-            foreach ( $this->whitelist as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+        if (!empty($this->whitelist)) {
+            foreach ($this->whitelist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // no match with whitelist.
             return false;
         } else {
-            if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) {
-                foreach ( $this->dontmove as $match ) {
-                    if ( false !== strpos( $tag, $match ) ) {
+            if (is_array($this->dontmove) && !empty($this->dontmove)) {
+                foreach ($this->dontmove as $match) {
+                    if (false !== strpos($tag, $match)) {
                         // Matched something.
                         return false;
                     }
@@ -974,22 +974,22 @@ 
         }
     }
 
-    private function can_inject_late( $cssPath, $css )
+    private function can_inject_late($cssPath, $css)
     {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $cssPath );
-        if ( true !== $this->inject_min_late ) {
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off.
             return false;
-        } elseif ( ( false === strpos( $cssPath, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $cssPath ) === $cssPath ) ) {
+        } elseif ((false === strpos($cssPath, 'min.css')) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
             // file not minified based on filename & filter.
             return false;
-        } elseif ( false !== strpos( $css, '@import' ) ) {
+        } elseif (false !== strpos($css, '@import')) {
             // can't late-inject files with imports as those need to be aggregated.
             return false;
-        } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) {
+        } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) {
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed.
             return false;
-        } elseif ( ( ( $this->datauris == true ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) {
+        } elseif ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) {
             // don't late-inject CSS with images if CDN is set OR if image inlining is on.
             return false;
         } else {
@@ -1007,32 +1007,32 @@ 
      *
      * @return bool|string Url pointing to the minified css file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'css' );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'css');
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
+        if (!$cache->check() || $cache_miss) {
             // Fixurls...
-            $contents = self::fixurls( $filepath, $contents );
+            $contents = self::fixurls($filepath, $contents);
             // CDN-replace any referenced assets if needed...
-            $contents = $this->replace_urls( $contents );
+            $contents = $this->replace_urls($contents);
             // Now minify...
             $cssmin   = new autoptimizeCSSmin();
-            $contents = trim( $cssmin->run( $contents ) );
+            $contents = trim($cssmin->run($contents));
             // Store in cache.
-            $cache->cache( $contents, 'text/css' );
+            $cache->cache($contents, 'text/css');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         return $url;
     }
@@ -1052,18 +1052,18 @@ 
         return $this->options;
     }
 
-    public function replaceOptions( $options )
+    public function replaceOptions($options)
     {
         $this->options = $options;
     }
 
-    public function setOption( $name, $value )
+    public function setOption($name, $value)
     {
         $this->options[$name] = $value;
         $this->$name = $value;
     }
 
-    public function getOption( $name )
+    public function getOption($name)
     {
         return $this->options[$name];
     }

tests/bootstrap.php

Spacing +34 added lines, -34 removed lines

@@ -3,50 +3,50 @@ 
  * WP tests bootstrap.
  */
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
-    $tmp_dir = getenv( 'TMPDIR' );
-    if ( ! empty( $tmp_dir ) ) {
-        $_tests_dir = rtrim( $tmp_dir, '/' ) . '/wordpress-tests-lib';
-        if ( ! is_dir( $_tests_dir ) ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if (!$_tests_dir) {
+    $tmp_dir = getenv('TMPDIR');
+    if (!empty($tmp_dir)) {
+        $_tests_dir = rtrim($tmp_dir, '/').'/wordpress-tests-lib';
+        if (!is_dir($_tests_dir)) {
             $_tests_dir = null;
         }
     }
 }
 
-if ( ! $_tests_dir ) {
+if (!$_tests_dir) {
     $_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
-require_once $_tests_dir . '/includes/functions.php';
+require_once $_tests_dir.'/includes/functions.php';
 
 function _manually_load_plugin() {
-    define( 'AUTOPTIMIZE_INIT_EARLIER', true );
+    define('AUTOPTIMIZE_INIT_EARLIER', true);
 
     // For overriding cache dirs and whatnot. Kinda works if you keep a few things in mind.
-    if ( getenv('CUSTOM_CONSTANTS' ) ) {
-        define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/' );
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+    if (getenv('CUSTOM_CONSTANTS')) {
+        define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/c/ao/');
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
-        define( 'AUTOPTIMIZE_CACHE_DIR', $pathname );
+        define('AUTOPTIMIZE_CACHE_DIR', $pathname);
 
         $custom_site_url = 'http://localhost/wordpress';
-        define( 'AUTOPTIMIZE_WP_SITE_URL', $custom_site_url );
-        add_filter( 'site_url', function( $url, $path, $scheme, $blog_id ) use ( $custom_site_url ) {
+        define('AUTOPTIMIZE_WP_SITE_URL', $custom_site_url);
+        add_filter('site_url', function($url, $path, $scheme, $blog_id) use ($custom_site_url) {
             return $custom_site_url;
-        }, 10, 4 );
-        add_filter( 'content_url', function( $url, $path ) use ( $custom_site_url ) {
-            return $custom_site_url . '/wp-content';
-        }, 10, 2 );
-        define( 'AO_TEST_SUBFOLDER_INSTALL', true );
+        }, 10, 4);
+        add_filter('content_url', function($url, $path) use ($custom_site_url) {
+            return $custom_site_url.'/wp-content';
+        }, 10, 2);
+        define('AO_TEST_SUBFOLDER_INSTALL', true);
 
-        define( 'CUSTOM_CONSTANTS_USED', true );
+        define('CUSTOM_CONSTANTS_USED', true);
     } else {
-        define( 'CUSTOM_CONSTANTS_USED', false );
-        define( 'AO_TEST_SUBFOLDER_INSTALL', false );
+        define('CUSTOM_CONSTANTS_USED', false);
+        define('AO_TEST_SUBFOLDER_INSTALL', false);
     }
 
     /*
@@ -54,18 +54,18 @@ 
     update_option( 'active_plugins', $active_plugins );
     */
 
-    update_option( 'autoptimize_js', 1 );
-    update_option( 'autoptimize_css', 1 );
-    update_option( 'autoptimize_html', 0 );
-    update_option( 'autoptimize_cdn_url', 'http://cdn.example.org' );
-    update_option( 'autoptimize_cache_nogzip', 1 );
+    update_option('autoptimize_js', 1);
+    update_option('autoptimize_css', 1);
+    update_option('autoptimize_html', 0);
+    update_option('autoptimize_cdn_url', 'http://cdn.example.org');
+    update_option('autoptimize_cache_nogzip', 1);
 
-    add_filter( 'autoptimize_css_include_inline', function( $include_inline ) {
+    add_filter('autoptimize_css_include_inline', function($include_inline) {
         return true;
     });
 
-    require dirname( dirname( __FILE__ ) ) . '/autoptimize.php';
+    require dirname(dirname(__FILE__)).'/autoptimize.php';
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
-require $_tests_dir . '/includes/bootstrap.php';
+require $_tests_dir.'/includes/bootstrap.php';

tests/test-ao.php

Spacing +376 added lines, -376 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,16 +28,16 @@ 
         $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' ),
+            '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'),
         ];
     }
 
@@ -46,13 +46,13 @@ 
         $conf = autoptimizeConfig::instance();
 
         return [
-            'aggregate'      => $conf->get( 'autoptimize_js_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' ),
+            'aggregate'      => $conf->get('autoptimize_js_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'),
         ];
     }
 
@@ -62,34 +62,34 @@ 
     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 = get_option( 'autoptimize_cdn_url' );
+        if (null === $cdn_url) {
+            $cdn_url = get_option('autoptimize_cdn_url');
         }
 
         static $imgopt_host = null;
-        if ( null === $imgopt_host ) {
-            $imgopt_host = rtrim( autoptimizeExtra::get_imgopt_host_wrapper(), '/' );
+        if (null === $imgopt_host) {
+            $imgopt_host = rtrim(autoptimizeExtra::get_imgopt_host_wrapper(), '/');
         }
 
         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/';
             }
         }
@@ -102,7 +102,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();
     }
@@ -121,8 +121,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();
@@ -246,15 +246,15 @@ 
     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';
         }
 
@@ -313,15 +313,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';
         }
 
@@ -380,15 +380,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';
         }
 
@@ -447,15 +447,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';
         }
 
@@ -514,11 +514,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()
@@ -530,7 +530,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()),
             ),
 
         );
@@ -590,12 +590,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()
@@ -629,22 +629,22 @@ 
 .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
      * @covers autoptimizeScripts::should_aggregate
      */
-    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()
@@ -707,11 +707,11 @@ 
      * @dataProvider provider_is_valid_buffer
      * @covers autoptimizeMain::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()
@@ -774,11 +774,11 @@ 
      * @dataProvider provider_is_amp_markup
      * @covers autoptimizeMain::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()
@@ -809,31 +809,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`
@@ -844,23 +844,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',
@@ -869,9 +869,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;
         });
@@ -885,7 +885,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',
@@ -895,19 +895,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;
         });
@@ -919,15 +919,15 @@ 
      * @dataProvider provider_test_url_replace_cdn
      * @covers autoptimizeBase::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()
@@ -944,13 +944,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(
@@ -961,59 +961,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(
@@ -1038,8 +1038,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...
@@ -1078,31 +1078,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()
@@ -1141,11 +1141,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()
@@ -1170,7 +1170,7 @@ 
             // 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',
             ),
             // Empty $url should return false.
             array(
@@ -1196,12 +1196,12 @@ 
      * @dataProvider provider_getpath
      * @covers autoptimizeBase::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);
     }
 
     /**
@@ -1215,7 +1215,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")}
@@ -1228,13 +1228,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}
@@ -1286,27 +1286,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);
     }
 
     /**
@@ -1326,7 +1326,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}
@@ -1370,24 +1370,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);
     }
 
     /**
@@ -1507,12 +1507,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);
     }
 
     /**
@@ -1628,10 +1628,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()
@@ -1652,16 +1652,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);
@@ -1675,10 +1675,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()
@@ -1694,18 +1694,18 @@ 
 </style>
 HTML;
 
-        $expected = '<style type="text/css" media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css?a&#038;b);@import url(' . $cdnurl . '/' . $sub . 'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
+        $expected = '<style type="text/css" media="all">@import url('.$cdnurl.'/'.$sub.'foo.css?a&#038;b);@import url('.$cdnurl.'/'.$sub.'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
 
         $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()
@@ -1715,10 +1715,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()
@@ -1733,43 +1733,43 @@ 
 </style>
 HTML;
 
-        $expected = '<style type="text/css" media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css);@import url(' . $cdnurl . '/' . $sub . 'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
+        $expected = '<style type="text/css" media="all">@import url('.$cdnurl.'/'.$sub.'foo.css);@import url('.$cdnurl.'/'.$sub.'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
 
         $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( 'daily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals('daily', 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()
@@ -1782,12 +1782,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'));
         }
 
         /*
@@ -1804,18 +1804,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()
@@ -1823,47 +1823,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()
@@ -1871,78 +1871,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";
@@ -1972,23 +1972,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 -->
@@ -1999,7 +1999,7 @@ 
 <!-- End Support AJAX add to cart</script>
 MARKUP;
 
-        $markup2   = <<<MARKUP
+        $markup2 = <<<MARKUP
 <script>
 <!-- End Support AJAX add to cart -->
 var a = "b";
@@ -2016,17 +2016,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()
@@ -2050,11 +2050,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()
@@ -2079,49 +2079,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()
@@ -2163,48 +2163,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
@@ -2213,55 +2213,55 @@ 
 
         // $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');
 
         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()
     {
-        $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() );
+        $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts());
     }
 
     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));
     }
 
     /**
@@ -2275,16 +2275,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');
     }
 
     /**
@@ -2307,8 +2307,8 @@ 
 MARKUP;
 
         $instance = new autoptimizeExtra();
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2329,8 +2329,8 @@ 
 MARKUP;
 
         $instance = new autoptimizeExtra();
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2353,8 +2353,8 @@ 
 MARKUP;
 
         $instance = new autoptimizeExtra();
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2364,7 +2364,7 @@ 
     {
         $actual = autoptimizeUtils::str_is_valid_regex($str);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_str_is_valid_regex()
@@ -2380,11 +2380,11 @@ 
     /**
      * @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()
@@ -2411,30 +2411,30 @@ 
 
         $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);
     }
 }

classes/autoptimizeExtra.php

Spacing +298 added lines, -298 removed lines

@@ -3,7 +3,7 @@ 
  * Handles autoptimizeExtra frontend features + admin options page
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,9 +21,9 @@ 
      *
      * @param array $options Optional. Allows overriding options without having to specify them via admin options page.
      */
-    public function __construct( $options = array() )
+    public function __construct($options = array())
     {
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = $this->fetch_options();
         }
 
@@ -32,9 +32,9 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'admin_menu'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
             $this->run_on_frontend();
         }
@@ -42,17 +42,17 @@ 
 
     protected function fetch_options()
     {
-        $value = get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = get_option('autoptimize_extra_settings');
+        if (empty($value)) {
             // Fallback to returning defaults when no stored option exists yet.
             $value = autoptimizeConfig::get_ao_extra_default_options();
         }
 
         // get service availability.
-        $value['availabilities'] = get_option( 'autoptimize_service_availablity' );
+        $value['availabilities'] = get_option('autoptimize_service_availablity');
 
-        if ( empty( $value['availabilities'] ) ) {
-            $value['availabilities'] = autoptimizeUtils::check_service_availability( true );
+        if (empty($value['availabilities'])) {
+            $value['availabilities'] = autoptimizeUtils::check_service_availability(true);
         }
 
         return $value;
@@ -61,54 +61,54 @@ 
     public function disable_emojis()
     {
         // Removing all actions related to emojis!
-        remove_action( 'admin_print_styles', 'print_emoji_styles' );
-        remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
-        remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-        remove_action( 'wp_print_styles', 'print_emoji_styles' );
-        remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
-        remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
-        remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+        remove_action('admin_print_styles', 'print_emoji_styles');
+        remove_action('wp_head', 'print_emoji_detection_script', 7);
+        remove_action('admin_print_scripts', 'print_emoji_detection_script');
+        remove_action('wp_print_styles', 'print_emoji_styles');
+        remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
+        remove_filter('the_content_feed', 'wp_staticize_emoji');
+        remove_filter('comment_text_rss', 'wp_staticize_emoji');
 
         // Removes TinyMCE emojis.
-        add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) );
+        add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce'));
 
         // Removes emoji dns-preftech.
-        add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 );
+        add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2);
     }
 
-    public function filter_disable_emojis_tinymce( $plugins )
+    public function filter_disable_emojis_tinymce($plugins)
     {
-        if ( is_array( $plugins ) ) {
-            return array_diff( $plugins, array( 'wpemoji' ) );
+        if (is_array($plugins)) {
+            return array_diff($plugins, array('wpemoji'));
         } else {
             return array();
         }
     }
 
-    public function filter_remove_qs( $src ) {
-        if ( strpos( $src, '?ver=' ) ) {
-            $src = remove_query_arg( 'ver', $src );
+    public function filter_remove_qs($src) {
+        if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
         }
 
         return $src;
     }
 
-    public function extra_async_js( $in )
+    public function extra_async_js($in)
     {
         $exclusions = array();
-        if ( ! empty( $in ) ) {
-            $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' );
+        if (!empty($in)) {
+            $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), '');
         }
 
         $settings = $this->options['autoptimize_extra_text_field_3'];
-        $async    = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' );
-        $attr     = apply_filters( 'autoptimize_filter_extra_async', 'async' );
-        foreach ( $async as $k => $v ) {
-            $async[ $k ] = $attr;
+        $async    = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), '');
+        $attr     = apply_filters('autoptimize_filter_extra_async', 'async');
+        foreach ($async as $k => $v) {
+            $async[$k] = $attr;
         }
 
         // Merge exclusions & asyncs in one array and return to AO API.
-        $merged = array_merge( $exclusions, $async );
+        $merged = array_merge($exclusions, $async);
 
         return $merged;
     }
@@ -118,76 +118,76 @@ 
         $options = $this->options;
 
         // Disable emojis if specified.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) {
+        if (!empty($options['autoptimize_extra_checkbox_field_1'])) {
             $this->disable_emojis();
         }
 
         // Remove version query parameters.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) {
-            add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
-            add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_0'])) {
+            add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1);
+            add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1);
         }
 
         // Making sure is_plugin_active() exists when we need it.
-        if ( ! function_exists( 'is_plugin_active' ) ) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (!function_exists('is_plugin_active')) {
+            require_once ABSPATH.'wp-admin/includes/plugin.php';
         }
         // Avoiding conflicts of interest when async-javascript plugin is active!
         $async_js_plugin_active = false;
-        if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+        if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) {
             $async_js_plugin_active = true;
         }
-        if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) {
-            add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) {
+            add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1);
         }
 
         // Optimize google fonts!
-        if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 );
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 );
-            add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) {
+            add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2);
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1);
         }
 
         // Preconnect!
-        if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+            add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2);
         }
 
         // Optimize Images!
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ( 'launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok() ) ) {
-            if ( apply_filters( 'autoptimize_filter_extra_imgopt_do', true ) ) {
-                add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_images' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_5']) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ('launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok())) {
+            if (apply_filters('autoptimize_filter_extra_imgopt_do', true)) {
+                add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_images'), 10, 1);
                 $_imgopt_active = true;
             }
-            if ( apply_filters( 'autoptimize_filter_extra_imgopt_do_css', true ) ) {
-                add_filter( 'autoptimize_filter_base_replace_cdn', array( $this, 'filter_optimize_css_images' ), 10, 1 );
+            if (apply_filters('autoptimize_filter_extra_imgopt_do_css', true)) {
+                add_filter('autoptimize_filter_base_replace_cdn', array($this, 'filter_optimize_css_images'), 10, 1);
                 $_imgopt_active = true;
             }
-            if ( $_imgopt_active ) {
-                add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_imgopt_url' ), 10, 1 );
+            if ($_imgopt_active) {
+                add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_imgopt_url'), 10, 1);
             }
         }
     }
 
-    public function filter_remove_emoji_dns_prefetch( $urls, $relation_type )
+    public function filter_remove_emoji_dns_prefetch($urls, $relation_type)
     {
-        $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
+        $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
 
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url);
     }
 
-    public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type )
+    public function filter_remove_gfonts_dnsprefetch($urls, $relation_type)
     {
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com');
     }
 
-    public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove )
+    public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove)
     {
-        if ( 'dns-prefetch' === $relation_type ) {
+        if ('dns-prefetch' === $relation_type) {
             $cnt = 0;
-            foreach ( $urls as $url ) {
-                if ( false !== strpos( $url, $url_to_remove ) ) {
-                    unset( $urls[ $cnt ] );
+            foreach ($urls as $url) {
+                if (false !== strpos($url, $url_to_remove)) {
+                    unset($urls[$cnt]);
                 }
                 $cnt++;
             }
@@ -196,131 +196,131 @@ 
         return $urls;
     }
 
-    public function filter_optimize_google_fonts( $in )
+    public function filter_optimize_google_fonts($in)
     {
         // Extract fonts, partly based on wp rocket's extraction code.
-        $markup = preg_replace( '/<!--(.*)-->/Uis', '', $in );
-        preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches );
+        $markup = preg_replace('/<!--(.*)-->/Uis', '', $in);
+        preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches);
 
         $fonts_collection = array();
-        if ( ! $matches[2] ) {
+        if (!$matches[2]) {
             return $in;
         }
 
         // Store them in $fonts array.
         $i = 0;
-        foreach ( $matches[2] as $font ) {
-            if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) {
+        foreach ($matches[2] as $font) {
+            if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) {
                 // Get fonts name.
-                $font = str_replace( array( '%7C', '%7c' ), '|', $font );
-                $font = explode( 'family=', $font );
-                $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+                $font = str_replace(array('%7C', '%7c'), '|', $font);
+                $font = explode('family=', $font);
+                $font = (isset($font[1])) ? explode('&', $font[1]) : array();
                 // Add font to $fonts[$i] but make sure not to pollute with an empty family!
-                $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) );
-                if ( ! empty( $_thisfont ) ) {
-                    $fonts_collection[ $i ]['fonts'] = $_thisfont;
+                $_thisfont = array_values(array_filter(explode('|', reset($font))));
+                if (!empty($_thisfont)) {
+                    $fonts_collection[$i]['fonts'] = $_thisfont;
                     // And add subset if any!
-                    $subset = ( is_array( $font ) ) ? end( $font ) : '';
-                    if ( false !== strpos( $subset, 'subset=' ) ) {
-                        $subset                            = explode( 'subset=', $subset );
-                        $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] );
+                    $subset = (is_array($font)) ? end($font) : '';
+                    if (false !== strpos($subset, 'subset=')) {
+                        $subset                            = explode('subset=', $subset);
+                        $fonts_collection[$i]['subsets'] = explode(',', $subset[1]);
                     }
                 }
                 // And remove Google Fonts.
-                $in = str_replace( $matches[0][ $i ], '', $in );
+                $in = str_replace($matches[0][$i], '', $in);
             }
             $i++;
         }
 
         $options      = $this->options;
         $fonts_markup = '';
-        if ( '2' === $options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' === $options['autoptimize_extra_radio_field_4']) {
             // Remove Google Fonts.
-            unset( $fonts_collection );
+            unset($fonts_collection);
             return $in;
-        } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & link!
             $fonts_string  = '';
             $subset_string = '';
-            foreach ( $fonts_collection as $font ) {
-                $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' );
-                if ( ! empty( $font['subsets'] ) ) {
-                    $subset_string .= implode( ',', $font['subsets'] );
+            foreach ($fonts_collection as $font) {
+                $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|');
+                if (!empty($font['subsets'])) {
+                    $subset_string .= implode(',', $font['subsets']);
                 }
             }
 
-            if ( ! empty( $subset_string ) ) {
-                $fonts_string = $fonts_string . '&#038;subset=' . $subset_string;
+            if (!empty($subset_string)) {
+                $fonts_string = $fonts_string.'&#038;subset='.$subset_string;
             }
 
-            $fonts_string = str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) );
+            $fonts_string = str_replace('|', '%7C', ltrim($fonts_string, '|'));
 
-            if ( ! empty( $fonts_string ) ) {
-                if ( '5' === $options['autoptimize_extra_radio_field_4'] ) {
-                    $rel_string = 'rel="preload" as="style" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"';
+            if (!empty($fonts_string)) {
+                if ('5' === $options['autoptimize_extra_radio_field_4']) {
+                    $rel_string = 'rel="preload" as="style" onload="'.autoptimizeConfig::get_ao_css_preload_onload().'"';
                 } else {
                     $rel_string = 'rel="stylesheet"';
                 }
-                $fonts_markup = '<link ' . $rel_string . ' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $fonts_string . '" />';
+                $fonts_markup = '<link '.$rel_string.' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$fonts_string.'" />';
             }
-        } elseif ( '4' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('4' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & load async (webfont.js impl.)!
             $fonts_array = array();
-            foreach ( $fonts_collection as $_fonts ) {
-                if ( ! empty( $_fonts['subsets'] ) ) {
-                    $_subset = implode( ',', $_fonts['subsets'] );
-                    foreach ( $_fonts['fonts'] as $key => $_one_font ) {
-                        $_one_font               = $_one_font . ':' . $_subset;
-                        $_fonts['fonts'][ $key ] = $_one_font;
+            foreach ($fonts_collection as $_fonts) {
+                if (!empty($_fonts['subsets'])) {
+                    $_subset = implode(',', $_fonts['subsets']);
+                    foreach ($_fonts['fonts'] as $key => $_one_font) {
+                        $_one_font               = $_one_font.':'.$_subset;
+                        $_fonts['fonts'][$key] = $_one_font;
                     }
                 }
-                $fonts_array = array_merge( $fonts_array, $_fonts['fonts'] );
+                $fonts_array = array_merge($fonts_array, $_fonts['fonts']);
             }
 
             $fonts_markup = '<script data-cfasync="false" id="ao_optimized_gfonts" type="text/javascript">WebFontConfig={google:{families:[\'';
-            foreach ( $fonts_array as $fnt ) {
-                $fonts_markup .= $fnt . "','";
+            foreach ($fonts_array as $fnt) {
+                $fonts_markup .= $fnt."','";
             }
-            $fonts_markup  = trim( trim( $fonts_markup, "'" ), ',' );
+            $fonts_markup  = trim(trim($fonts_markup, "'"), ',');
             $fonts_markup .= '] },classes:false, events:false, timeout:1500};(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
         }
 
         // Replace back in markup.
-        $out = substr_replace( $in, $fonts_markup . '<link', strpos( $in, '<link' ), strlen( '<link' ) );
-        unset( $fonts_collection );
+        $out = substr_replace($in, $fonts_markup.'<link', strpos($in, '<link'), strlen('<link'));
+        unset($fonts_collection);
 
         // and insert preload polyfill if "link preload" and if the polyfill isn't there yet (courtesy of inline&defer).
         $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
-        if ( '5' === $options['autoptimize_extra_radio_field_4'] && strpos( $out, $preload_polyfill ) === false ) {
-            $out = str_replace( '</body>', $preload_polyfill . '</body>', $out );
+        if ('5' === $options['autoptimize_extra_radio_field_4'] && strpos($out, $preload_polyfill) === false) {
+            $out = str_replace('</body>', $preload_polyfill.'</body>', $out);
         }
         return $out;
     }
 
-    public function filter_preconnect( $hints, $relation_type )
+    public function filter_preconnect($hints, $relation_type)
     {
         $options = $this->options;
 
         // Get settings and store in array.
-        $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) );
-        $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns );
+        $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2'])));
+        $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns);
 
         // Walk array, extract domain and add to new array with crossorigin attribute.
-        foreach ( $preconns as $preconn ) {
-            $parsed = parse_url( $preconn );
+        foreach ($preconns as $preconn) {
+            $parsed = parse_url($preconn);
 
-            if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+            if (is_array($parsed) && empty($parsed['scheme'])) {
+                $domain = '//'.$parsed['host'];
+            } elseif (is_array($parsed)) {
+                $domain = $parsed['scheme'].'://'.$parsed['host'];
             }
 
-            if ( ! empty( $domain ) ) {
-                $hint = array( 'href' => $domain );
+            if (!empty($domain)) {
+                $hint = array('href' => $domain);
                 // Fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set
                 // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed.
-                $crossorigins = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array( 'https://fonts.gstatic.com' ) );
-                if ( in_array( $domain, $crossorigins ) ) {
+                $crossorigins = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
+                if (in_array($domain, $crossorigins)) {
                     $hint['crossorigin'] = 'anonymous';
                 }
                 $new_hints[] = $hint;
@@ -328,21 +328,21 @@ 
         }
 
         // Merge in WP's preconnect hints.
-        if ( 'preconnect' === $relation_type && ! empty( $new_hints ) ) {
-            $hints = array_merge( $hints, $new_hints );
+        if ('preconnect' === $relation_type && !empty($new_hints)) {
+            $hints = array_merge($hints, $new_hints);
         }
 
         return $hints;
     }
 
-    public function filter_preconnect_google_fonts( $in )
+    public function filter_preconnect_google_fonts($in)
     {
-        if ( '2' !== $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' !== $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect to fonts.gstatic.com unless we remove gfonts.
             $in[] = 'https://fonts.gstatic.com';
         }
 
-        if ( '4' === $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('4' === $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect even more hosts for webfont.js!
             $in[] = 'https://ajax.googleapis.com';
             $in[] = 'https://fonts.googleapis.com';
@@ -351,7 +351,7 @@ 
         return $in;
     }
 
-    public function filter_optimize_images( $in )
+    public function filter_optimize_images($in)
     {
         /*
          * potential future functional improvements:
@@ -364,26 +364,26 @@ 
         $to_replace      = array();
 
         // extract img tags.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) {
+            foreach ($matches[0] as $tag) {
                 $orig_tag = $tag;
                 $imgopt_w = '';
                 $imgopt_h = '';
 
                 // first do (data-)srcsets.
-                if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) {
-                    foreach ( $allsrcsets as $srcset ) {
+                if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) {
+                    foreach ($allsrcsets as $srcset) {
                         $srcset  = $srcset[2];
-                        $srcsets = explode( ',', $srcset );
-                        foreach ( $srcsets as $indiv_srcset ) {
-                            $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) );
-                            if ( $indiv_srcset_parts[1] && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) {
-                                $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' );
+                        $srcsets = explode(',', $srcset);
+                        foreach ($srcsets as $indiv_srcset) {
+                            $indiv_srcset_parts = explode(' ', trim($indiv_srcset));
+                            if ($indiv_srcset_parts[1] && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) {
+                                $imgopt_w = rtrim($indiv_srcset_parts[1], 'w');
                             }
-                            if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) {
-                                $imgopt_url              = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' );
-                                $tag                     = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag );
-                                $to_replace[ $orig_tag ] = $tag;
+                            if ($this->can_optimize_image($indiv_srcset_parts[0])) {
+                                $imgopt_url              = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, '');
+                                $tag                     = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag);
+                                $to_replace[$orig_tag] = $tag;
                             }
                         }
                     }
@@ -393,35 +393,35 @@ 
                 // first reset and then get width and height and add to $imgopt_size.
                 $imgopt_w = '';
                 $imgopt_h = '';
-                if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $width ) ) {
+                if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $width)) {
                     $imgopt_w = $width[2];
                 }
-                if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $height ) ) {
+                if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $height)) {
                     $imgopt_h = $height[2];
                 }
 
                 // then start replacing images src.
-                if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) {
-                    foreach ( $urls as $url ) {
+                if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) {
+                    foreach ($urls as $url) {
                         $full_src_orig = $url[0];
                         $url           = $url[1];
-                        if ( $this->can_optimize_image( $url ) ) {
-                            $imgopt_url              = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h );
-                            $full_imgopt_src         = str_replace( $url, $imgopt_url, $full_src_orig );
-                            $tag                     = str_replace( $full_src_orig, $full_imgopt_src, $tag );
-                            $to_replace[ $orig_tag ] = $tag;
+                        if ($this->can_optimize_image($url)) {
+                            $imgopt_url              = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h);
+                            $full_imgopt_src         = str_replace($url, $imgopt_url, $full_src_orig);
+                            $tag                     = str_replace($full_src_orig, $full_imgopt_src, $tag);
+                            $to_replace[$orig_tag] = $tag;
                         }
                     }
                 }
             }
         }
-        $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in );
+        $out = str_replace(array_keys($to_replace), array_values($to_replace), $in);
 
         // img thumbnails in e.g. woocommerce.
-        if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_extra_imgopt_datathumbs', true ) ) {
+        if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_extra_imgopt_datathumbs', true)) {
             $out = preg_replace_callback(
                 '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s',
-                array( $this, 'replace_data_thumbs' ),
+                array($this, 'replace_data_thumbs'),
                 $out
             );
         }
@@ -429,13 +429,13 @@ 
         return $out;
     }
 
-    public function filter_optimize_css_images( $in )
+    public function filter_optimize_css_images($in)
     {
         $imgopt_base_url = $this->get_imgopt_base_url();
-        $in              = $this->normalize_img_urls( $in );
+        $in              = $this->normalize_img_urls($in);
 
-        if ( $this->can_optimize_image( $in ) ) {
-            return $this->build_imgopt_url( $in, '', '' );
+        if ($this->can_optimize_image($in)) {
+            return $this->build_imgopt_url($in, '', '');
         } else {
             return $in;
         }
@@ -445,47 +445,47 @@ 
     {
         static $imgopt_base_url = null;
 
-        if ( is_null( $imgopt_base_url ) ) {
+        if (is_null($imgopt_base_url)) {
             $imgopt_host     = $this->get_imgopt_host();
             $quality         = $this->get_img_quality_string();
-            $ret_val         = apply_filters( 'autoptimize_filter_extra_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank.
-            $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val;
-            $imgopt_base_url = apply_filters( 'autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url );
+            $ret_val         = apply_filters('autoptimize_filter_extra_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank.
+            $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val;
+            $imgopt_base_url = apply_filters('autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url);
         }
 
         return $imgopt_base_url;
     }
 
-    private function can_optimize_image( $url )
+    private function can_optimize_image($url)
     {
         static $cdn_url      = null;
         static $nopti_images = null;
 
-        if ( is_null( $cdn_url ) ) {
-            $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) );
+        if (is_null($cdn_url)) {
+            $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', ''));
         }
 
-        if ( is_null( $nopti_images ) ) {
-            $nopti_images = apply_filters( 'autoptimize_filter_extra_imgopt_noptimize', '' );
+        if (is_null($nopti_images)) {
+            $nopti_images = apply_filters('autoptimize_filter_extra_imgopt_noptimize', '');
         }
 
         $imgopt_base_url = $this->get_imgopt_base_url();
         $site_host       = AUTOPTIMIZE_SITE_DOMAIN;
-        $url_parsed      = parse_url( $url );
+        $url_parsed      = parse_url($url);
 
-        if ( $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) {
+        if ($url_parsed['host'] !== $site_host && empty($cdn_url)) {
             return false;
-        } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && $url_parsed['host'] !== $site_host ) {
+        } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && $url_parsed['host'] !== $site_host) {
             return false;
-        } elseif ( strpos( $url, '.php' ) !== false ) {
+        } elseif (strpos($url, '.php') !== false) {
             return false;
-        } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg'), '', $url_parsed['path']) === $url_parsed['path']) {
             // fixme: better check against end of string.
             return false;
-        } elseif ( ! empty( $nopti_images ) ) {
-            $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) );
-            foreach ( $nopti_images_array as $nopti_image ) {
-                if ( strpos( $url, $nopti_image ) !== false ) {
+        } elseif (!empty($nopti_images)) {
+            $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images)));
+            foreach ($nopti_images_array as $nopti_image) {
+                if (strpos($url, $nopti_image) !== false) {
                     return false;
                 }
             }
@@ -493,72 +493,72 @@ 
         return true;
     }
 
-    private function build_imgopt_url( $orig_url, $width = 0, $height = 0 )
+    private function build_imgopt_url($orig_url, $width = 0, $height = 0)
     {
-        $filtered_url = apply_filters( 'autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height );
+        $filtered_url = apply_filters('autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height);
 
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $orig_url        = $this->normalize_img_urls( $orig_url );
+        $orig_url        = $this->normalize_img_urls($orig_url);
         $imgopt_base_url = $this->get_imgopt_base_url();
         $imgopt_size     = '';
 
-        if ( $width && 0 !== $width ) {
-            $imgopt_size = ',w_' . $width;
+        if ($width && 0 !== $width) {
+            $imgopt_size = ',w_'.$width;
         }
 
-        if ( $height && 0 !== $height ) {
-            $imgopt_size .= ',h_' . $height;
+        if ($height && 0 !== $height) {
+            $imgopt_size .= ',h_'.$height;
         }
 
-        $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url;
+        $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url;
 
         return $url;
     }
 
-    public function replace_data_thumbs( $matches )
+    public function replace_data_thumbs($matches)
     {
-        if ( $this->can_optimize_image( $matches[1] ) ) {
-            return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], 150, 150 ), $matches[0] );
+        if ($this->can_optimize_image($matches[1])) {
+            return str_replace($matches[1], $this->build_imgopt_url($matches[1], 150, 150), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_preconnect_imgopt_url( $in )
+    public function filter_preconnect_imgopt_url($in)
     {
-        $imgopt_url_array = parse_url( $this->get_imgopt_base_url() );
-        $in[]             = $imgopt_url_array['scheme'] . '://' . $imgopt_url_array['host'];
+        $imgopt_url_array = parse_url($this->get_imgopt_base_url());
+        $in[]             = $imgopt_url_array['scheme'].'://'.$imgopt_url_array['host'];
 
         return $in;
     }
 
-    private function normalize_img_urls( $in )
+    private function normalize_img_urls($in)
     {
-        $parsed_site_url = parse_url( site_url() );
+        $parsed_site_url = parse_url(site_url());
 
-        if ( strpos( $in, 'http' ) !== 0 && strpos( $in, '//' ) === 0 ) {
-            $in = $parsed_site_url['scheme'] . ':' . $in;
-        } elseif ( strpos( $in, '/' ) === 0 ) {
-            $in = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'] . $in;
+        if (strpos($in, 'http') !== 0 && strpos($in, '//') === 0) {
+            $in = $parsed_site_url['scheme'].':'.$in;
+        } elseif (strpos($in, '/') === 0) {
+            $in = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'].$in;
         }
 
-        return apply_filters( 'autoptimize_filter_extra_imgopt_normalized_url', $in );
+        return apply_filters('autoptimize_filter_extra_imgopt_normalized_url', $in);
     }
 
     private function get_img_quality_array()
     {
         static $img_quality_array = null;
 
-        if ( is_null( $img_quality_array ) ) {
+        if (is_null($img_quality_array)) {
             $img_quality_array = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
                 '3' => 'lossless',
             );
-            $img_quality_array = apply_filters( 'autoptimize_filter_extra_imgopt_quality_array', $img_quality_array );
+            $img_quality_array = apply_filters('autoptimize_filter_extra_imgopt_quality_array', $img_quality_array);
         }
 
         return $img_quality_array;
@@ -568,10 +568,10 @@ 
     {
         static $_img_q = null;
 
-        if ( is_null( $_img_q ) ) {
+        if (is_null($_img_q)) {
             $_setting = $this->options['autoptimize_extra_select_field_6'];
 
-            if ( ! $_setting || empty( $_setting ) || ( '1' !== $_setting && '3' !== $_setting ) ) {
+            if (!$_setting || empty($_setting) || ('1' !== $_setting && '3' !== $_setting)) {
                 // default image opt. value is 2 ("glossy").
                 $_img_q = '2';
             } else {
@@ -586,10 +586,10 @@ 
     {
         static $_img_q_string = null;
 
-        if ( is_null( $_img_q_string ) ) {
+        if (is_null($_img_q_string)) {
             $_quality_array = $this->get_img_quality_array();
             $_setting       = $this->get_img_quality_setting();
-            $_img_q_string  = apply_filters( 'autoptimize_filter_extra_imgopt_quality', 'q_' . $_quality_array[ $_setting ] );
+            $_img_q_string  = apply_filters('autoptimize_filter_extra_imgopt_quality', 'q_'.$_quality_array[$_setting]);
         }
 
         return $_img_q_string;
@@ -604,25 +604,25 @@ 
 
     public function query_img_provider_stats()
     {
-        if ( ! empty( $this->options['autoptimize_extra_checkbox_field_5'] ) ) {
+        if (!empty($this->options['autoptimize_extra_checkbox_field_5'])) {
             $_img_provider_stat_url = '';
-            $_img_provider_endpoint = $this->get_imgopt_host() . 'read-domain/';
+            $_img_provider_endpoint = $this->get_imgopt_host().'read-domain/';
             $_site_host             = AUTOPTIMIZE_SITE_DOMAIN;
 
             // make sure parse_url result makes sense, keeping $_img_provider_stat_url empty if not.
-            if ( $_site_host && ! empty( $_site_host ) ) {
-                $_img_provider_stat_url = $_img_provider_endpoint . $_site_host;
+            if ($_site_host && !empty($_site_host)) {
+                $_img_provider_stat_url = $_img_provider_endpoint.$_site_host;
             }
 
-            $_img_provider_stat_url = apply_filters( 'autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url );
+            $_img_provider_stat_url = apply_filters('autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url);
 
             // only do the remote call if $_img_provider_stat_url is not empty to make sure no parse_url weirdness results in useless calls.
-            if ( ! empty( $_img_provider_stat_url ) ) {
-                $_img_stat_resp = wp_remote_get( $_img_provider_stat_url );
-                if ( ! is_wp_error( $_img_stat_resp ) ) {
-                    if ( '200' == wp_remote_retrieve_response_code( $_img_stat_resp ) ) {
-                        $_img_provider_stat = json_decode( wp_remote_retrieve_body( $_img_stat_resp ), true );
-                        update_option( 'autoptimize_imgopt_provider_stat', $_img_provider_stat );
+            if (!empty($_img_provider_stat_url)) {
+                $_img_stat_resp = wp_remote_get($_img_provider_stat_url);
+                if (!is_wp_error($_img_stat_resp)) {
+                    if ('200' == wp_remote_retrieve_response_code($_img_stat_resp)) {
+                        $_img_provider_stat = json_decode(wp_remote_retrieve_body($_img_stat_resp), true);
+                        update_option('autoptimize_imgopt_provider_stat', $_img_provider_stat);
                     }
                 }
             }
@@ -633,14 +633,14 @@ 
     {
         static $launch_status = null;
 
-        if ( is_null( $launch_status ) ) {
+        if (is_null($launch_status)) {
             $avail_imgopt = $this->options['availabilities']['extra_imgopt'];
-            $magic_number = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 );
-            $has_launched = get_option( 'autoptimize_imgopt_launched', '' );
-            if ( $has_launched || ( array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) {
+            $magic_number = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16);
+            $has_launched = get_option('autoptimize_imgopt_launched', '');
+            if ($has_launched || (array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) {
                 $launch_status = true;
-                if ( ! $has_launched ) {
-                    update_option( 'autoptimize_imgopt_launched', 'on' );
+                if (!$has_launched) {
+                    update_option('autoptimize_imgopt_launched', 'on');
                 }
             } else {
                 $launch_status = false;
@@ -661,10 +661,10 @@ 
     {
         static $imgopt_host = null;
 
-        if ( is_null( $imgopt_host ) ) {
+        if (is_null($imgopt_host)) {
             $avail_imgopt = $this->options['availabilities']['extra_imgopt'];
-            if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) {
-                $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) );
+            if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) {
+                $imgopt_host = array_rand(array_flip($avail_imgopt['hosts']));
             } else {
                 $imgopt_host = 'https://cdn.shortpixel.ai/';
             }
@@ -682,25 +682,25 @@ 
 
     public function get_imgopt_status_notice() {
         $_extra_options = $this->options;
-        if ( ! empty( $_extra_options ) && is_array( $_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_extra_options ) && ! empty( $_extra_options['autoptimize_extra_checkbox_field_5'] ) ) {
+        if (!empty($_extra_options) && is_array($_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_extra_options) && !empty($_extra_options['autoptimize_extra_checkbox_field_5'])) {
             $_imgopt_notice = '';
-            $_stat          = get_option( 'autoptimize_imgopt_provider_stat', '' );
+            $_stat          = get_option('autoptimize_imgopt_provider_stat', '');
             $_site_host     = AUTOPTIMIZE_SITE_DOMAIN;
-            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host;
+            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host;
 
-            if ( is_array( $_stat ) ) {
-                if ( 1 == $_stat['Status'] ) {
+            if (is_array($_stat)) {
+                if (1 == $_stat['Status']) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 } elseif ( -1 == $_stat['Status'] ) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 } else {
                     $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 }
-                $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice );
+                $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice);
 
                 return array(
                     'status' => $_stat['Status'],
@@ -719,13 +719,13 @@ 
 
     public function admin_menu()
     {
-        add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array( $this, 'options_page' ) );
-        register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+        add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array($this, 'options_page'));
+        register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
     }
 
-    public function add_extra_tab( $in )
+    public function add_extra_tab($in)
     {
-        $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
 
         return $in;
     }
@@ -738,7 +738,7 @@ 
         // behavior being persisted in the DB even if save is done here.
         $options       = $this->fetch_options();
         $gfonts        = $options['autoptimize_extra_radio_field_4'];
-        $sp_url_suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $sp_url_suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
     ?>
     <style>
         #ao_settings_form {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;}
@@ -746,35 +746,35 @@ 
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
     <div class="wrap">
-    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
     <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
     <?php
-    if ( 'on' !== get_option( 'autoptimize_js' ) && 'on' !== get_option( 'autoptimize_css' ) && 'on' !== get_option( 'autoptimize_html' ) ) {
+    if ('on' !== get_option('autoptimize_js') && 'on' !== get_option('autoptimize_css') && 'on' !== get_option('autoptimize_html')) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
-        _e( 'Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize' );
+        _e('Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize');
         ?>
         </p></div>
         <?php
     }
 
-    if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) {
+    if ('down' === $options['availabilities']['extra_imgopt']['status']) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
         // translators: "Autoptimize support forum" will appear in a "a href".
-        echo sprintf( __( 'The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize' ), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>' );
+        echo sprintf(__('The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize'), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>');
         ?>
         </p></div>
         <?php
     }
 
-    if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! $this->imgopt_launch_ok() ) {
+    if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !$this->imgopt_launch_ok()) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
-        _e( 'The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize' );
+        _e('The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize');
         ?>
         </p></div>
         <?php
@@ -782,29 +782,29 @@ 
 
     ?>
     <form id='ao_settings_form' action='options.php' method='post'>
-        <?php settings_fields( 'autoptimize_extra_settings' ); ?>
-        <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span>
+        <?php settings_fields('autoptimize_extra_settings'); ?>
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
                 <td>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php _e( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php _e( 'Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php _e( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($gfonts, array(2, 3, 4, 5))) { echo 'checked'; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $gfonts, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php _e('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php _e('Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th>
                 <td>
-                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' === $options['autoptimize_extra_checkbox_field_5'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from a CDN.', 'autoptimize' ); ?></label>
+                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' === $options['autoptimize_extra_checkbox_field_5']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from a CDN.', 'autoptimize'); ?></label>
                     <?php
                     // show shortpixel status.
                     $_notice = $this->get_imgopt_status_notice();
-                    if ( $_notice ) {
-                        switch ( $_notice['status'] ) {
+                    if ($_notice) {
+                        switch ($_notice['status']) {
                             case 2:
                                 $_notice_color = 'green';
                                 break;
@@ -817,27 +817,27 @@ 
                             default:
                                 $_notice_color = 'green';
                         }
-                        echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' );
+                        echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>');
                     } else {
                         // translators: link points to shortpixel.
-                        $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                        if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) {
-                            $upsell_msg_2 = __( 'For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' );
+                        $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
+                        if ('launch' === $options['availabilities']['extra_imgopt']['status']) {
+                            $upsell_msg_2 = __('For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize');
                         } else {
-                            $upsell_msg_2 = __( 'The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' );
+                            $upsell_msg_2 = __('The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize');
                         }
-                        echo apply_filters( 'autoptimize_extra_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' );
+                        echo apply_filters('autoptimize_extra_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>');
                     }
                     // translators: link points to shortpixel FAQ.
-                    $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' );
+                    $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>');
                     // translators: links points to shortpixel TOS & Privacy Policy.
-                    $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                    echo apply_filters( 'autoptimize_extra_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' );
+                    $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>');
+                    echo apply_filters('autoptimize_extra_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>');
                     ?>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_extra_checkbox_field_5', $options ) || ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' !== $options['autoptimize_extra_checkbox_field_5'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_extra_checkbox_field_5', $options) || (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' !== $options['autoptimize_extra_checkbox_field_5'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th>
                 <td>
                     <label>
                     <select name='autoptimize_extra_settings[autoptimize_extra_select_field_6]'>
@@ -845,12 +845,12 @@ 
                         $_imgopt_array = $this->get_img_quality_array();
                         $_imgopt_val   = $this->get_img_quality_setting();
 
-                        foreach ( $_imgopt_array as $key => $value ) {
-                            echo '<option value="' . $key . '"';
-                            if ( $_imgopt_val == $key ) {
+                        foreach ($_imgopt_array as $key => $value) {
+                            echo '<option value="'.$key.'"';
+                            if ($_imgopt_val == $key) {
                                 echo ' selected';
                             }
-                            echo '>' . ucfirst( $value ) . '</option>';
+                            echo '>'.ucfirst($value).'</option>';
                         }
                         echo "\n";
                         ?>
@@ -859,69 +859,69 @@ 
                     <p>
                         <?php
                             // translators: link points to shortpixel image test page.
-                            echo apply_filters( 'autoptimize_extra_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) );
+                            echo apply_filters('autoptimize_extra_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>'));
                         ?>
                     </p>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove emojis', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo esc_attr( $options['autoptimize_extra_text_field_2'] ); ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php echo esc_attr($options['autoptimize_extra_text_field_2']); ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+                    if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) {
                         // translators: link points Async Javascript settings page.
-                        printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' );
+                        printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>');
                     } else {
                     ?>
-                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo esc_attr( $options['autoptimize_extra_text_field_3'] ); ?>'>
+                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo esc_attr($options['autoptimize_extra_text_field_3']); ?>'>
                         <br />
                         <?php
-                            _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' );
+                            _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize');
                             // translators: %s will be replaced by a link to the "async javascript" plugin.
-                            echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' );
-                            $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term';
-                            echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                            echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"');
+                            $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term';
+                            echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) {
-                        _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' );
+                    if (function_exists('is_plugin_active') && is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) {
+                        _e('Great, you have WP YouTube Lyte installed.', 'autoptimize');
                         $lyte_config_url = 'options-general.php?page=lyte_settings_page';
-                        echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) );
+                        echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize'));
                     } else {
                         // translators: %s will be replaced by a link to "wp youtube lyte" plugin.
-                        echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' );
-                        $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term';
-                        echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                        echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>');
+                        $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term';
+                        echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p>
     </form>
     <script>
         jQuery(document).ready(function() {

classes/autoptimizeMain.php

Spacing +147 added lines, -147 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,94 +50,94 @@ 
 
     protected function add_hooks()
     {
-        add_action( 'plugins_loaded', array( $this, 'setup' ) );
+        add_action('plugins_loaded', array($this, 'setup'));
 
-        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' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ) );
+        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'));
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab'));
 
-        add_action( 'init', array( $this, 'load_textdomain' ) );
-        add_action( 'plugins_loaded', array( $this, 'hook_page_cache_purge' ) );
-        add_action( 'admin_init', array( 'PAnD', 'init' ) );
+        add_action('init', array($this, 'load_textdomain'));
+        add_action('plugins_loaded', array($this, 'hook_page_cache_purge'));
+        add_action('admin_init', array('PAnD', 'init'));
 
-        register_activation_hook( $this->filepath, array( $this, 'on_activate' ) );
+        register_activation_hook($this->filepath, array($this, 'on_activate'));
     }
 
     public function on_activate()
     {
-        register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' );
+        register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall');
     }
 
     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) get_option( 'autoptimize_cache_nogzip' ) );
+        define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) 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( 'domain_mapping_siteurl' ) ) {
-                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('domain_mapping_siteurl')) {
+                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( \extensions_loaded( 'mbstring' ) );
+        $with_mbstring = apply_filters('autoptimize_filter_main_use_mbstring', false);
+        if ($with_mbstring) {
+            autoptimizeUtils::mbstring_available(\extensions_loaded('mbstring'));
         } else {
-            autoptimizeUtils::mbstring_available( false );
+            autoptimizeUtils::mbstring_available(false);
         }
 
-        do_action( 'autoptimize_setup_done' );
+        do_action('autoptimize_setup_done');
     }
 
     /**
@@ -147,52 +147,52 @@ 
      */
     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' ) ) {
+            if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
                 // 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
                     );
                 }
             }
         } 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_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();
         }
     }
@@ -200,7 +200,7 @@ 
     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.
@@ -212,9 +212,9 @@ 
                 'wpfc_delete_cache', // Emre confirmed this will be added this.
                 'swift_performance_after_clear_all_cache', // swift perf. yeah!
             );
-            $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');
             }
         }
     }
@@ -226,38 +226,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'));
         }
     }
 
@@ -268,31 +268,31 @@ 
      *                          deciding once per request (for use in tests).
      * @return bool
      */
-    public function should_buffer( $doing_tests = false )
+    public 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;
                     }
@@ -300,15 +300,15 @@ 
             }
 
             // If setting says not to optimize logged in user and user is logged in...
-            if ( 'on' !== get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) {
+            if ('on' !== 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 ( 'on' !== get_option( 'autoptimize_optimize_checkout', 'on' ) ) {
+            if ('on' !== get_option('autoptimize_optimize_checkout', 'on')) {
                 // Checking for woocommerce, easy digital downloads and wp ecommerce...
-                foreach ( array( 'is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) {
-                    if ( function_exists( $func ) && $func() ) {
+                foreach (array('is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) {
+                    if (function_exists($func) && $func()) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -316,11 +316,11 @@ 
             }
 
             // 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();
             }
 
@@ -331,7 +331,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() && ! $ao_noptimize && ! $is_customize_preview );
+            $do_buffering = (!is_admin() && !is_feed() && !$ao_noptimize && !$is_customize_preview);
         }
 
         return $do_buffering;
@@ -344,24 +344,24 @@ 
      *
      * @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' ) );
-        $has_html5_doctype  = ( preg_match( '/^<!DOCTYPE.+html>/i', $content ) > 0 );
+        $has_no_html_tag    = (false === stripos($content, '<html'));
+        $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet'));
+        $has_html5_doctype  = (preg_match('/^<!DOCTYPE.+html>/i', $content) > 0);
 
-        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 ) {
+        if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) {
             $valid = false;
         }
 
@@ -376,9 +376,9 @@ 
      *
      * @return bool
      */
-    public static function is_amp_markup( $content )
+    public static function is_amp_markup($content)
     {
-        $is_amp_markup = preg_match( '/<html[^>]*(?:amp|⚡)/i', $content );
+        $is_amp_markup = preg_match('/<html[^>]*(?:amp|⚡)/i', $content);
 
         return (bool) $is_amp_markup;
     }
@@ -391,10 +391,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;
         }
 
@@ -402,57 +402,57 @@ 
 
         // 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' ),
-                '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' ),
+                'aggregate'      => $conf->get('autoptimize_js_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'),
             ),
             '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' ),
+                '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'),
             ),
             '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;
     }
@@ -494,25 +494,25 @@ 
             'autoptimize_imgopt_launched',
         );
 
-        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);
             }
         } 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);
                 }
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
 
-        if ( wp_get_schedule( 'ao_cachechecker' ) ) {
-            wp_clear_scheduled_hook( 'ao_cachechecker' );
+        if (wp_get_schedule('ao_cachechecker')) {
+            wp_clear_scheduled_hook('ao_cachechecker');
         }
     }
 
@@ -520,41 +520,41 @@ 
     {
         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 and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_extra">', '</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 and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_extra">', '</a>');
+        $_ao_imgopt_plug_notice      = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice);
         $_ao_imgopt_launch_ok        = autoptimizeExtra::imgopt_launch_ok_wrapper();
         $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123';
 
         // check if AO is optimizing images already.
         $_ao_imgopt_active = false;
-        $_ao_extra_options = get_option( 'autoptimize_extra_settings', '' );
-        if ( is_array( $_ao_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_ao_extra_options ) && ! empty( $_ao_extra_options['autoptimize_extra_checkbox_field_5'] ) ) {
+        $_ao_extra_options = get_option('autoptimize_extra_settings', '');
+        if (is_array($_ao_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_ao_extra_options) && !empty($_ao_extra_options['autoptimize_extra_checkbox_field_5'])) {
             $_ao_imgopt_active = true;
         }
 
-        if ( '' !== $_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 ('' !== $_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>';
         }