futtta / autoptimize

classes/autoptimizeStyles.php

Doc Comments +19 added lines, -2 removed lines

@@ -282,7 +282,7 @@ 
      * be inlined into a data: URI. Defaults to 4096, passed through
      * `autoptimize_filter_css_datauri_maxsize` filter.
      *
-     * @return mixed
+     * @return integer|null
      */
     private function get_datauri_maxsize()
     {
@@ -303,6 +303,9 @@ 
         return $max_size;
     }
 
+    /**
+     * @param false|string $url
+     */
     private function check_datauri_exclude_list( $url )
     {
         static $exclude_list = null;
@@ -328,6 +331,9 @@ 
         return $matched;
     }
 
+    /**
+     * @param false|string $path
+     */
     private function build_or_get_datauri_image( $path )
     {
         /**
@@ -746,6 +752,11 @@ 
         return true;
     }
 
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
     public function run_minifier_on( $code )
     {
         if ( ! $this->alreadyminified ) {
@@ -945,6 +956,9 @@ 
         return $code;
     }
 
+    /**
+     * @param string $tag
+     */
     private function ismovable( $tag )
     {
         if ( ! $this->aggregate ) {
@@ -1005,7 +1019,7 @@ 
      * @param string $filepath Filepath.
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified css file or false.
+     * @return false|string Url pointing to the minified css file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {
@@ -1057,6 +1071,9 @@ 
         $this->options = $options;
     }
 
+    /**
+     * @param string $name
+     */
     public function setOption( $name, $value )
     {
         $this->options[$name] = $value;

Spacing +319 added lines, -319 removed lines

@@ -3,7 +3,7 @@ 
  * Class for CSS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -51,53 +51,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();
         }
@@ -108,16 +108,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'];
@@ -126,13 +126,13 @@ 
         $this->datauris = $options['datauris'];
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_css_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_css_minify_excluded', $this->minify_excluded, '');
 
         // 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(
@@ -143,26 +143,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';
                             }
 
@@ -170,72 +170,72 @@ 
                         }
                     } 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).
-                            $new_tag = $this->optionally_defer_excluded( $tag, 'none' );
-                            if ( $new_tag !== '' && $new_tag !== $tag ) {
-                                $this->content = str_replace( $tag, $new_tag, $this->content );
+                            $new_tag = $this->optionally_defer_excluded($tag, 'none');
+                            if ($new_tag !== '' && $new_tag !== $tag) {
+                                $this->content = str_replace($tag, $new_tag, $this->content);
                             }
                             $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 {
-                    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);
                         $new_tag      = $tag;
 
                         // Excluded CSS, minify that file:
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
-                                if ( ! empty( $minified_url ) ) {
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $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);
                                 }
                             }
                         }
 
                         // Optionally defer (preload) non-aggregated CSS.
-                        $new_tag = $this->optionally_defer_excluded( $new_tag, $url );
+                        $new_tag = $this->optionally_defer_excluded($new_tag, $url);
 
                         // And replace!
-                        if ( $new_tag !== '' && $new_tag !== $tag ) {
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
+                        if ($new_tag !== '' && $new_tag !== $tag) {
+                            $this->content = str_replace($tag, $new_tag, $this->content);
                         }
                     }
                 }
@@ -256,10 +256,10 @@ 
      *
      * @return string $new_tag
      */
-    private function optionally_defer_excluded( $tag, $url = '' )
+    private function optionally_defer_excluded($tag, $url = '')
     {
         // 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',
@@ -267,12 +267,12 @@ 
                 $url
             );
             // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
-            $new_tag = '<noscript>' . autoptimizeUtils::remove_id_from_node( $tag ) . '</noscript>' . str_replace(
+            $new_tag = '<noscript>'.autoptimizeUtils::remove_id_from_node($tag).'</noscript>'.str_replace(
                 array(
                     "rel='stylesheet'",
                     'rel="stylesheet"',
                 ),
-                "rel='preload' as='style' onload=\"" . $_preload_onload . "\"",
+                "rel='preload' as='style' onload=\"".$_preload_onload."\"",
                 $tag
             );
         } else {
@@ -289,22 +289,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;
@@ -329,29 +329,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;
                 }
@@ -361,7 +361,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,
@@ -370,27 +370,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,';
@@ -412,15 +412,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);
     }
 
     /**
@@ -432,13 +432,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;
@@ -454,15 +454,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
@@ -480,17 +480,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;
     }
@@ -503,26 +503,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);
             }
         }
 
@@ -536,16 +536,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:
@@ -561,30 +561,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]
@@ -600,20 +600,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;
     }
@@ -621,29 +621,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?
@@ -651,12 +651,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;
                 }
             }
         }
@@ -664,133 +664,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);
                 }
             }
         }
@@ -802,14 +802,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();
         }
     }
 
@@ -817,142 +817,142 @@ 
     public function getcontent()
     {
         // Restore the full content (only applies when "autoptimize_filter_css_justhead" filter is true).
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // type is not added by default.
         $type_css = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_css = 'type="text/css" ';
         }
 
         // 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_css . 'media="' . $media . '">' . $code . '</style>', $replaceTag );
+        if ($this->inline) {
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html('<style '.$type_css.'media="'.$media.'">'.$code.'</style>', $replaceTag);
             }
         } else {
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preloadCssBlock    = '';
                 $inlined_ccss_block = '';
                 $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);
                             }
                         }
                     }
                     // inlined critical css set here, but injected when full CSS is injected
                     // to avoid CSS containing SVG with <title tag receiving the full CSS link.
-                    $inlined_ccss_block = '<style ' . $type_css . 'id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
+                    $inlined_ccss_block = '<style '.$type_css.'id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
                 }
             }
 
-            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_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
+                    $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preloadOnLoad.'" />';
+                    $noScriptCssBlock .= '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
                 } else {
-                    if ( strlen( $this->csscode[$media] ) > $this->cssinlinesize ) {
-                        $this->inject_in_html( '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replaceTag );
-                    } elseif ( strlen( $this->csscode[$media] ) > 0 ) {
-                        $this->inject_in_html( '<style ' . $type_css . 'media="' . $media . '">' . $this->csscode[$media] . '</style>', $replaceTag );
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
+                        $this->inject_in_html('<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
+                    } elseif (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html('<style '.$type_css.'media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
                     }
                 }
             }
 
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
                 $noScriptCssBlock .= '</noscript>';
                 // Inject inline critical CSS, the preloaded full CSS and the noscript-CSS.
-                $this->inject_in_html( $inlined_ccss_block . $preloadCssBlock . $noScriptCssBlock, $replaceTag );
+                $this->inject_in_html($inlined_ccss_block.$preloadCssBlock.$noScriptCssBlock, $replaceTag);
 
                 // Adds preload polyfill at end of body tag.
                 $this->inject_in_html(
-                    apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ),
-                    apply_filters( 'autoptimize_css_preload_polyfill_injectat', array( '</body>', 'before' ) )
+                    apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill),
+                    apply_filters('autoptimize_css_preload_polyfill_injectat', array('</body>', 'before'))
                 );
             }
         }
 
         // 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);
 
         // Return the modified stylesheet.
         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 {
@@ -961,49 +961,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;
                     }
@@ -1015,22 +1015,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 {
@@ -1048,35 +1048,35 @@ 
      *
      * @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' );
-        do_action( 'autoptimize_action_css_hash', $hash );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'css');
+        do_action('autoptimize_action_css_hash', $hash);
 
         // 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->hide_fontface_and_maybe_cdn( $contents );
-            $contents = $this->replace_urls( $contents );
-            $contents = $this->restore_fontface( $contents );
+            $contents = $this->hide_fontface_and_maybe_cdn($contents);
+            $contents = $this->replace_urls($contents);
+            $contents = $this->restore_fontface($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;
     }
@@ -1096,18 +1096,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];
     }

classes/autoptimizeUtils.php

Doc Comments +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
      *
      * @param bool|null $override Allows overriding the decision.
      *
-     * @return bool
+     * @return boolean|null
      */
     public static function mbstring_available( $override = null )
     {
@@ -130,7 +130,7 @@ 
      *
      * @param bool $override Allows overriding the decision when needed.
      *
-     * @return bool
+     * @return boolean|null
      */
     public static function siteurl_not_root( $override = null )
     {

Spacing +88 added lines, -88 removed lines

@@ -3,7 +3,7 @@ 
  * General helpers.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -16,15 +16,15 @@ 
      *
      * @return bool
      */
-    public static function mbstring_available( $override = null )
+    public static function mbstring_available($override = null)
     {
         static $available = null;
 
-        if ( null === $available ) {
-            $available = \extension_loaded( 'mbstring' );
+        if (null === $available) {
+            $available = \extension_loaded('mbstring');
         }
 
-        if ( null !== $override ) {
+        if (null !== $override) {
             $available = $override;
         }
 
@@ -42,12 +42,12 @@ 
      *
      * @return int|false
      */
-    public static function strpos( $haystack, $needle, $offset = 0, $encoding = null )
+    public static function strpos($haystack, $needle, $offset = 0, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            return ( null === $encoding ) ? \mb_strpos( $haystack, $needle, $offset ) : \mb_strpos( $haystack, $needle, $offset, $encoding );
+        if (self::mbstring_available()) {
+            return (null === $encoding) ? \mb_strpos($haystack, $needle, $offset) : \mb_strpos($haystack, $needle, $offset, $encoding);
         } else {
-            return \strpos( $haystack, $needle, $offset );
+            return \strpos($haystack, $needle, $offset);
         }
     }
 
@@ -62,12 +62,12 @@ 
      * @return int Number of charcters or bytes in given $string
      *             (characters if/when supported, bytes otherwise).
      */
-    public static function strlen( $string, $encoding = null )
+    public static function strlen($string, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            return ( null === $encoding ) ? \mb_strlen( $string ) : \mb_strlen( $string, $encoding );
+        if (self::mbstring_available()) {
+            return (null === $encoding) ? \mb_strlen($string) : \mb_strlen($string, $encoding);
         } else {
-            return \strlen( $string );
+            return \strlen($string);
         }
     }
 
@@ -85,44 +85,44 @@ 
      *
      * @return string
      */
-    public static function substr_replace( $string, $replacement, $start, $length = null, $encoding = null )
+    public static function substr_replace($string, $replacement, $start, $length = null, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            $strlen = self::strlen( $string, $encoding );
+        if (self::mbstring_available()) {
+            $strlen = self::strlen($string, $encoding);
 
-            if ( $start < 0 ) {
+            if ($start < 0) {
                 if ( -$start < $strlen ) {
                     $start = $strlen + $start;
                 } else {
                     $start = 0;
                 }
-            } elseif ( $start > $strlen ) {
+            } elseif ($start > $strlen) {
                 $start = $strlen;
             }
 
-            if ( null === $length || '' === $length ) {
+            if (null === $length || '' === $length) {
                 $start2 = $strlen;
-            } elseif ( $length < 0 ) {
+            } elseif ($length < 0) {
                 $start2 = $strlen + $length;
-                if ( $start2 < $start ) {
+                if ($start2 < $start) {
                     $start2 = $start;
                 }
             } else {
                 $start2 = $start + $length;
             }
 
-            if ( null === $encoding ) {
-                $leader  = $start ? \mb_substr( $string, 0, $start ) : '';
-                $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null ) : '';
+            if (null === $encoding) {
+                $leader  = $start ? \mb_substr($string, 0, $start) : '';
+                $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null) : '';
             } else {
-                $leader  = $start ? \mb_substr( $string, 0, $start, $encoding ) : '';
-                $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null, $encoding ) : '';
+                $leader  = $start ? \mb_substr($string, 0, $start, $encoding) : '';
+                $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null, $encoding) : '';
             }
 
             return "{$leader}{$replacement}{$trailer}";
         }
 
-        return ( null === $length ) ? \substr_replace( $string, $replacement, $start ) : \substr_replace( $string, $replacement, $start, $length );
+        return (null === $length) ? \substr_replace($string, $replacement, $start) : \substr_replace($string, $replacement, $start, $length);
     }
 
     /**
@@ -132,16 +132,16 @@ 
      *
      * @return bool
      */
-    public static function siteurl_not_root( $override = null )
+    public static function siteurl_not_root($override = null)
     {
         static $subdir = null;
 
-        if ( null === $subdir ) {
+        if (null === $subdir) {
             $parts  = self::get_ao_wp_site_url_parts();
-            $subdir = ( isset( $parts['path'] ) && ( '/' !== $parts['path'] ) );
+            $subdir = (isset($parts['path']) && ('/' !== $parts['path']));
         }
 
-        if ( null !== $override ) {
+        if (null !== $override) {
             $subdir = $override;
         }
 
@@ -158,8 +158,8 @@ 
     {
         static $parts = array();
 
-        if ( empty( $parts ) ) {
-            $parts = \parse_url( AUTOPTIMIZE_WP_SITE_URL );
+        if (empty($parts)) {
+            $parts = \parse_url(AUTOPTIMIZE_WP_SITE_URL);
         }
 
         return $parts;
@@ -174,33 +174,33 @@ 
      *
      * @return string
      */
-    public static function tweak_cdn_url_if_needed( $cdn_url, $force_cache_miss = false )
+    public static function tweak_cdn_url_if_needed($cdn_url, $force_cache_miss = false)
     {
         static $results = array();
 
-        if ( ! isset( $results[ $cdn_url ] ) || $force_cache_miss ) {
+        if (!isset($results[$cdn_url]) || $force_cache_miss) {
 
             // In order to return unmodified input when there's no need to tweak.
-            $results[ $cdn_url ] = $cdn_url;
+            $results[$cdn_url] = $cdn_url;
 
             // Behind a default true filter for backcompat, and only for sites
             // in a subfolder/subdirectory, but still easily turned off if
             // not wanted/needed...
-            if ( autoptimizeUtils::siteurl_not_root() ) {
-                $check = apply_filters( 'autoptimize_filter_cdn_magic_path_check', true, $cdn_url );
-                if ( $check ) {
+            if (autoptimizeUtils::siteurl_not_root()) {
+                $check = apply_filters('autoptimize_filter_cdn_magic_path_check', true, $cdn_url);
+                if ($check) {
                     $site_url_parts = autoptimizeUtils::get_ao_wp_site_url_parts();
-                    $cdn_url_parts  = \parse_url( $cdn_url );
-                    $schemeless     = self::is_protocol_relative( $cdn_url );
-                    $cdn_url_parts  = self::maybe_replace_cdn_path( $site_url_parts, $cdn_url_parts );
-                    if ( false !== $cdn_url_parts ) {
-                        $results[ $cdn_url ] = self::assemble_parsed_url( $cdn_url_parts, $schemeless );
+                    $cdn_url_parts  = \parse_url($cdn_url);
+                    $schemeless     = self::is_protocol_relative($cdn_url);
+                    $cdn_url_parts  = self::maybe_replace_cdn_path($site_url_parts, $cdn_url_parts);
+                    if (false !== $cdn_url_parts) {
+                        $results[$cdn_url] = self::assemble_parsed_url($cdn_url_parts, $schemeless);
                     }
                 }
             }
         }
 
-        return $results[ $cdn_url ];
+        return $results[$cdn_url];
     }
 
     /**
@@ -214,10 +214,10 @@ 
      *
      * @return array|false
      */
-    public static function maybe_replace_cdn_path( array $site_url_parts, array $cdn_url_parts )
+    public static function maybe_replace_cdn_path(array $site_url_parts, array $cdn_url_parts)
     {
-        if ( isset( $site_url_parts['path'] ) && '/' !== $site_url_parts['path'] ) {
-            if ( ! isset( $cdn_url_parts['path'] ) || '/' === $cdn_url_parts['path'] ) {
+        if (isset($site_url_parts['path']) && '/' !== $site_url_parts['path']) {
+            if (!isset($cdn_url_parts['path']) || '/' === $cdn_url_parts['path']) {
                 $cdn_url_parts['path'] = $site_url_parts['path'];
                 return $cdn_url_parts;
             }
@@ -237,20 +237,20 @@ 
      *
      * @return string
      */
-    public static function assemble_parsed_url( array $parsed_url, $schemeless = false )
+    public static function assemble_parsed_url(array $parsed_url, $schemeless = false)
     {
-        $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
-        if ( $schemeless ) {
+        $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
+        if ($schemeless) {
             $scheme = '//';
         }
-        $host     = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
-        $port     = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
-        $user     = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
-        $pass     = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
-        $pass     = ( $user || $pass ) ? "$pass@" : '';
-        $path     = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
-        $query    = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
-        $fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : '';
+        $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+        $port     = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
+        $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+        $pass     = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : '';
+        $pass     = ($user || $pass) ? "$pass@" : '';
+        $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+        $query    = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
+        $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : '';
 
         return "$scheme$user$pass$host$port$path$query$fragment";
     }
@@ -262,12 +262,12 @@ 
      *
      * @return bool
      */
-    public static function is_protocol_relative( $url )
+    public static function is_protocol_relative($url)
     {
         $result = false;
 
-        if ( ! empty( $url ) ) {
-            $result = ( 0 === strpos( $url, '//' ) );
+        if (!empty($url)) {
+            $result = (0 === strpos($url, '//'));
         }
 
         return $result;
@@ -280,9 +280,9 @@ 
      *
      * @return string
      */
-    public static function path_canonicalize( $path )
+    public static function path_canonicalize($path)
     {
-        $patterns     = array(
+        $patterns = array(
             '~/{2,}~',
             '~/(\./)+~',
             '~([^/\.]+/(?R)*\.{2,}/)~',
@@ -295,7 +295,7 @@ 
             '',
         );
 
-        return preg_replace( $patterns, $replacements, $path );
+        return preg_replace($patterns, $replacements, $path);
     }
 
     /**
@@ -307,15 +307,15 @@ 
      *
      * @return null|array Service status or null.
      */
-    public static function check_service_availability( $return_result = false )
+    public static function check_service_availability($return_result = false)
     {
-        $service_availability_resp = wp_remote_get( 'https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-        if ( ! is_wp_error( $service_availability_resp ) ) {
-            if ( '200' == wp_remote_retrieve_response_code( $service_availability_resp ) ) {
-                $availabilities = json_decode( wp_remote_retrieve_body( $service_availability_resp ), true );
-                if ( is_array( $availabilities ) ) {
-                    autoptimizeOptionWrapper::update_option( 'autoptimize_service_availablity', $availabilities );
-                    if ( $return_result ) {
+        $service_availability_resp = wp_remote_get('https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+        if (!is_wp_error($service_availability_resp)) {
+            if ('200' == wp_remote_retrieve_response_code($service_availability_resp)) {
+                $availabilities = json_decode(wp_remote_retrieve_body($service_availability_resp), true);
+                if (is_array($availabilities)) {
+                    autoptimizeOptionWrapper::update_option('autoptimize_service_availablity', $availabilities);
+                    if ($return_result) {
                         return $availabilities;
                     }
                 }
@@ -331,10 +331,10 @@ 
      *
      * @return bool
      */
-    public static function str_is_valid_regex( $string )
+    public static function str_is_valid_regex($string)
     {
-        set_error_handler( function() {}, E_WARNING );
-        $is_regex = ( false !== preg_match( $string, '' ) );
+        set_error_handler(function() {}, E_WARNING);
+        $is_regex = (false !== preg_match($string, ''));
         restore_error_handler();
 
         return $is_regex;
@@ -347,17 +347,17 @@ 
      *
      * @return bool
      */
-    public static function is_plugin_active( $plugin_file )
+    public static function is_plugin_active($plugin_file)
     {
         static $ipa_exists = null;
-        if ( null === $ipa_exists ) {
-            if ( ! function_exists( '\is_plugin_active' ) ) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (null === $ipa_exists) {
+            if (!function_exists('\is_plugin_active')) {
+                require_once ABSPATH.'wp-admin/includes/plugin.php';
             }
-            $ipa_exists = function_exists( '\is_plugin_active' );
+            $ipa_exists = function_exists('\is_plugin_active');
         }
 
-        return $ipa_exists && \is_plugin_active( $plugin_file );
+        return $ipa_exists && \is_plugin_active($plugin_file);
     }
 
     /**
@@ -367,11 +367,11 @@ 
      *
      * @return string
      */
-    public static function remove_id_from_node( $node ) {
-        if ( strpos( $node, 'id=' ) === false || apply_filters( 'autoptimize_filter_utils_keep_ids', false ) ) {
+    public static function remove_id_from_node($node) {
+        if (strpos($node, 'id=') === false || apply_filters('autoptimize_filter_utils_keep_ids', false)) {
             return $node;
         } else {
-            return preg_replace( '#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node );
+            return preg_replace('#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node);
         }
     }
 
@@ -383,15 +383,15 @@ 
      *
      * @return bool
      */
-    public static function str_ends_in( $str, $test )
+    public static function str_ends_in($str, $test)
     {
         // @codingStandardsIgnoreStart
         // substr_compare() is bugged on 5.5.11: https://3v4l.org/qGYBH
         // return ( 0 === substr_compare( $str, $test, -strlen( $test ) ) );
         // @codingStandardsIgnoreEnd
 
-        $length = strlen( $test );
+        $length = strlen($test);
 
-        return ( substr( $str, -$length, $length ) === $test );
+        return (substr($str, -$length, $length) === $test);
     }
 }

tests/test-ao.php

Doc Comments +3 added lines

@@ -128,6 +128,9 @@
         parent::tearDown();
     }
 
+    /**
+     * @return string
+     */
     protected function get_test_markup()
     {
         $siteurl = $this->get_urls()['siteurl'];

Spacing +450 added lines, -450 removed lines

@@ -10,17 +10,17 @@ 
     protected $ao;
 
     protected static $flexible_url_parts_js = [
-        'default'          => 'wp-content/cache/autoptimize/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'custom'           => 'wp-content/c/ao/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite'        => 'wp-content/cache/autoptimize/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite_custom' => 'wp-content/c/ao/1/js/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'default'          => 'wp-content/cache/autoptimize/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'custom'           => 'wp-content/c/ao/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite'        => 'wp-content/cache/autoptimize/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite_custom' => 'wp-content/c/ao/1/js/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
     ];
 
     protected static $flexible_url_parts_css = [
-        'default'          => 'wp-content/cache/autoptimize/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'custom'           => 'wp-content/c/ao/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite'        => 'wp-content/cache/autoptimize/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
-        'multisite_custom' => 'wp-content/c/ao/1/css/' . AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'default'          => 'wp-content/cache/autoptimize/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'custom'           => 'wp-content/c/ao/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite'        => 'wp-content/cache/autoptimize/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
+        'multisite_custom' => 'wp-content/c/ao/1/css/'.AUTOPTIMIZE_CACHEFILE_PREFIX,
     ];
 
     protected function getAoStylesDefaultOptions()
@@ -28,17 +28,17 @@ 
         $conf = autoptimizeConfig::instance();
 
         return [
-            'aggregate'       => $conf->get( 'autoptimize_css_aggregate' ),
-            'justhead'        => $conf->get( 'autoptimize_css_justhead' ),
-            'datauris'        => $conf->get( 'autoptimize_css_datauris' ),
-            'defer'           => $conf->get( 'autoptimize_css_defer' ),
-            'defer_inline'    => $conf->get( 'autoptimize_css_defer_inline' ),
-            'inline'          => $conf->get( 'autoptimize_css_inline' ),
-            'css_exclude'     => $conf->get( 'autoptimize_css_exclude' ),
-            'cdn_url'         => $conf->get( 'autoptimize_cdn_url' ),
-            'include_inline'  => $conf->get( 'autoptimize_css_include_inline' ),
-            'nogooglefont'    => $conf->get( 'autoptimize_css_nogooglefont' ),
-            'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+            'aggregate'       => $conf->get('autoptimize_css_aggregate'),
+            'justhead'        => $conf->get('autoptimize_css_justhead'),
+            'datauris'        => $conf->get('autoptimize_css_datauris'),
+            'defer'           => $conf->get('autoptimize_css_defer'),
+            'defer_inline'    => $conf->get('autoptimize_css_defer_inline'),
+            'inline'          => $conf->get('autoptimize_css_inline'),
+            'css_exclude'     => $conf->get('autoptimize_css_exclude'),
+            'cdn_url'         => $conf->get('autoptimize_cdn_url'),
+            'include_inline'  => $conf->get('autoptimize_css_include_inline'),
+            'nogooglefont'    => $conf->get('autoptimize_css_nogooglefont'),
+            'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
         ];
     }
 
@@ -47,14 +47,14 @@ 
         $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' ),
-            'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+            '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'),
+            'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
         ];
     }
 
@@ -64,35 +64,35 @@ 
     protected function get_urls()
     {
         static $site_url = null;
-        if ( null === $site_url ) {
+        if (null === $site_url) {
             $site_url = site_url();
         }
 
         static $cdn_url = null;
-        if ( null === $cdn_url ) {
-            $cdn_url = autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url' );
+        if (null === $cdn_url) {
+            $cdn_url = autoptimizeOptionWrapper::get_option('autoptimize_cdn_url');
         }
 
         static $imgopt_host = null;
-        if ( null === $imgopt_host ) {
+        if (null === $imgopt_host) {
             $optimizer   = new autoptimizeImages();
-            $imgopt_host = rtrim( $optimizer->get_imgopt_host(), '/' );
+            $imgopt_host = rtrim($optimizer->get_imgopt_host(), '/');
         }
 
         static $urls = [];
 
-        if ( empty( $urls ) ) {
+        if (empty($urls)) {
             $parts = autoptimizeUtils::get_ao_wp_site_url_parts();
             $urls  = [
                 'siteurl'    => $site_url,
-                'prsiteurl'  => '//' . str_replace( array( 'http://', 'https://' ), '', $site_url ),
-                'wwwsiteurl' => $parts['scheme'] . '://www.' . str_replace( 'www.', '', $parts['host'] ),
+                'prsiteurl'  => '//'.str_replace(array('http://', 'https://'), '', $site_url),
+                'wwwsiteurl' => $parts['scheme'].'://www.'.str_replace('www.', '', $parts['host']),
                 'cdnurl'     => $cdn_url,
                 'imgopthost' => $imgopt_host,
                 'subfolder'  => '',
             ];
 
-            if ( AO_TEST_SUBFOLDER_INSTALL ) {
+            if (AO_TEST_SUBFOLDER_INSTALL) {
                 $urls['subfolder'] = 'wordpress/';
             }
         }
@@ -105,7 +105,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();
     }
@@ -124,8 +124,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();
@@ -249,20 +249,20 @@ 
     protected function get_test_markup_output()
     {
         $key = 'default';
-        if ( defined( 'CUSTOM_CONSTANTS_USED' ) && CUSTOM_CONSTANTS_USED ) {
+        if (defined('CUSTOM_CONSTANTS_USED') && CUSTOM_CONSTANTS_USED) {
             $key = 'custom';
         }
 
-        $csspart = self::$flexible_url_parts_css[ $key ];
-        $jspart  = self::$flexible_url_parts_js[ $key ];
+        $csspart = self::$flexible_url_parts_css[$key];
+        $jspart  = self::$flexible_url_parts_js[$key];
 
         $csshash = '863f587e89f100b0223ddccc0dabc57a';
-        if ( AO_TEST_SUBFOLDER_INSTALL ) {
+        if (AO_TEST_SUBFOLDER_INSTALL) {
             $csshash = '56398de576d59887e88e3011715250e0';
         }
 
         $urls      = $this->get_urls();
-            $siteurl   = $urls['siteurl'];
+            $siteurl = $urls['siteurl'];
         $cdnurl    = $urls['cdnurl'];
         $subfolder = $urls['subfolder'];
 
@@ -316,15 +316,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';
         }
 
@@ -383,15 +383,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';
         }
 
@@ -450,15 +450,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';
         }
 
@@ -517,11 +517,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()
@@ -533,7 +533,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()),
             ),
 
         );
@@ -593,12 +593,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()
@@ -632,21 +632,21 @@ 
 .bg{background:url('img/something.svg')}.bg-no-quote{background:url(img/something.svg)}.bg-double-quotes{background:url("img/something.svg")}.whitespaces{background:url ("../../somewhere-else/svg.svg")}.host-relative{background:url("/img/something.svg")}.protocol-relative{background:url("//something/somewhere/example.png")}@font-face{font-family:'Roboto';font-style:normal;font-weight:100;src:url(../fonts/roboto-v15-latin-ext_latin-100.eot);src:local('Roboto Thin'),local('Roboto-Thin'),url(../fonts/roboto-v15-latin-ext_latin-100.eot?#iefix) format('embedded-opentype'),url(../fonts/roboto-v15-latin-ext_latin-100.woff2) format('woff2'),url(../fonts/roboto-v15-latin-ext_latin-100.woff) format('woff'),url(../fonts/roboto-v15-latin-ext_latin-100.ttf) format('truetype'),url(../fonts/roboto-v15-latin-ext_latin-100.svg#Roboto) format('svg')}
 CSS;
 
-        $instance = new autoptimizeStyles( $css );
-        $minified = $instance->run_minifier_on( $css );
+        $instance = new autoptimizeStyles($css);
+        $minified = $instance->run_minifier_on($css);
 
-        $this->assertEquals( $expected, $minified );
+        $this->assertEquals($expected, $minified);
     }
 
     /**
      * @dataProvider provider_test_should_aggregate_script_types
      */
-    public function test_should_aggregate_script_types( $input, $expected )
+    public function test_should_aggregate_script_types($input, $expected)
     {
-        $instance = new autoptimizeScripts( '' );
-        $actual   = $instance->should_aggregate( $input );
+        $instance = new autoptimizeScripts('');
+        $actual   = $instance->should_aggregate($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_test_should_aggregate_script_types()
@@ -708,11 +708,11 @@ 
     /**
      * @dataProvider provider_is_valid_buffer
      */
-    public function test_valid_buffers( $input, $expected )
+    public function test_valid_buffers($input, $expected)
     {
-        $actual = $this->ao->is_valid_buffer( $input );
+        $actual = $this->ao->is_valid_buffer($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_is_valid_buffer()
@@ -781,11 +781,11 @@ 
     /**
      * @dataProvider provider_is_amp_markup
      */
-    public function test_autoptimize_is_amp_markup( $input, $expected )
+    public function test_autoptimize_is_amp_markup($input, $expected)
     {
-        $actual = autoptimizeMain::is_amp_markup( $input );
+        $actual = autoptimizeMain::is_amp_markup($input);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_is_amp_markup()
@@ -816,31 +816,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`
@@ -851,23 +851,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',
@@ -876,9 +876,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;
         });
@@ -892,7 +892,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',
@@ -902,19 +902,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;
         });
@@ -925,15 +925,15 @@ 
     /**
      * @dataProvider provider_test_url_replace_cdn
      */
-    public function test_url_replace_cdn( $cdn_url, $input, $expected )
+    public function test_url_replace_cdn($cdn_url, $input, $expected)
     {
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )
+        $mock = $this->getMockBuilder('autoptimizeBase')
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
 
         $mock->cdn_url = $cdn_url;
-        $actual        = $mock->url_replace_cdn( $input );
-        $this->assertEquals( $expected, $actual );
+        $actual        = $mock->url_replace_cdn($input);
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_test_url_replace_cdn()
@@ -950,13 +950,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(
@@ -967,59 +967,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(
@@ -1044,8 +1044,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...
@@ -1084,31 +1084,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()
@@ -1147,11 +1147,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()
@@ -1176,7 +1176,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(
@@ -1201,12 +1201,12 @@ 
     /**
      * @dataProvider provider_getpath
      */
-    public function test_getpath( $input, $expected )
+    public function test_getpath($input, $expected)
     {
-        $mock = $this->getMockBuilder( 'autoptimizeBase' )->disableOriginalConstructor()->getMockForAbstractClass();
+        $mock = $this->getMockBuilder('autoptimizeBase')->disableOriginalConstructor()->getMockForAbstractClass();
 
-        $actual = $mock->getpath( $input );
-        $this->assertEquals( $expected, $actual );
+        $actual = $mock->getpath($input);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -1220,7 +1220,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")}
@@ -1233,13 +1233,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}
@@ -1291,27 +1291,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);
     }
 
     /**
@@ -1331,7 +1331,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}
@@ -1375,24 +1375,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);
     }
 
     /**
@@ -1512,12 +1512,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);
     }
 
     /**
@@ -1633,10 +1633,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()
@@ -1657,16 +1657,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);
@@ -1680,10 +1680,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()
@@ -1699,18 +1699,18 @@ 
 </style>
 HTML;
 
-        $expected = '<style media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css?a&#038;b);@import url(' . $cdnurl . '/' . $sub . 'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
+        $expected = '<style media="all">@import url('.$cdnurl.'/'.$sub.'foo.css?a&#038;b);@import url('.$cdnurl.'/'.$sub.'bar.css);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
 
         $options = [
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
         ];
 
-        $instance = new autoptimizeStyles( $in );
-        $instance->read( $options['autoptimizeStyles'] );
+        $instance = new autoptimizeStyles($in);
+        $instance->read($options['autoptimizeStyles']);
         $instance->minify();
         $instance->cache();
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_fixurls_with_at_imports_and_media_queries()
@@ -1720,10 +1720,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()
@@ -1738,43 +1738,43 @@ 
 </style>
 HTML;
 
-        $expected = '<style media="all">@import url(' . $cdnurl . '/' . $sub . 'foo.css);@import url(' . $cdnurl . '/' . $sub . 'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
+        $expected = '<style media="all">@import url('.$cdnurl.'/'.$sub.'foo.css);@import url('.$cdnurl.'/'.$sub.'bar.css) (orientation:landscape);</style><!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `title` missing --><!--/noptimize-->';
 
         $options = [
             'autoptimizeStyles' => $this->getAoStylesDefaultOptions(),
         ];
 
-        $instance = new autoptimizeStyles( $in );
-        $instance->read( $options['autoptimizeStyles'] );
+        $instance = new autoptimizeStyles($in);
+        $instance->read($options['autoptimizeStyles']);
         $instance->minify();
         $instance->cache();
 
         $actual = $instance->getcontent();
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function test_cache_size_checker_hooked_by_default()
     {
-        $this->assertNotEmpty( autoptimizeCacheChecker::SCHEDULE_HOOK );
+        $this->assertNotEmpty(autoptimizeCacheChecker::SCHEDULE_HOOK);
 
         // No schedule, because it's only added when is_admin() is true.
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
 
         // Proving that setup() sets the schedule as needed.
         $checker = new autoptimizeCacheChecker();
         $checker->setup();
-        $this->assertEquals( 'twicedaily', wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals('twicedaily', wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
     }
 
     public function test_cache_size_checker_disabled_with_filter()
     {
-        add_filter( 'autoptimize_filter_cachecheck_do', '__return_false' );
+        add_filter('autoptimize_filter_cachecheck_do', '__return_false');
 
         $checker = new autoptimizeCacheChecker();
         $checker->setup();
-        $this->assertEquals( false, wp_get_schedule( autoptimizeCacheChecker::SCHEDULE_HOOK ) );
+        $this->assertEquals(false, wp_get_schedule(autoptimizeCacheChecker::SCHEDULE_HOOK));
 
-        remove_all_filters( 'autoptimize_filter_cachecheck_do' );
+        remove_all_filters('autoptimize_filter_cachecheck_do');
     }
 
     public function test_is_start_buffering_hooked_properly()
@@ -1787,12 +1787,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'));
         }
 
         /*
@@ -1809,18 +1809,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()
@@ -1828,47 +1828,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()
@@ -1876,78 +1876,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";
@@ -1977,23 +1977,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 -->
@@ -2004,7 +2004,7 @@ 
 <!-- End Support AJAX add to cart</script>
 MARKUP;
 
-        $markup2   = <<<MARKUP
+        $markup2 = <<<MARKUP
 <script>
 <!-- End Support AJAX add to cart -->
 var a = "b";
@@ -2021,17 +2021,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()
@@ -2055,11 +2055,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()
@@ -2084,49 +2084,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()
@@ -2168,48 +2168,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
@@ -2218,59 +2218,59 @@ 
 
         // $this->assertSame( '�ñ', autoptimizeUtils::substr_replace( $str, 'ñ', 1 ) ); // No length.
         // $this->assertSame( 'ñ�næë', autoptimizeUtils::substr_replace( $str, 'ñ', 1, 2 ) );
-        $this->assertSame( 'ñønæë', autoptimizeUtils::substr_replace( $str, 'ñ', 0, 2 ) );
-        $this->assertSame( 'âñxæë', autoptimizeUtils::substr_replace( $str, 'ñx', 2, 3 ) );
-        $this->assertSame( 'âz', autoptimizeUtils::substr_replace( $str, 'z', 2, 10 ) ); // Length larger than possible...
+        $this->assertSame('ñønæë', autoptimizeUtils::substr_replace($str, 'ñ', 0, 2));
+        $this->assertSame('âñxæë', autoptimizeUtils::substr_replace($str, 'ñx', 2, 3));
+        $this->assertSame('âz', autoptimizeUtils::substr_replace($str, 'z', 2, 10)); // Length larger than possible...
     }
 
     public function test_cache_fast_delete()
     {
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
 
         autoptimizeCache::clearall_actionless();
 
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
     }
 
     public function test_delete_advanced_cache_clear_artifacts()
     {
-        add_filter( 'autoptimize_filter_cache_clear_advanced', '__return_true' );
+        add_filter('autoptimize_filter_cache_clear_advanced', '__return_true');
 
-        $this->assertTrue( autoptimizeCache::delete_advanced_cache_clear_artifacts() );
+        $this->assertTrue(autoptimizeCache::delete_advanced_cache_clear_artifacts());
 
-        remove_all_filters( 'autoptimize_filter_cache_clear_advanced' );
+        remove_all_filters('autoptimize_filter_cache_clear_advanced');
     }
 
     public function provider_canonicalization()
     {
         return array(
-            array( '../common', 'common' ),
-            array( '../what-does-this-mean/really?/', 'what-does-this-mean/really?/' ),
-            array( '../../what/where/how', 'what/where/how' ),
-            array( '/../more.dots.please/', '/more.dots.please/' ),
-            array( '/../../what/where/how', '/what/where/how' ),
-            array( '/a/b/c/../../../d/e/file.txt', '/d/e/file.txt' ),
-            array( 'a/b/../c', 'a/c' ),
-            array( './../../etc/passwd', './etc/passwd' ),
-            array( '/var/.////./user/./././..//.//../////../././.././test/////', '/test/' ),
-            array( '/var/user/./././.././../.././././test/', '/test/' ),
-            array( '/hello/0//how/../are/../you', '/hello/0/you' ),
-            array( '', '' ),
-            array( '.', '.' ),
-            array( '..', '..' ),
-            array( './..', './..' ),
-            array( '../.', '.' ),
+            array('../common', 'common'),
+            array('../what-does-this-mean/really?/', 'what-does-this-mean/really?/'),
+            array('../../what/where/how', 'what/where/how'),
+            array('/../more.dots.please/', '/more.dots.please/'),
+            array('/../../what/where/how', '/what/where/how'),
+            array('/a/b/c/../../../d/e/file.txt', '/d/e/file.txt'),
+            array('a/b/../c', 'a/c'),
+            array('./../../etc/passwd', './etc/passwd'),
+            array('/var/.////./user/./././..//.//../////../././.././test/////', '/test/'),
+            array('/var/user/./././.././../.././././test/', '/test/'),
+            array('/hello/0//how/../are/../you', '/hello/0/you'),
+            array('', ''),
+            array('.', '.'),
+            array('..', '..'),
+            array('./..', './..'),
+            array('../.', '.'),
             // This might be debatable...
-            array( '../..', '..' ),
+            array('../..', '..'),
         );
     }
 
     /**
      * @dataProvider provider_canonicalization
      */
-    public function test_path_canonicalize( $path, $canonicalized )
+    public function test_path_canonicalize($path, $canonicalized)
     {
-        $this->assertSame( $canonicalized, autoptimizeUtils::path_canonicalize( $path ) );
+        $this->assertSame($canonicalized, autoptimizeUtils::path_canonicalize($path));
     }
 
     /**
@@ -2284,16 +2284,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');
     }
 
     /**
@@ -2318,9 +2318,9 @@ 
 <img src='$imgopthost/client/q_glossy,ret_img,w_400,h_200/$siteurl/wp-content/image.jpg' width='400' height='200' srcset="$imgopthost/client/q_glossy,ret_img,w_300/$siteurl/wp-content/image-300X150.jpg 300w, $imgopthost/client/q_glossy,ret_img,w_600/$siteurl/wp-content/image-600X300.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" />
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2345,9 +2345,9 @@ 
 <picture><source srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture>
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2372,9 +2372,9 @@ 
 <picture><source data-srcset="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg" media="(min-width: 800px)"><noscript><img src="$imgopthost/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></noscript><img class="lazyload" src='$imgopthost/client/q_lqip,ret_wait/$siteurl/wp-content/image.jpg' data-src="https://cdn.shortpixel.ai/client/q_glossy,ret_img/$siteurl/wp-content/image.jpg"/></picture>
 MARKUP;
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2400,9 +2400,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2428,9 +2428,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2455,9 +2455,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2482,9 +2482,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2509,9 +2509,9 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_lazyload_images( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_lazyload_images($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2530,11 +2530,11 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
         // Expecting $markup since replacement should not happen.
-        $this->assertEquals( $markup, $actual );
+        $this->assertEquals($markup, $actual);
     }
 
     /**
@@ -2560,10 +2560,10 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2573,8 +2573,8 @@ 
     {
         $urls                                        = $this->get_urls();
         $siteurl                                     = $urls['siteurl'];
-        $siteurlparsed                               = parse_url( $siteurl );
-        $sitedomain                                  = $siteurlparsed['scheme'] . '://' . $siteurlparsed['host'];
+        $siteurlparsed                               = parse_url($siteurl);
+        $sitedomain                                  = $siteurlparsed['scheme'].'://'.$siteurlparsed['host'];
         $imgopthost                                  = $urls['imgopthost'];
         $opts                                        = autoptimizeImages::fetch_options();
         $opts['autoptimize_imgopt_checkbox_field_1'] = '1';
@@ -2589,10 +2589,10 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2617,53 +2617,53 @@ 
 MARKUP;
 
         $instance = autoptimizeImages::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_optimize_images( $markup );
+        $instance->set_options($opts);
+        $actual = $instance->filter_optimize_images($markup);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     /**
      * @dataProvider provider_str_is_valid_regex
      */
-    public function test_str_is_valid_regex( $str, $expected )
+    public function test_str_is_valid_regex($str, $expected)
     {
-        $actual = autoptimizeUtils::str_is_valid_regex( $str );
+        $actual = autoptimizeUtils::str_is_valid_regex($str);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_str_is_valid_regex()
     {
         return [
-            [ '<!--[if', false ],
-            [ '&lt;--[if', false ],
-            [ '/booya/i', true ],
-            [ '~Valid(Regular)Expression~', true ],
+            ['<!--[if', false],
+            ['&lt;--[if', false],
+            ['/booya/i', true],
+            ['~Valid(Regular)Expression~', true],
         ];
     }
 
     /**
      * @dataProvider provider_protocol_relative_tests
      */
-    public function test_is_protocol_relative( $str, $expected )
+    public function test_is_protocol_relative($str, $expected)
     {
-        $actual = autoptimizeUtils::is_protocol_relative( $str );
+        $actual = autoptimizeUtils::is_protocol_relative($str);
 
-        $this->assertEquals( $expected, $actual );
+        $this->assertEquals($expected, $actual);
     }
 
     public function provider_protocol_relative_tests()
     {
         return [
-            [ '//something-that-might-be-an-url-but-isnt-really', true ],
-            [ '', false ],
-            [ null, false ],
-            [ 'booya/i', false ],
-            [ '/root-relative', false ],
-            [ 'http://what.ever/', false ],
-            [ 'https://booya.kasha', false ],
-            [ '1/', false ],
+            ['//something-that-might-be-an-url-but-isnt-really', true],
+            ['', false],
+            [null, false],
+            ['booya/i', false],
+            ['/root-relative', false],
+            ['http://what.ever/', false],
+            ['https://booya.kasha', false],
+            ['1/', false],
         ];
     }
 
@@ -2678,38 +2678,38 @@ 
 
         $expected = 'img.centered,.aligncenter{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}';
 
-        $instance = new autoptimizeStyles( $css );
-        $minified = $instance->run_minifier_on( $css );
+        $instance = new autoptimizeStyles($css);
+        $minified = $instance->run_minifier_on($css);
 
-        $this->assertEquals( $expected, $minified );
+        $this->assertEquals($expected, $minified);
     }
 
     public function test_css_font_names_mangling()
     {
         // Properly quoted font names dont get mangled.
         $css      = 'h2{font-family:"Archivo Black"}';
-        $instance = new autoptimizeStyles( $css );
-        $actual   = $instance->run_minifier_on( $css );
-        $this->assertEquals( $css, $actual );
+        $instance = new autoptimizeStyles($css);
+        $actual   = $instance->run_minifier_on($css);
+        $this->assertEquals($css, $actual);
 
         // When not quoted, 'Black' used to become '#000', but not anymore :) ...
         $css_unquoted = 'h2{font-family:Archivo Black;}';
         $expected     = 'h2{font-family:Archivo Black}';
-        $instance     = new autoptimizeStyles( $css_unquoted );
-        $actual       = $instance->run_minifier_on( $css_unquoted );
-        $this->assertEquals( $expected, $actual );
+        $instance     = new autoptimizeStyles($css_unquoted);
+        $actual       = $instance->run_minifier_on($css_unquoted);
+        $this->assertEquals($expected, $actual);
 
         $css_unquoted = 'h1{font:italic 1.2em Fira White,serif}';
-        $instance     = new autoptimizeStyles( $css_unquoted );
-        $actual       = $instance->run_minifier_on( $css_unquoted );
-        $this->assertEquals( $css_unquoted, $actual );
+        $instance     = new autoptimizeStyles($css_unquoted);
+        $actual       = $instance->run_minifier_on($css_unquoted);
+        $this->assertEquals($css_unquoted, $actual);
     }
 
     public function test_is_plugin_active_utils_wrapper()
     {
         // Our plugin is loaded via "muplugins_loaded" filter in tests/bootstrap.php.
-        $this->assertFalse( autoptimizeUtils::is_plugin_active( 'autoptimize/autoptimize.php' ) );
-        $this->assertFalse( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) );
+        $this->assertFalse(autoptimizeUtils::is_plugin_active('autoptimize/autoptimize.php'));
+        $this->assertFalse(autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php'));
     }
 
     public function test_jsminphp_string_literal_minification()
@@ -2723,8 +2723,8 @@ 
         $expected = '`line
 break`+`he  llo`;foo`hel( \'\');lo`;`he\nl\`lo`;(`he${one + two}`)';
 
-        $actual = JSMin::minify( $js );
-        $this->assertEquals( $expected, $actual );
+        $actual = JSMin::minify($js);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2744,9 +2744,9 @@ 
 MARKUP;
 
         $instance = autoptimizeExtra::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_preload( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_preload($markup);
+        $this->assertEquals($expected, $actual);
     }
 
     /**
@@ -2766,9 +2766,9 @@ 
 MARKUP;
 
         $instance = autoptimizeExtra::instance();
-        $instance->set_options( $opts );
-        $actual = $instance->filter_preload( $markup );
-        $this->assertEquals( $expected, $actual );
+        $instance->set_options($opts);
+        $actual = $instance->filter_preload($markup);
+        $this->assertEquals($expected, $actual);
     }
 
 
@@ -2777,17 +2777,17 @@ 
      */
     public function test_network_no_site_settings()
     {
-        if ( is_multisite() ) {
-            define( 'TEST_MULTISITE_FORCE_AO_ON_NETWORK', true );
+        if (is_multisite()) {
+            define('TEST_MULTISITE_FORCE_AO_ON_NETWORK', true);
             // set options through WordPress core methods.
-            update_option( 'autoptimize_js_exclude', 'site' );
-            update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' );
-            update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', '' );
+            update_option('autoptimize_js_exclude', 'site');
+            update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network');
+            update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', '');
 
             // and then try fetching them through optionwrapper.
             $expected = 'network';
-            $actual   = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' );
-            $this->assertEquals( $expected, $actual );
+            $actual   = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude');
+            $this->assertEquals($expected, $actual);
         }
     }
 
@@ -2796,17 +2796,17 @@ 
      */
     public function test_network_per_site_settings()
     {
-        if ( is_multisite() ) {
+        if (is_multisite()) {
             // define of TEST_MULTISITE_FORCE_AO_ON_NETWORK not needed, done in previous test.
             // set options through WordPress core methods.
-            update_option( 'autoptimize_js_exclude', 'site' );
-            update_network_option( get_main_network_id(), 'autoptimize_js_exclude', 'network' );
-            update_network_option( get_main_network_id(), 'autoptimize_enable_site_config', 'on' );
+            update_option('autoptimize_js_exclude', 'site');
+            update_network_option(get_main_network_id(), 'autoptimize_js_exclude', 'network');
+            update_network_option(get_main_network_id(), 'autoptimize_enable_site_config', 'on');
 
             // and then try fetching them through optionwrapper.
             $expected = 'site';
-            $actual   = autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude' );
-            $this->assertEquals( $expected, $actual );
+            $actual   = autoptimizeOptionWrapper::get_option('autoptimize_js_exclude');
+            $this->assertEquals($expected, $actual);
         }
     }
 }

classes/external/php/yui-php-cssmin-bundled/Minifier.php

Spacing +32 added lines, -32 removed lines

@@ -72,9 +72,9 @@ 
     public function __construct($raisePhpLimits = true)
     {
         $this->raisePhpLimits = (bool) $raisePhpLimits;
-        $this->memoryLimit = 128 * 1048576; // 128MB in bytes
-        $this->pcreBacktrackLimit = 1000 * 1000;
-        $this->pcreRecursionLimit = 500 * 1000;
+        $this->memoryLimit = 128*1048576; // 128MB in bytes
+        $this->pcreBacktrackLimit = 1000*1000;
+        $this->pcreRecursionLimit = 500*1000;
         $this->hexToNamedColorsMap = Colors::getHexToNamedMap();
         $this->namedToHexColorsMap = Colors::getNamedToHexMap();
         $this->namedToHexColorsRegex = sprintf(
@@ -176,8 +176,8 @@ 
      */
     private function setShortenZeroValuesRegexes()
     {
-        $zeroRegex = '0'. $this->unitsGroupRegex;
-        $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) ';
+        $zeroRegex = '0'.$this->unitsGroupRegex;
+        $numOrPosRegex = '('.$this->numRegex.'|top|left|bottom|right|center) ';
         $oneZeroSafeProperties = array(
             '(?:line-)?height',
             '(?:(?:min|max)-)?width',
@@ -195,14 +195,14 @@ 
         );
 
         // First zero regex
-        $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si';
+        $regex = '/(^|;)('.implode('|', $oneZeroSafeProperties).'):%s/Si';
         $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex);
 
         // Multiple zeroes regexes
         $regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si';
-        $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex);
-        $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex);
-        $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex);
+        $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex.$zeroRegex);
+        $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$zeroRegex);
+        $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$numOrPosRegex.$zeroRegex);
     }
 
     /**
@@ -389,7 +389,7 @@ 
             $dataStartIndex = $matchStartIndex + 4; // url( length
             $searchOffset = $matchStartIndex + strlen($m[0][0]);
             $terminator = $m[1][0]; // ', " or empty (not quoted)
-            $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S';
+            $terminatorRegex = '/(?<!\\\\)'.(strlen($terminator) === 0 ? '' : $terminator.'\s*').'(\))/S';
 
             $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset);
 
@@ -404,7 +404,7 @@ 
                     $token = preg_replace('/\s+/S', '', $token);
                 }
 
-                $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')';
+                $ret .= 'url('.$this->registerPreservedToken(trim($token)).')';
             // No end terminator found, re-add the whole match. Should we throw/warn here?
             } else {
                 $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex);
@@ -425,7 +425,7 @@ 
      */
     private function processCommentsCallback($matches)
     {
-        return '/*'. $this->registerCommentToken($matches[1]) .'*/';
+        return '/*'.$this->registerCommentToken($matches[1]).'*/';
     }
 
     /**
@@ -435,7 +435,7 @@ 
      */
     private function processOldIeSpecificMatrixDefinitionCallback($matches)
     {
-        return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')';
+        return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$this->registerPreservedToken($matches[1]).')';
     }
 
     /**
@@ -458,7 +458,7 @@ 
         // minify alpha opacity in filter strings
         $match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match);
 
-        return $quote . $this->registerPreservedToken($match) . $quote;
+        return $quote.$this->registerPreservedToken($match).$quote;
     }
 
     /**
@@ -469,7 +469,7 @@ 
      */
     private function processImportUnquotedUrlAtRulesCallback($matches)
     {
-        return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2];
+        return '@import url('.$this->registerPreservedToken($matches[1]).')'.$matches[2];
     }
 
     /**
@@ -480,7 +480,7 @@ 
     private function processComments($css)
     {
         foreach ($this->comments as $commentId => $comment) {
-            $commentIdString = '/*'. $commentId .'*/';
+            $commentIdString = '/*'.$commentId.'*/';
 
             // ! in the first position of the comment means preserve
             // so push to the preserved tokens keeping the !
@@ -531,7 +531,7 @@ 
             $blockEndPos = strpos($css, '}', $blockStartPos);
             // When ending curly brace is missing, let's
             // behave like there was one at the end of the block...
-            if ( false === $blockEndPos ) {
+            if (false === $blockEndPos) {
                 $blockEndPos = strlen($css) - 1;
             }
             $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
@@ -543,7 +543,7 @@ 
             } else {
                 $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1);
                 $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody));
-                $ret .= '{'. $ruleBodyToken .'}';
+                $ret .= '{'.$ruleBodyToken.'}';
                 $searchOffset = $blockEndPos + 1;
             }
 
@@ -643,8 +643,8 @@ 
         $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body);
 
         // shorten ms to s
-        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) {
-            return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s';
+        $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function($matches) {
+            return $matches[1].$matches[2].((int) $matches[3]/1000).'s';
         }, $body);
 
         // Remove leading zeros from integer and float numbers.
@@ -756,13 +756,13 @@ 
         $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css);
 
         // Retain space for special IE6 cases
-        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) {
-            return ':first-'. strtolower($matches[1]) .' '. $matches[2];
+        $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function($matches) {
+            return ':first-'.strtolower($matches[1]).' '.$matches[2];
         }, $css);
 
         // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1)
         // Add token to add the "/" back in later
-        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css);
+        $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'.self::QUERY_FRACTION.'$3)', $css);
 
         // Remove empty rule blocks up to 2 levels deep.
         $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css);
@@ -810,7 +810,7 @@ 
         }
 
         // @import handling
-        $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) {
+        $css = preg_replace_callback($this->importRegex, function($matches) use (&$imports) {
             // Keep all @import at-rules found for later
             $imports .= $matches[0];
             // Delete all @import at-rules
@@ -818,7 +818,7 @@ 
         }, $css);
 
         // @namespace handling
-        $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) {
+        $css = preg_replace_callback($this->namespaceRegex, function($matches) use (&$namespaces) {
             // Keep all @namespace at-rules found for later
             $namespaces .= $matches[0];
             // Delete all @namespace at-rules
@@ -829,7 +829,7 @@ 
         // 1. @charset first
         // 2. @imports below @charset
         // 3. @namespaces below @imports
-        $css = $charset . $imports . $namespaces . $css;
+        $css = $charset.$imports.$namespaces.$css;
 
         return $css;
     }
@@ -883,10 +883,10 @@ 
         // Restore space after rgb() or hsl() function in some cases such as:
         // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%);
         if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) {
-            $terminator = ' '. $terminator;
+            $terminator = ' '.$terminator;
         }
 
-        return '#'. implode('', $hexColors) . $terminator;
+        return '#'.implode('', $hexColors).$terminator;
     }
 
     /**
@@ -900,16 +900,16 @@ 
 
         // Shorten suitable 6 chars HEX colors
         if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) {
-            $hex = $m[1] . $m[2] . $m[3];
+            $hex = $m[1].$m[2].$m[3];
         }
 
         // Lowercase
-        $hex = '#'. strtolower($hex);
+        $hex = '#'.strtolower($hex);
 
         // Replace Hex colors with shorter color names
         $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex;
 
-        return $color . $matches[2];
+        return $color.$matches[2];
     }
 
     /**
@@ -920,7 +920,7 @@ 
      */
     private function shortenNamedColorsCallback($matches)
     {
-        return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3];
+        return $matches[1].$this->namedToHexColorsMap[strtolower($matches[2])].$matches[3];
     }
 
     /**

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';

classes/external/php/persist-admin-notices-dismissal/persist-admin-notices-dismissal.php

Indentation +122 added lines, -122 removed lines

@@ -29,131 +29,131 @@
  * Exit if called directly.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	die;
+    die;
 }
 
 if ( ! class_exists( 'PAnD' ) ) {
 
-	/**
-	 * Class PAnD
-	 */
-	class PAnD {
-
-		/**
-		 * Init hooks.
-		 */
-		public static function init() {
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
-		}
-
-		/**
-		 * Enqueue javascript and variables.
-		 */
-		public static function load_script() {
-
-			if ( is_customize_preview() ) {
-				return;
-			}
-
-			wp_enqueue_script(
-				'dismissible-notices',
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
-				array( 'jquery', 'common' ),
-				false,
-				true
-			);
-
-			wp_localize_script(
-				'dismissible-notices',
-				'dismissible_notice',
-				array(
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
-				)
-			);
-		}
-
-		/**
-		 * Handles Ajax request to persist notices dismissal.
-		 * Uses check_ajax_referer to verify nonce.
-		 */
-		public static function dismiss_admin_notice() {
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
-
-			if ( 'forever' != $dismissible_length ) {
-				// If $dismissible_length is not an integer default to 1
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
-			}
-
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
-			wp_die();
-		}
-
-		/**
-		 * Is admin notice active?
-		 *
-		 * @param string $arg data-dismissible content of notice.
-		 *
-		 * @return bool
-		 */
-		public static function is_admin_notice_active( $arg ) {
-			$array       = explode( '-', $arg );
-			$length      = array_pop( $array );
-			$option_name = implode( '-', $array );
-			$db_record   = self::get_admin_notice_cache( $option_name );
-			if ( 'forever' == $db_record ) {
-				return false;
-			} elseif ( absint( $db_record ) >= time() ) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-
-		/**
-		 * Returns admin notice cached timeout.
-		 *
-		 * @access public
-		 *
-		 * @param string|bool $id admin notice name or false.
-		 *
-		 * @return array|bool The timeout. False if expired.
-		 */
-		public static function get_admin_notice_cache( $id = false ) {
-			if ( ! $id ) {
-				return false;
-			}
-			$cache_key = 'pand-' . md5( $id );
-			$timeout   = get_site_option( $cache_key );
-			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
-
-			if ( empty( $timeout ) || time() > $timeout ) {
-				return false;
-			}
-
-			return $timeout;
-		}
-
-		/**
-		 * Sets admin notice timeout in site option.
-		 *
-		 * @access public
-		 *
-		 * @param string      $id       Data Identifier.
-		 * @param string|bool $timeout  Timeout for admin notice.
-		 *
-		 * @return bool
-		 */
-		public static function set_admin_notice_cache( $id, $timeout ) {
-			$cache_key = 'pand-' . md5( $id );
-			update_site_option( $cache_key, $timeout );
-
-			return true;
-		}
-
-	}
+    /**
+     * Class PAnD
+     */
+    class PAnD {
+
+        /**
+         * Init hooks.
+         */
+        public static function init() {
+            add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
+            add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
+        }
+
+        /**
+         * Enqueue javascript and variables.
+         */
+        public static function load_script() {
+
+            if ( is_customize_preview() ) {
+                return;
+            }
+
+            wp_enqueue_script(
+                'dismissible-notices',
+                plugins_url( 'dismiss-notice.js', __FILE__ ),
+                array( 'jquery', 'common' ),
+                false,
+                true
+            );
+
+            wp_localize_script(
+                'dismissible-notices',
+                'dismissible_notice',
+                array(
+                    'nonce' => wp_create_nonce( 'dismissible-notice' ),
+                )
+            );
+        }
+
+        /**
+         * Handles Ajax request to persist notices dismissal.
+         * Uses check_ajax_referer to verify nonce.
+         */
+        public static function dismiss_admin_notice() {
+            $option_name        = sanitize_text_field( $_POST['option_name'] );
+            $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
+
+            if ( 'forever' != $dismissible_length ) {
+                // If $dismissible_length is not an integer default to 1
+                $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
+                $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
+            }
+
+            check_ajax_referer( 'dismissible-notice', 'nonce' );
+            self::set_admin_notice_cache( $option_name, $dismissible_length );
+            wp_die();
+        }
+
+        /**
+         * Is admin notice active?
+         *
+         * @param string $arg data-dismissible content of notice.
+         *
+         * @return bool
+         */
+        public static function is_admin_notice_active( $arg ) {
+            $array       = explode( '-', $arg );
+            $length      = array_pop( $array );
+            $option_name = implode( '-', $array );
+            $db_record   = self::get_admin_notice_cache( $option_name );
+            if ( 'forever' == $db_record ) {
+                return false;
+            } elseif ( absint( $db_record ) >= time() ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * Returns admin notice cached timeout.
+         *
+         * @access public
+         *
+         * @param string|bool $id admin notice name or false.
+         *
+         * @return array|bool The timeout. False if expired.
+         */
+        public static function get_admin_notice_cache( $id = false ) {
+            if ( ! $id ) {
+                return false;
+            }
+            $cache_key = 'pand-' . md5( $id );
+            $timeout   = get_site_option( $cache_key );
+            $timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
+
+            if ( empty( $timeout ) || time() > $timeout ) {
+                return false;
+            }
+
+            return $timeout;
+        }
+
+        /**
+         * Sets admin notice timeout in site option.
+         *
+         * @access public
+         *
+         * @param string      $id       Data Identifier.
+         * @param string|bool $timeout  Timeout for admin notice.
+         *
+         * @return bool
+         */
+        public static function set_admin_notice_cache( $id, $timeout ) {
+            $cache_key = 'pand-' . md5( $id );
+            update_site_option( $cache_key, $timeout );
+
+            return true;
+        }
+
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -28,11 +28,11 @@ 
 /**
  * Exit if called directly.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	die;
 }
 
-if ( ! class_exists( 'PAnD' ) ) {
+if (!class_exists('PAnD')) {
 
 	/**
 	 * Class PAnD
@@ -43,8 +43,8 @@ 
 		 * Init hooks.
 		 */
 		public static function init() {
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
+			add_action('admin_enqueue_scripts', array(__CLASS__, 'load_script'));
+			add_action('wp_ajax_dismiss_admin_notice', array(__CLASS__, 'dismiss_admin_notice'));
 		}
 
 		/**
@@ -52,14 +52,14 @@ 
 		 */
 		public static function load_script() {
 
-			if ( is_customize_preview() ) {
+			if (is_customize_preview()) {
 				return;
 			}
 
 			wp_enqueue_script(
 				'dismissible-notices',
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
-				array( 'jquery', 'common' ),
+				plugins_url('dismiss-notice.js', __FILE__),
+				array('jquery', 'common'),
 				false,
 				true
 			);
@@ -68,7 +68,7 @@ 
 				'dismissible-notices',
 				'dismissible_notice',
 				array(
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
+					'nonce' => wp_create_nonce('dismissible-notice'),
 				)
 			);
 		}
@@ -78,17 +78,17 @@ 
 		 * Uses check_ajax_referer to verify nonce.
 		 */
 		public static function dismiss_admin_notice() {
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
+			$option_name        = sanitize_text_field($_POST['option_name']);
+			$dismissible_length = sanitize_text_field($_POST['dismissible_length']);
 
-			if ( 'forever' != $dismissible_length ) {
+			if ('forever' != $dismissible_length) {
 				// If $dismissible_length is not an integer default to 1
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
+				$dismissible_length = (0 == absint($dismissible_length)) ? 1 : $dismissible_length;
+				$dismissible_length = strtotime(absint($dismissible_length).' days');
 			}
 
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
+			check_ajax_referer('dismissible-notice', 'nonce');
+			self::set_admin_notice_cache($option_name, $dismissible_length);
 			wp_die();
 		}
 
@@ -99,14 +99,14 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_admin_notice_active( $arg ) {
-			$array       = explode( '-', $arg );
-			$length      = array_pop( $array );
-			$option_name = implode( '-', $array );
-			$db_record   = self::get_admin_notice_cache( $option_name );
-			if ( 'forever' == $db_record ) {
+		public static function is_admin_notice_active($arg) {
+			$array       = explode('-', $arg);
+			$length      = array_pop($array);
+			$option_name = implode('-', $array);
+			$db_record   = self::get_admin_notice_cache($option_name);
+			if ('forever' == $db_record) {
 				return false;
-			} elseif ( absint( $db_record ) >= time() ) {
+			} elseif (absint($db_record) >= time()) {
 				return false;
 			} else {
 				return true;
@@ -122,15 +122,15 @@ 
 		 *
 		 * @return array|bool The timeout. False if expired.
 		 */
-		public static function get_admin_notice_cache( $id = false ) {
-			if ( ! $id ) {
+		public static function get_admin_notice_cache($id = false) {
+			if (!$id) {
 				return false;
 			}
-			$cache_key = 'pand-' . md5( $id );
-			$timeout   = get_site_option( $cache_key );
+			$cache_key = 'pand-'.md5($id);
+			$timeout   = get_site_option($cache_key);
 			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
 
-			if ( empty( $timeout ) || time() > $timeout ) {
+			if (empty($timeout) || time() > $timeout) {
 				return false;
 			}
 
@@ -147,9 +147,9 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function set_admin_notice_cache( $id, $timeout ) {
-			$cache_key = 'pand-' . md5( $id );
-			update_site_option( $cache_key, $timeout );
+		public static function set_admin_notice_cache($id, $timeout) {
+			$cache_key = 'pand-'.md5($id);
+			update_site_option($cache_key, $timeout);
 
 			return true;
 		}

classes/external/php/jsmin.php

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
     protected $inputLength = 0;
     protected $lookAhead   = null;
     protected $output      = '';
-    protected $lastByteOut  = '';
+    protected $lastByteOut = '';
     protected $keptComment = '';
 
     /**
@@ -106,7 +106,7 @@ 
         }
 
         $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
             $mbIntEnc = mb_internal_encoding();
             mb_internal_encoding('8bit');
         }
@@ -128,7 +128,7 @@ 
                         && ($this->b === $this->lastByteOut)) {
                     // Don't delete this space. If we do, the addition/subtraction
                     // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
+                } elseif (!$this->isAlphaNum($this->b)) {
                     $command = self::ACTION_DELETE_A;
                 }
             } elseif ($this->a === "\n") {
@@ -139,10 +139,10 @@ 
                     // otherwise mb_strpos will give WARNING
                 } elseif ($this->b === null
                           || (false === strpos('{[(+-!~', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
+                              && !$this->isAlphaNum($this->b))) {
                     $command = self::ACTION_DELETE_A;
                 }
-            } elseif (! $this->isAlphaNum($this->a)) {
+            } elseif (!$this->isAlphaNum($this->a)) {
                 if ($this->b === ' '
                     || ($this->b === "\n"
                         && (false === strpos('}])+-"\'', $this->a)))) {
@@ -199,7 +199,7 @@ 
                 if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal
                     $delimiter = $this->a;
                     $str = $this->a; // in case needed for exception
-                    for(;;) {
+                    for (;;) {
                         $this->output .= $this->a;
                         $this->lastByteOut = $this->a;
 
@@ -229,13 +229,13 @@ 
             case self::ACTION_DELETE_A_B: // 3
                 $this->b = $this->next();
                 if ($this->b === '/' && $this->isRegexpLiteral()) {
-                    $this->output .= $this->a . $this->b;
+                    $this->output .= $this->a.$this->b;
                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception
-                    for(;;) {
+                    for (;;) {
                         $this->a = $this->get();
                         $pattern .= $this->a;
                         if ($this->a === '[') {
-                            for(;;) {
+                            for (;;) {
                                 $this->output .= $this->a;
                                 $this->a = $this->get();
                                 $pattern .= $this->a;
@@ -250,7 +250,7 @@ 
                                 if ($this->isEOF($this->a)) {
                                     throw new JSMin_UnterminatedRegExpException(
                                         "JSMin: Unterminated set in RegExp at byte "
-                                            . $this->inputIndex .": {$pattern}");
+                                            . $this->inputIndex.": {$pattern}");
                                 }
                             }
                         }
@@ -295,7 +295,7 @@ 
 
         // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division
 
-        $subject = $this->output . trim($this->a);
+        $subject = $this->output.trim($this->a);
         if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) {
             // not a keyword
             return false;
@@ -406,7 +406,7 @@ 
     {
         $this->get();
         $comment = '';
-        for(;;) {
+        for (;;) {
             $get = $this->get();
             if ($get === '*') {
                 if ($this->peek() === '/') { // end of comment reached
@@ -417,7 +417,7 @@ 
                             // don't prepend a newline if two comments right after one another
                             $this->keptComment = "\n";
                         }
-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";
                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
                         // IE conditional
                         $this->keptComment .= "/*{$comment}*/";

classes/autoptimizeToolbar.php

Spacing +49 added lines, -49 removed lines

@@ -3,7 +3,7 @@ 
  * Handles toolbar-related stuff.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,32 +12,32 @@ 
     public function __construct()
     {
         // If Cache is not available we don't add the toolbar.
-        if ( ! autoptimizeCache::cacheavail() ) {
+        if (!autoptimizeCache::cacheavail()) {
             return;
         }
 
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
+        add_action('wp_loaded', array($this, 'load_toolbar'));
     }
 
     public function load_toolbar()
     {
         // Check permissions and that toolbar is not hidden via filter.
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
 
             // Create a handler for the AJAX toolbar requests.
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
 
             // Load custom styles, scripts and menu only when needed.
-            if ( is_admin_bar_showing() ) {
-                if ( is_admin() ) {
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+            if (is_admin_bar_showing()) {
+                if (is_admin()) {
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
                 } else {
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
                 }
 
                 // Add the Autoptimize Toolbar to the Admin bar.
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
             }
         }
     }
@@ -50,17 +50,17 @@ 
         $stats = autoptimizeCache::stats();
 
         // Set the Max Size recommended for cache files.
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
 
         // Retrieve the current Total Files in cache.
         $files = $stats[0];
         // Retrieve the current Total Size of the cache.
         $bytes = $stats[1];
-        $size  = $this->format_filesize( $bytes );
+        $size  = $this->format_filesize($bytes);
 
         // Calculate the percentage of cache used.
-        $percentage = ceil( $bytes / $max_size * 100 );
-        if ( $percentage > 100 ) {
+        $percentage = ceil($bytes/$max_size*100);
+        if ($percentage > 100) {
             $percentage = 100;
         }
 
@@ -70,82 +70,82 @@ 
          * - "orange" if over 80%.
          * - "red" if over 100%.
          */
-        $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
+        $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
 
         // Create or add new items into the Admin Toolbar.
         // Main "Autoptimize" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'    => 'autoptimize',
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>',
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
-            'meta'  => array( 'class' => 'bullet-' . $color ),
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>',
+            'href'  => admin_url('options-general.php?page=autoptimize'),
+            'meta'  => array('class' => 'bullet-'.$color),
         ));
 
         // "Cache Info" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-cache-info',
-            'title'  => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' .
-                        '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
-                        '<div class="autoptimize-circle">' .
-                        '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="shadow"></div>' .
-                        '</div>' .
-                        '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' .
-                        '</div>' .
-                        '<table>' .
-                        '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                        '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+            'title'  => '<p>'.__('Cache Info', 'autoptimize').'</p>'.
+                        '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
+                        '<div class="autoptimize-circle">'.
+                        '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="shadow"></div>'.
+                        '</div>'.
+                        '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
+                        '</div>'.
+                        '<table>'.
+                        '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
+                        '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
                         '</table>',
             'parent' => 'autoptimize',
         ));
 
         // "Delete Cache" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-delete-cache',
-            'title'  => __( 'Delete Cache', 'autoptimize' ),
+            'title'  => __('Delete Cache', 'autoptimize'),
             'parent' => 'autoptimize',
         ));
     }
 
     public function delete_cache()
     {
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
 
         $result = false;
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // We call the function for cleaning the Autoptimize cache.
             $result = autoptimizeCache::clearall();
         }
 
-        wp_send_json( $result );
+        wp_send_json($result);
     }
 
     public function enqueue_scripts()
     {
         // Autoptimize Toolbar Styles.
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' );
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all');
 
         // Autoptimize Toolbar Javascript.
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true );
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true);
 
         // Localizes a registered script with data for a JavaScript variable.
         // Needed for the AJAX to work properly on the frontend.
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
-            'ajaxurl'     => admin_url( 'admin-ajax.php' ),
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
+            'ajaxurl'     => admin_url('admin-ajax.php'),
             // translators: links to the Autoptimize settings page.
-            'error_msg'   => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
-            'nonce'       => wp_create_nonce( 'ao_delcache_nonce' ),
-        ) );
+            'error_msg'   => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
+            'dismiss_msg' => __('Dismiss this notice.'),
+            'nonce'       => wp_create_nonce('ao_delcache_nonce'),
+        ));
     }
 
-    public function format_filesize( $bytes, $decimals = 2 )
+    public function format_filesize($bytes, $decimals = 2)
     {
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-        for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine
 
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] );
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
     }
 }

classes/autoptimizeConfig.php

Doc Comments +6 added lines

@@ -798,6 +798,9 @@ 
         return $preload_onload;
     }
 
+    /**
+     * @param string $key
+     */
     public function get( $key )
     {
         if ( ! is_array( $this->config ) ) {
@@ -824,6 +827,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $url
+     */
     private function get_futtta_feeds( $url ) {
         if ( $this->settings_screen_do_remote_http ) {
             $rss      = fetch_feed( $url );

Braces +5 added lines, -2 removed lines

@@ -837,10 +837,13 @@
             <ul>
                 <?php if ( 0 == $maxitems ) : ?>
                     <li><?php _e( 'No items', 'autoptimize' ); ?></li>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <?php foreach ( $rss_items as $item ) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url( $item->get_permalink() );
+}
+?>"
                                 <?php // translators: the variable contains a date. ?>
                                 title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>">
                                 <?php echo esc_html( $item->get_title() ); ?>

Spacing +216 added lines, -216 removed lines

@@ -3,7 +3,7 @@ 
  * Main configuration logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -35,32 +35,32 @@ 
      */
     private function __construct()
     {
-        if ( is_admin() ) {
+        if (is_admin()) {
             // Add the admin page and settings.
-            if ( autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
+            if (autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'addmenu'));
             }
 
-            add_action( 'admin_menu', array( $this, 'addmenu' ) );
-            add_action( 'admin_init', array( $this, 'registersettings' ) );
+            add_action('admin_menu', array($this, 'addmenu'));
+            add_action('admin_init', array($this, 'registersettings'));
 
             // Set meta info.
-            if ( function_exists( 'plugin_row_meta' ) ) {
+            if (function_exists('plugin_row_meta')) {
                 // 2.8 and higher.
-                add_filter( 'plugin_row_meta', array( $this, 'setmeta' ), 10, 2 );
-            } elseif ( function_exists( 'post_class' ) ) {
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
+            } elseif (function_exists('post_class')) {
                 // 2.7 and lower.
-                $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
-                add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) );
+                $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
             }
 
             // Clean cache?
-            if ( autoptimizeOptionWrapper::get_option( 'autoptimize_cache_clean' ) ) {
+            if (autoptimizeOptionWrapper::get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                autoptimizeOptionWrapper::update_option( 'autoptimize_cache_clean', 0 );
+                autoptimizeOptionWrapper::update_option('autoptimize_cache_clean', 0);
             }
 
-            $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
+            $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http);
         }
 
         // Adds the Autoptimize Toolbar to the Admin bar.
@@ -76,7 +76,7 @@ 
     static public function instance()
     {
         // Only one instance.
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new autoptimizeConfig();
         }
 
@@ -86,9 +86,9 @@ 
     public function show_network_message() {
         ?>
         <div class="wrap">
-            <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+            <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
             <?php echo $this->ao_admin_tabs(); ?>
-            <p style="font-size:120%;"><?php echo apply_filters( 'autoptimize_filter_settingsscreen_multisite_network_message', __( 'Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize' ) ); ?></p>
+            <p style="font-size:120%;"><?php echo apply_filters('autoptimize_filter_settingsscreen_multisite_network_message', __('Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize')); ?></p>
         </div>
         <?php
     }
@@ -180,32 +180,32 @@ 
 
 <div class="wrap">
 
-<?php if ( defined( 'AUTOPTIMIZE_LEGACY_MINIFIERS' ) ) { ?>
+<?php if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { ?>
     <div class="notice-error notice"><p>
-        <?php _e( "You are using the (no longer supported) AUTOPTIMIZE_LEGACY_MINIFIERS constant. Ensure your site is working properly and remove the constant, it doesn't do anything any more.", 'autoptimize' ); ?>
+        <?php _e("You are using the (no longer supported) AUTOPTIMIZE_LEGACY_MINIFIERS constant. Ensure your site is working properly and remove the constant, it doesn't do anything any more.", 'autoptimize'); ?>
     </p></div>
 <?php } ?>
 
 <div id="autoptimize_main">
-    <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
     <?php echo $this->ao_admin_tabs(); ?>
 
-<form method="post" action="<?php echo admin_url( 'options.php' ); ?>">
-<?php settings_fields( 'autoptimize' ); ?>
+<form method="post" action="<?php echo admin_url('options.php'); ?>">
+<?php settings_fields('autoptimize'); ?>
 
 <ul>
 
 <?php
 // Only show enable site configuration in network site option.
-if ( is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
+if (is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
 ?>
     <li class="itemDetail multiSite">
-        <h2 class="itemTitle"><?php _e( 'Multisite Options', 'autoptimize' ); ?></h2>
+        <h2 class="itemTitle"><?php _e('Multisite Options', 'autoptimize'); ?></h2>
         <table class="form-table">
             <tr valign="top">
-                <th scope="row"><?php _e( 'Enable site configuration?', 'autoptimize' ); ?></th>
-                <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ? 'checked="checked" ' : ''; ?>/>
-                <?php _e( 'Enable Autoptimize configuration per site.', 'autoptimize' ); ?></label></td>
+                <th scope="row"><?php _e('Enable site configuration?', 'autoptimize'); ?></th>
+                <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config') ? 'checked="checked" ' : ''; ?>/>
+                <?php _e('Enable Autoptimize configuration per site.', 'autoptimize'); ?></label></td>
             </tr>
         </table>
     </li>
@@ -214,117 +214,117 @@ 
 <?php } ?>    
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'JavaScript Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize JavaScript Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr valign="top" class="js_sub">
-<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Aggregate JS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get('autoptimize_js_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Also aggregate inline JS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_include_inline' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Force JavaScript in &lt;head&gt;?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_forcehead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td>
 </tr>
-<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ) { ?>
+<?php if (autoptimizeOptionWrapper::get_option('autoptimize_js_justhead')) { ?>
 <tr valign="top" class="js_sub js_aggregate">
 <th scope="row">
 <?php
-    _e( 'Look for scripts only in &lt;head&gt;?', 'autoptimize' );
-    echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>';
+    _e('Look for scripts only in &lt;head&gt;?', 'autoptimize');
+    echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>';
 ?>
 </th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize' ); ?></label></td>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
 <tr valign="top" class="js_sub">
-<th scope="row"><?php _e( 'Exclude scripts from Autoptimize:', 'autoptimize' ); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js' ); ?>"/><br />
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js'); ?>"/><br />
 <?php
-echo __( 'A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
+echo __('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize');
 ?>
 </label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Add try-catch wrapping?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_trycatch' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'If your scripts break because of a JS-error, you might want to try this.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'CSS Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize CSS Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr class="css_sub" valign="top">
-<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Aggregate CSS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get('autoptimize_css_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="css_sub css_aggregate">
-<th scope="row"><?php _e( 'Also aggregate inline CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_include_inline', '1' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
 </tr>
 <tr class="css_sub css_aggregate" valign="top">
-<th scope="row"><?php _e( 'Generate data: URIs for images?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_datauris' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
 </tr>
-<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ) { ?>
+<?php if (autoptimizeOptionWrapper::get_option('autoptimize_css_justhead')) { ?>
 <tr valign="top" class="css_sub css_aggregate">
 <th scope="row">
 <?php
-_e( 'Look for styles only in &lt;head&gt;?', 'autoptimize' );
-echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>';
+_e('Look for styles only in &lt;head&gt;?', 'autoptimize');
+echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>';
 ?>
 </th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize' ); ?></label></td>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
 <tr valign="top" class="css_sub">
-<th scope="row"><?php _e( 'Inline and Defer CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' ) ? 'checked="checked" ' : ''; ?>/>
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/>
 <?php
-_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' );
-if ( ! autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) {
+_e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize');
+if (!autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) {
     echo ' ';
-    $critcss_install_url = network_admin_url() . 'plugin-install.php?s=autoptimize+criticalcss&tab=search&type=term';
+    $critcss_install_url = network_admin_url().'plugin-install.php?s=autoptimize+criticalcss&tab=search&type=term';
     // translators: links to plugin install screen with "autoptimize critical CSS" search.
-    echo sprintf( __( 'This can be fully automated for different types of pages with the %s.', 'autoptimize' ), '<a href="' . $critcss_install_url . '">Autoptimize CriticalCSS Power-Up</a>' );
+    echo sprintf(__('This can be fully automated for different types of pages with the %s.', 'autoptimize'), '<a href="'.$critcss_install_url.'">Autoptimize CriticalCSS Power-Up</a>');
 }
 ?>
 </label></td>
 </tr>
 <tr valign="top" class="css_sub" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ); ?></textarea></label></td>
+<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
 </tr>
 <tr valign="top" class="css_sub css_aggregate">
-<th scope="row"><?php _e( 'Inline all CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_inline' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="css_sub">
-<th scope="row"><?php _e( 'Exclude CSS from Autoptimize:', 'autoptimize' ); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css' ); ?>"/><br />
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br />
 <?php
-echo __( 'A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
+echo __('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize');
 ?>
 </label></td>
 </tr>
@@ -332,55 +332,55 @@ 
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'HTML Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize HTML Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr class="html_sub" valign="top">
-<th scope="row"><?php _e( 'Keep HTML comments?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html_keepcomments' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Enable this if you want HTML comments to remain in the page.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'CDN Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'CDN Base URL', 'autoptimize' ); ?></th>
-<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url( autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' ), array( 'http', 'https' ) ); ?>" /><br />
-<?php _e( 'Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
+<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', ''), array('http', 'https')); ?>" /><br />
+<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'Cache Info', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
 <table class="form-table" >
 <tr valign="top" >
-<th scope="row"><?php _e( 'Cache folder', 'autoptimize' ); ?></th>
-<td><?php echo htmlentities( AUTOPTIMIZE_CACHE_DIR ); ?></td>
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
+<td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
 </tr>
 <tr valign="top" >
-<th scope="row"><?php _e( 'Can we write?', 'autoptimize' ); ?></th>
-<td><?php echo ( autoptimizeCache::cacheavail() ? __( 'Yes', 'autoptimize' ) : __( 'No', 'autoptimize' ) ); ?></td>
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
 </tr>
 <tr valign="top" >
-<th scope="row"><?php _e( 'Cached styles and scripts', 'autoptimize' ); ?></th>
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
 <td>
     <?php
     $ao_stat_arr = autoptimizeCache::stats();
-    if ( ! empty( $ao_stat_arr ) && is_array( $ao_stat_arr ) ) {
-        $ao_cache_size = size_format( $ao_stat_arr[1], 2 );
+    if (!empty($ao_stat_arr) && is_array($ao_stat_arr)) {
+        $ao_cache_size = size_format($ao_stat_arr[1], 2);
         $details       = '';
-        if ( $ao_cache_size > 0 ) {
-            $details = ', ~' . $ao_cache_size . ' total';
+        if ($ao_cache_size > 0) {
+            $details = ', ~'.$ao_cache_size.' total';
         }
         // translators: Kilobytes + timestamp shown.
-        printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize' ), $ao_stat_arr[0], $ao_cache_size, date( 'H:i e', $ao_stat_arr[2] ) );
+        printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $ao_stat_arr[0], $ao_cache_size, date('H:i e', $ao_stat_arr[2]));
     }
     ?>
 </td>
@@ -389,36 +389,36 @@ 
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'Misc Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
 <table class="form-table">
     <tr valign="top" >
-    <th scope="row"><?php _e( 'Save aggregated script/css as static files?', 'autoptimize' ); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip', '1' ) ? 'checked="checked" ' : ''; ?>/>
-    <?php _e( 'By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize' ); ?></label></td>
+    <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td>
     </tr>
     <?php
     $_min_excl_class = '';
-    if ( ! $conf->get( 'autoptimize_css_aggregate' ) && ! $conf->get( 'autoptimize_js_aggregate' ) ) {
+    if (!$conf->get('autoptimize_css_aggregate') && !$conf->get('autoptimize_js_aggregate')) {
         $_min_excl_class = 'hidden';
     }
     ?>
     <tr valign="top" id="min_excl_row" class="<?php echo $_min_excl_class; ?>">
-        <th scope="row"><?php _e( 'Minify excluded CSS and JS files?', 'autoptimize' ); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_minify_excluded', '1' ) ? 'checked="checked" ' : ''; ?>/>
-        <?php _e( 'When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize' ); ?></label></td>
+        <th scope="row"><?php _e('Minify excluded CSS and JS files?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_minify_excluded', '1') ? 'checked="checked" ' : ''; ?>/>
+        <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize'); ?></label></td>
     </tr>
     <tr valign="top">
-    <th scope="row"><?php _e( 'Also optimize for logged in editors/ administrators?', 'autoptimize' ); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option( 'autoptimize_optimize_logged', '1' ) ? 'checked="checked" ' : ''; ?>/>
-    <?php _e( 'By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize' ); ?></label></td>
+    <th scope="row"><?php _e('Also optimize for logged in editors/ administrators?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td>
     </tr>
     <?php
-    if ( function_exists( 'is_checkout' ) || function_exists( 'is_cart' ) || function_exists( 'edd_is_checkout' ) || function_exists( 'wpsc_is_cart' ) || function_exists( 'wpsc_is_checkout' ) ) {
+    if (function_exists('is_checkout') || function_exists('is_cart') || function_exists('edd_is_checkout') || function_exists('wpsc_is_cart') || function_exists('wpsc_is_checkout')) {
     ?>
     <tr valign="top" >
-        <th scope="row"><?php _e( 'Also optimize shop cart/ checkout?', 'autoptimize' ); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', '0' ) ? 'checked="checked" ' : ''; ?>/>
-            <?php _e( 'By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize' ); ?></label>
+        <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', '0') ? 'checked="checked" ' : ''; ?>/>
+            <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label>
         </td>
     </tr>
     <?php } ?>
@@ -428,8 +428,8 @@ 
 </ul>
 
 <p class="submit">
-<input type="submit" class="button-secondary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" />
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e( 'Save Changes and Empty Cache', 'autoptimize' ); ?>" />
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize'); ?>" />
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize'); ?>" />
 </p>
 
 </form>
@@ -438,46 +438,46 @@ 
     <div class="autoptimize_banner hidden">
     <ul>
     <?php
-    if ( $this->settings_screen_do_remote_http ) {
-        $ao_banner = get_transient( 'autoptimize_banner' );
-        if ( empty( $ao_banner ) ) {
-            $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-            if ( ! is_wp_error( $banner_resp ) ) {
-                if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) {
-                    $ao_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) );
-                    set_transient( 'autoptimize_banner', $ao_banner, WEEK_IN_SECONDS );
+    if ($this->settings_screen_do_remote_http) {
+        $ao_banner = get_transient('autoptimize_banner');
+        if (empty($ao_banner)) {
+            $banner_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+            if (!is_wp_error($banner_resp)) {
+                if ('200' == wp_remote_retrieve_response_code($banner_resp)) {
+                    $ao_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
+                    set_transient('autoptimize_banner', $ao_banner, WEEK_IN_SECONDS);
                 }
             }
         }
         echo $ao_banner;
     }
     ?>
-        <li><?php _e( "Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize' ); ?></li>
-        <li><?php _e( 'Happy with Autoptimize?', 'autoptimize' ); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e( 'Try my other plugins!', 'autoptimize' ); ?></a></li>
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize'); ?></li>
+        <li><?php _e('Happy with Autoptimize?', 'autoptimize'); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e('Try my other plugins!', 'autoptimize'); ?></a></li>
     </ul>
     </div>
     <div style="margin-left:10px;margin-top:-5px;">
         <h2>
-            <?php _e( 'futtta about', 'autoptimize' ); ?>
+            <?php _e('futtta about', 'autoptimize'); ?>
             <select id="feed_dropdown" >
-                <option value="1"><?php _e( 'Autoptimize', 'autoptimize' ); ?></option>
-                <option value="2"><?php _e( 'WordPress', 'autoptimize' ); ?></option>
-                <option value="3"><?php _e( 'Web Technology', 'autoptimize' ); ?></option>
+                <option value="1"><?php _e('Autoptimize', 'autoptimize'); ?></option>
+                <option value="2"><?php _e('WordPress', 'autoptimize'); ?></option>
+                <option value="3"><?php _e('Web Technology', 'autoptimize'); ?></option>
             </select>
         </h2>
         <div id="futtta_feed">
             <div id="autoptimizefeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_autoptimize' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_autoptimize'); ?>
             </div>
             <div id="wordpressfeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_wordpress' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_wordpress'); ?>
             </div>
             <div id="webtechfeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_webtech' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_webtech'); ?>
             </div>
         </div>
     </div>
-    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url() . '/' . plugin_basename( dirname( __FILE__ ) ) . '/external/do_not_donate_smallest.png'; ?>" title="<?php _e( 'Do not donate for this plugin!', 'autoptimize' ); ?>"></a></div>
+    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e('Do not donate for this plugin!', 'autoptimize'); ?>"></a></div>
 </div>
 
 <script type="text/javascript">
@@ -626,80 +626,80 @@ 
 
     public function addmenu()
     {
-        if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
+        if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
             // multisite, network admin, ao network activated: add normal settings page at network level.
-            $hook = add_submenu_page( 'settings.php', __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show_config' ) );
-        } elseif ( is_multisite() && ! is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) {
+            $hook = add_submenu_page('settings.php', __('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_network_options', 'autoptimize', array($this, 'show_config'));
+        } elseif (is_multisite() && !is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) {
             // multisite, ao network activated, not network admin so site specific settings, but "autoptimize_enable_site_config" is off: show "sorry, ask network admin" message iso options.
-            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_network_message' ) );
+            $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_network_message'));
         } else {
             // default: show normal options page if not multisite, if multisite but not network activated, if multisite and network activated and "autoptimize_enable_site_config" is on.
-            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_config' ) );
+            $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_config'));
         }
 
-        add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
-        add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
     }
 
     public function autoptimize_admin_scripts()
     {
-        wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
     }
 
     public function autoptimize_admin_styles()
     {
-        wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) );
-        wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) );
+        wp_enqueue_style('unslider', plugins_url('/external/js/unslider.css', __FILE__));
+        wp_enqueue_style('unslider-dots', plugins_url('/external/js/unslider-dots.css', __FILE__));
     }
 
     public function registersettings() {
-        register_setting( 'autoptimize', 'autoptimize_html' );
-        register_setting( 'autoptimize', 'autoptimize_html_keepcomments' );
-        register_setting( 'autoptimize', 'autoptimize_enable_site_config' );
-        register_setting( 'autoptimize', 'autoptimize_js' );
-        register_setting( 'autoptimize', 'autoptimize_js_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_js_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_js_trycatch' );
-        register_setting( 'autoptimize', 'autoptimize_js_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_js_forcehead' );
-        register_setting( 'autoptimize', 'autoptimize_js_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css' );
-        register_setting( 'autoptimize', 'autoptimize_css_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_css_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_css_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_css_datauris' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_cdn_url' );
-        register_setting( 'autoptimize', 'autoptimize_cache_clean' );
-        register_setting( 'autoptimize', 'autoptimize_cache_nogzip' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_logged' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_checkout' );
-        register_setting( 'autoptimize', 'autoptimize_minify_excluded' );
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+        register_setting('autoptimize', 'autoptimize_enable_site_config');
+        register_setting('autoptimize', 'autoptimize_js');
+        register_setting('autoptimize', 'autoptimize_js_aggregate');
+        register_setting('autoptimize', 'autoptimize_js_exclude');
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
+        register_setting('autoptimize', 'autoptimize_js_justhead');
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
+        register_setting('autoptimize', 'autoptimize_css');
+        register_setting('autoptimize', 'autoptimize_css_aggregate');
+        register_setting('autoptimize', 'autoptimize_css_exclude');
+        register_setting('autoptimize', 'autoptimize_css_justhead');
+        register_setting('autoptimize', 'autoptimize_css_datauris');
+        register_setting('autoptimize', 'autoptimize_css_defer');
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
+        register_setting('autoptimize', 'autoptimize_css_inline');
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
+        register_setting('autoptimize', 'autoptimize_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
+        register_setting('autoptimize', 'autoptimize_optimize_checkout');
+        register_setting('autoptimize', 'autoptimize_minify_excluded');
     }
 
-    public function setmeta( $links, $file = null )
+    public function setmeta($links, $file = null)
     {
         // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/.
         // Do it only once - saves time.
         static $plugin;
-        if ( empty( $plugin ) ) {
-            $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
+        if (empty($plugin)) {
+            $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
         }
 
-        if ( null === $file ) {
+        if (null === $file) {
             // 2.7 and lower.
-            $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) );
-            array_unshift( $links, $settings_link );
+            $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
+            array_unshift($links, $settings_link);
         } else {
             // 2.8 and higher.
             // If it's us, add the link.
-            if ( $file === $plugin ) {
-                $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) );
-                $links   = array_merge( $links, $newlink );
+            if ($file === $plugin) {
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
+                $links   = array_merge($links, $newlink);
             }
         }
 
@@ -774,7 +774,7 @@ 
             'autoptimize_imgopt_select_field_2'   => '2', // quality glossy.
             'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off.
             'autoptimize_imgopt_checkbox_field_4' => '0', // webp off (might be removed).
-            'autoptimize_imgopt_text_field_5'     => '',  // lazy load exclusions empty.
+            'autoptimize_imgopt_text_field_5'     => '', // lazy load exclusions empty.
         );
         return $defaults;
     }
@@ -786,7 +786,7 @@ 
      */
     public static function get_ao_css_preload_polyfill()
     {
-        $preload_poly = apply_filters( 'autoptimize_css_preload_polyfill', '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>' );
+        $preload_poly = apply_filters('autoptimize_css_preload_polyfill', '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>');
         return $preload_poly;
     }
 
@@ -797,56 +797,56 @@ 
      */
     public static function get_ao_css_preload_onload()
     {
-        $preload_onload = apply_filters( 'autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'" );
+        $preload_onload = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'");
         return $preload_onload;
     }
 
-    public function get( $key )
+    public function get($key)
     {
-        if ( ! is_array( $this->config ) ) {
+        if (!is_array($this->config)) {
             // Default config.
             $config = self::get_defaults();
 
             // Override with user settings.
-            foreach ( array_keys( $config ) as $name ) {
-                $conf = autoptimizeOptionWrapper::get_option( $name );
-                if ( false !== $conf ) {
+            foreach (array_keys($config) as $name) {
+                $conf = autoptimizeOptionWrapper::get_option($name);
+                if (false !== $conf) {
                     // It was set before!
-                    $config[ $name ] = $conf;
+                    $config[$name] = $conf;
                 }
             }
 
             // Save for next call.
-            $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
+            $this->config = apply_filters('autoptimize_filter_get_config', $config);
         }
 
-        if ( isset( $this->config[ $key ] ) ) {
-            return $this->config[ $key ];
+        if (isset($this->config[$key])) {
+            return $this->config[$key];
         }
 
         return false;
     }
 
-    private function get_futtta_feeds( $url ) {
-        if ( $this->settings_screen_do_remote_http ) {
-            $rss      = fetch_feed( $url );
+    private function get_futtta_feeds($url) {
+        if ($this->settings_screen_do_remote_http) {
+            $rss      = fetch_feed($url);
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems  = $rss->get_item_quantity( 7 );
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems  = $rss->get_item_quantity(7);
+                $rss_items = $rss->get_items(0, $maxitems);
             }
             ?>
             <ul>
-                <?php if ( 0 == $maxitems ) : ?>
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
+                <?php if (0 == $maxitems) : ?>
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
                 <?php else : ?>
-                    <?php foreach ( $rss_items as $item ) : ?>
+                    <?php foreach ($rss_items as $item) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
                                 <?php // translators: the variable contains a date. ?>
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>">
-                                <?php echo esc_html( $item->get_title() ); ?>
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
+                                <?php echo esc_html($item->get_title()); ?>
                             </a>
                         </li>
                     <?php endforeach; ?>
@@ -859,23 +859,23 @@ 
     static function ao_admin_tabs()
     {
         // based on http://wordpress.stackexchange.com/a/58826 .
-        $tabs        = apply_filters( 'autoptimize_filter_settingsscreen_tabs', array( 'autoptimize' => __( 'JS, CSS  &amp; HTML', 'autoptimize' ) ) );
+        $tabs        = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('JS, CSS  &amp; HTML', 'autoptimize')));
         $tab_content = '';
-        $tabs_count  = count( $tabs );
-        if ( $tabs_count > 1 ) {
-            if ( isset( $_GET['page'] ) ) {
+        $tabs_count  = count($tabs);
+        if ($tabs_count > 1) {
+            if (isset($_GET['page'])) {
                 $current_id = $_GET['page'];
             } else {
                 $current_id = 'autoptimize';
             }
             $tab_content .= '<h2 class="nav-tab-wrapper">';
-            foreach ( $tabs as $tab_id => $tab_name ) {
-                if ( $current_id == $tab_id ) {
+            foreach ($tabs as $tab_id => $tab_name) {
+                if ($current_id == $tab_id) {
                     $class = ' nav-tab-active';
                 } else {
                     $class = '';
                 }
-                $tab_content .= '<a class="nav-tab' . $class . '" href="?page=' . $tab_id . '">' . $tab_name . '</a>';
+                $tab_content .= '<a class="nav-tab'.$class.'" href="?page='.$tab_id.'">'.$tab_name.'</a>';
             }
             $tab_content .= '</h2>';
         } else {
@@ -892,7 +892,7 @@ 
      */
     public static function is_admin_and_not_ajax()
     {
-        return ( is_admin() && ! self::doing_ajax() );
+        return (is_admin() && !self::doing_ajax());
     }
 
     /**
@@ -902,10 +902,10 @@ 
      */
     protected static function doing_ajax()
     {
-        if ( function_exists( 'wp_doing_ajax' ) ) {
+        if (function_exists('wp_doing_ajax')) {
             return wp_doing_ajax();
         }
-        return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+        return (defined('DOING_AJAX') && DOING_AJAX);
     }
 
     /**
@@ -914,7 +914,7 @@ 
      * @return bool
      */
     public static function should_show_menu_tabs() {
-        if ( ! is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) {
+        if (!is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) {
             return true;
         } else {
             return false;