futtta / autoptimize

classes/autoptimizeBase.php

Doc Comments +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      *
      * @param string $url URL to transform.
      *
-     * @return bool|string
+     * @return false|string
      */
     public function getpath( $url )
     {
@@ -610,7 +610,7 @@ 
     /**
      * Logs given `$data` for debugging purposes (when debug logging is on).
      *
-     * @param mixed $data Data to log.
+     * @param string $data Data to log.
      *
      * @return void
      */
@@ -632,7 +632,7 @@ 
      *
      * @param string $filepath Filepath.
      *
-     * @return bool|string to be minified code or false.
+     * @return false|string to be minified code or false.
      */
     protected function prepare_minify_single( $filepath )
     {

Indentation +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
          * First element is the filepath, second is the md5 hash of contents
          * the filepath had when it was being processed.
          * If we don't have those, we'll bail out early.
-        */
+         */
         $filepath = null;
         $filehash = null;
 

Spacing +151 added lines, -151 removed lines

@@ -3,7 +3,7 @@ 
  * Base class other (more-specific) classes inherit from.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -30,7 +30,7 @@ 
      */
     public $cdn_url = '';
 
-    public function __construct( $content )
+    public function __construct($content)
     {
         $this->content = $content;
     }
@@ -42,7 +42,7 @@ 
      *
      * @return bool
      */
-    abstract public function read( $options );
+    abstract public function read($options);
 
     /**
      * Joins and optimizes collected things.
@@ -73,40 +73,40 @@ 
      *
      * @return bool|string
      */
-    public function getpath( $url )
+    public function getpath($url)
     {
-        $url = apply_filters( 'autoptimize_filter_cssjs_alter_url', $url );
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
 
-        if ( false !== strpos( $url, '%' ) ) {
-            $url = urldecode( $url );
+        if (false !== strpos($url, '%')) {
+            $url = urldecode($url);
         }
 
-        $site_host    = parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST );
-        $content_host = parse_url( AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST );
+        $site_host    = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $content_host = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
 
         // Normalizing attempts...
-        $double_slash_position = strpos( $url, '//' );
-        if ( 0 === $double_slash_position ) {
-            if ( is_ssl() ) {
-                $url = 'https:' . $url;
+        $double_slash_position = strpos($url, '//');
+        if (0 === $double_slash_position) {
+            if (is_ssl()) {
+                $url = 'https:'.$url;
             } else {
-                $url = 'http:' . $url;
+                $url = 'http:'.$url;
             }
-        } elseif ( ( false === $double_slash_position ) && ( false === strpos( $url, $site_host ) ) ) {
-            if ( AUTOPTIMIZE_WP_SITE_URL === $site_host ) {
-                $url = AUTOPTIMIZE_WP_SITE_URL . $url;
+        } elseif ((false === $double_slash_position) && (false === strpos($url, $site_host))) {
+            if (AUTOPTIMIZE_WP_SITE_URL === $site_host) {
+                $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $url = AUTOPTIMIZE_WP_SITE_URL . autoptimizeUtils::path_canonicalize( $url );
+                $url = AUTOPTIMIZE_WP_SITE_URL.autoptimizeUtils::path_canonicalize($url);
             }
         }
 
-        if ( $site_host !== $content_host ) {
-            $url = str_replace( AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL . AUTOPTIMIZE_WP_CONTENT_NAME, $url );
+        if ($site_host !== $content_host) {
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
         }
 
         // First check; hostname wp site should be hostname of url!
-        $url_host = @parse_url( $url, PHP_URL_HOST ); // @codingStandardsIgnoreLine
-        if ( $url_host !== $site_host ) {
+        $url_host = @parse_url($url, PHP_URL_HOST); // @codingStandardsIgnoreLine
+        if ($url_host !== $site_host) {
             /**
              * First try to get all domains from WPML (if available)
              * then explicitely declare $this->cdn_url as OK as well
@@ -115,20 +115,20 @@ 
              */
             $multidomains = array();
 
-            $multidomains_wpml = apply_filters( 'wpml_setting', array(), 'language_domains' );
-            if ( ! empty( $multidomains_wpml ) ) {
-                $multidomains = array_map( array( $this, 'get_url_hostname' ), $multidomains_wpml );
+            $multidomains_wpml = apply_filters('wpml_setting', array(), 'language_domains');
+            if (!empty($multidomains_wpml)) {
+                $multidomains = array_map(array($this, 'get_url_hostname'), $multidomains_wpml);
             }
 
-            if ( ! empty( $this->cdn_url ) ) {
-                $multidomains[] = parse_url( $this->cdn_url, PHP_URL_HOST );
+            if (!empty($this->cdn_url)) {
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
 
-            $multidomains = apply_filters( 'autoptimize_filter_cssjs_multidomain', $multidomains );
+            $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
 
-            if ( ! empty( $multidomains ) ) {
-                if ( in_array( $url_host, $multidomains ) ) {
-                    $url = str_replace( $url_host, $site_host, $url );
+            if (!empty($multidomains)) {
+                if (in_array($url_host, $multidomains)) {
+                    $url = str_replace($url_host, $site_host, $url);
                 } else {
                     return false;
                 }
@@ -138,36 +138,36 @@ 
         }
 
         // Try to remove "wp root url" from url while not minding http<>https.
-        $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL );
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
 
-        if ( $site_host !== $content_host ) {
+        if ($site_host !== $content_host) {
             // As we replaced the content-domain with the site-domain, we should match against that.
-            $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_SITE_URL );
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
         
-        if ( is_multisite() && ! is_main_site() && ! empty( $this->cdn_url ) ) {
+        if (is_multisite() && !is_main_site() && !empty($this->cdn_url)) {
             // multisite child sites with CDN need the network_site_url as tmp_ao_root but only if directory-based multisite.
             $_network_site_url = network_site_url();
-            if ( strpos( AUTOPTIMIZE_WP_SITE_URL, $_network_site_url ) !== false ) {
-                $tmp_ao_root = preg_replace( '/https?:/', '', $_network_site_url );
+            if (strpos(AUTOPTIMIZE_WP_SITE_URL, $_network_site_url) !== false) {
+                $tmp_ao_root = preg_replace('/https?:/', '', $_network_site_url);
             }
         }
 
-        $tmp_url = preg_replace( '/https?:/', '', $url );
-        $path    = str_replace( $tmp_ao_root, '', $tmp_url );
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path    = str_replace($tmp_ao_root, '', $tmp_url);
 
         // If path starts with :// or //, this is not a URL in the WP context and
         // we have to assume we can't aggregate.
-        if ( preg_match( '#^:?//#', $path ) ) {
+        if (preg_match('#^:?//#', $path)) {
             // External script/css (adsense, etc).
             return false;
         }
 
         // Prepend with WP_ROOT_DIR to have full path to file.
-        $path = str_replace( '//', '/', trailingslashit( WP_ROOT_DIR ) . $path );
+        $path = str_replace('//', '/', trailingslashit(WP_ROOT_DIR).$path);
 
         // Final check: does file exist and is it readable?
-        if ( file_exists( $path ) && is_file( $path ) && is_readable( $path ) ) {
+        if (file_exists($path) && is_file($path) && is_readable($path)) {
             return $path;
         } else {
             return false;
@@ -184,18 +184,18 @@ 
      *
      * @return string
      */
-    protected function get_url_hostname( $url )
+    protected function get_url_hostname($url)
     {
         // Checking that the url starts with something vaguely resembling a protocol.
-        if ( ( 0 !== strpos( $url, 'http' ) ) && ( 0 !== strpos( $url, '//' ) ) ) {
-            $url = 'http://' . $url;
+        if ((0 !== strpos($url, 'http')) && (0 !== strpos($url, '//'))) {
+            $url = 'http://'.$url;
         }
 
         // Grab the hostname.
-        $hostname = parse_url( $url, PHP_URL_HOST );
+        $hostname = parse_url($url, PHP_URL_HOST);
 
         // Fallback when parse_url() fails.
-        if ( empty( $hostname ) ) {
+        if (empty($hostname)) {
             $hostname = $url;
         }
 
@@ -209,7 +209,7 @@ 
      *
      * @return string
      */
-    protected function hide_noptimize( $markup )
+    protected function hide_noptimize($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'NOPTIMIZE',
@@ -226,9 +226,9 @@ 
      *
      * @return string
      */
-    protected function restore_noptimize( $markup )
+    protected function restore_noptimize($markup)
     {
-        return $this->restore_marked_content( 'NOPTIMIZE', $markup );
+        return $this->restore_marked_content('NOPTIMIZE', $markup);
     }
 
     /**
@@ -238,7 +238,7 @@ 
      *
      * @return string
      */
-    protected function hide_iehacks( $markup )
+    protected function hide_iehacks($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'IEHACK', // Marker name...
@@ -255,9 +255,9 @@ 
      *
      * @return string
      */
-    protected function restore_iehacks( $markup )
+    protected function restore_iehacks($markup)
     {
-        return $this->restore_marked_content( 'IEHACK', $markup );
+        return $this->restore_marked_content('IEHACK', $markup);
     }
 
     /**
@@ -269,7 +269,7 @@ 
      *
      * @return string
      */
-    protected function hide_comments( $markup )
+    protected function hide_comments($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'COMMENTS',
@@ -287,9 +287,9 @@ 
      *
      * @return string
      */
-    protected function restore_comments( $markup )
+    protected function restore_comments($markup)
     {
-        return $this->restore_marked_content( 'COMMENTS', $markup );
+        return $this->restore_marked_content('COMMENTS', $markup);
     }
 
     /**
@@ -300,44 +300,44 @@ 
      *
      * @return string
      */
-    public function url_replace_cdn( $url )
+    public function url_replace_cdn($url)
     {
         // For 2.3 back-compat in which cdn-ing appeared to be automatically
         // including WP subfolder/subdirectory into account as part of cdn-ing,
         // even though it might've caused serious troubles in certain edge-cases.
-        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $this->cdn_url );
+        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($this->cdn_url);
 
         // Allows API/filter to further tweak the cdn url...
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url );
-        if ( ! empty( $cdn_url ) ) {
-            $this->debug_log( 'before=' . $url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url);
+        if (!empty($cdn_url)) {
+            $this->debug_log('before='.$url);
 
             // Simple str_replace-based approach fails when $url is protocol-or-host-relative.
-            $is_protocol_relative = autoptimizeUtils::is_protocol_relative( $url );
-            $is_host_relative     = ( ! $is_protocol_relative && ( '/' === $url[0] ) );
-            $cdn_url              = rtrim( $cdn_url, '/' );
+            $is_protocol_relative = autoptimizeUtils::is_protocol_relative($url);
+            $is_host_relative     = (!$is_protocol_relative && ('/' === $url[0]));
+            $cdn_url              = rtrim($cdn_url, '/');
 
-            if ( $is_host_relative ) {
+            if ($is_host_relative) {
                 // Prepending host-relative urls with the cdn url.
-                $url = $cdn_url . $url;
+                $url = $cdn_url.$url;
             } else {
                 // Either a protocol-relative or "regular" url, replacing it either way.
-                if ( $is_protocol_relative ) {
+                if ($is_protocol_relative) {
                     // Massage $site_url so that simple str_replace() still "works" by
                     // searching for the protocol-relative version of AUTOPTIMIZE_WP_SITE_URL.
-                    $site_url = str_replace( array( 'http:', 'https:' ), '', AUTOPTIMIZE_WP_SITE_URL );
+                    $site_url = str_replace(array('http:', 'https:'), '', AUTOPTIMIZE_WP_SITE_URL);
                 } else {
                     $site_url = AUTOPTIMIZE_WP_SITE_URL;
                 }
-                $this->debug_log( '`' . $site_url . '` -> `' . $cdn_url . '` in `' . $url . '`' );
-                $url = str_replace( $site_url, $cdn_url, $url );
+                $this->debug_log('`'.$site_url.'` -> `'.$cdn_url.'` in `'.$url.'`');
+                $url = str_replace($site_url, $cdn_url, $url);
             }
 
-            $this->debug_log( 'after=' . $url );
+            $this->debug_log('after='.$url);
         }
 
         // Allow API filter to take further care of CDN replacement.
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
 
         return $url;
     }
@@ -355,18 +355,18 @@ 
      *
      * @return void
      */
-    protected function inject_in_html( $payload, $where )
+    protected function inject_in_html($payload, $where)
     {
         $warned   = false;
-        $position = autoptimizeUtils::strpos( $this->content, $where[0] );
-        if ( false !== $position ) {
+        $position = autoptimizeUtils::strpos($this->content, $where[0]);
+        if (false !== $position) {
             // Found the tag, setup content/injection as specified.
-            if ( 'after' === $where[1] ) {
-                $content = $where[0] . $payload;
-            } elseif ( 'replace' === $where[1] ) {
+            if ('after' === $where[1]) {
+                $content = $where[0].$payload;
+            } elseif ('replace' === $where[1]) {
                 $content = $payload;
             } else {
-                $content = $payload . $where[0];
+                $content = $payload.$where[0];
             }
             // Place where specified.
             $this->content = autoptimizeUtils::substr_replace(
@@ -375,14 +375,14 @@ 
                 $position,
                 // Using plain strlen() should be safe here for now, since
                 // we're not searching for multibyte chars here still...
-                strlen( $where[0] )
+                strlen($where[0])
             );
         } else {
             // Couldn't find what was specified, just append and add a warning.
             $this->content .= $payload;
-            if ( ! $warned ) {
-                $tag_display    = str_replace( array( '<', '>' ), '', $where[0] );
-                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `' . $tag_display . '` missing --><!--/noptimize-->';
+            if (!$warned) {
+                $tag_display    = str_replace(array('<', '>'), '', $where[0]);
+                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `'.$tag_display.'` missing --><!--/noptimize-->';
                 $warned         = true;
             }
         }
@@ -396,10 +396,10 @@ 
      *
      * @return bool
      */
-    protected function isremovable( $tag, $removables )
+    protected function isremovable($tag, $removables)
     {
-        foreach ( $removables as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($removables as $match) {
+            if (false !== strpos($tag, $match)) {
                 return true;
             }
         }
@@ -414,10 +414,10 @@ 
      *
      * @return string
      */
-    public function inject_minified_callback( $matches )
+    public function inject_minified_callback($matches)
     {
         static $conf = null;
-        if ( null === $conf ) {
+        if (null === $conf) {
             $conf = autoptimizeConfig::instance();
         }
 
@@ -432,62 +432,62 @@ 
         $filehash = null;
 
         // Grab the parts we need.
-        $parts = explode( '|', $matches[1] );
-        if ( ! empty( $parts ) ) {
-            $filepath = isset( $parts[0] ) ? base64_decode( $parts[0] ) : null;
-            $filehash = isset( $parts[1] ) ? $parts[1] : null;
+        $parts = explode('|', $matches[1]);
+        if (!empty($parts)) {
+            $filepath = isset($parts[0]) ? base64_decode($parts[0]) : null;
+            $filehash = isset($parts[1]) ? $parts[1] : null;
         }
 
         // Bail early if something's not right...
-        if ( ! $filepath || ! $filehash ) {
+        if (!$filepath || !$filehash) {
             return "\n";
         }
 
-        $filecontent = file_get_contents( $filepath );
+        $filecontent = file_get_contents($filepath);
 
         // Some things are differently handled for css/js...
-        $is_js_file = ( '.js' === substr( $filepath, -3, 3 ) );
+        $is_js_file = ('.js' === substr($filepath, -3, 3));
 
         $is_css_file = false;
-        if ( ! $is_js_file ) {
-            $is_css_file = ( '.css' === substr( $filepath, -4, 4 ) );
+        if (!$is_js_file) {
+            $is_css_file = ('.css' === substr($filepath, -4, 4));
         }
 
         // BOMs being nuked here unconditionally (regardless of where they are)!
-        $filecontent = preg_replace( "#\x{EF}\x{BB}\x{BF}#", '', $filecontent );
+        $filecontent = preg_replace("#\x{EF}\x{BB}\x{BF}#", '', $filecontent);
 
         // Remove comments and blank lines.
-        if ( $is_js_file ) {
-            $filecontent = preg_replace( '#^\s*\/\/.*$#Um', '', $filecontent );
+        if ($is_js_file) {
+            $filecontent = preg_replace('#^\s*\/\/.*$#Um', '', $filecontent);
         }
 
         // Nuke un-important comments.
-        $filecontent = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent );
+        $filecontent = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent);
 
         // Normalize newlines.
-        $filecontent = preg_replace( '#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent );
+        $filecontent = preg_replace('#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent);
 
         // JS specifics.
-        if ( $is_js_file ) {
+        if ($is_js_file) {
             // Append a semicolon at the end of js files if it's missing.
-            $last_char = substr( $filecontent, -1, 1 );
-            if ( ';' !== $last_char && '}' !== $last_char ) {
+            $last_char = substr($filecontent, -1, 1);
+            if (';' !== $last_char && '}' !== $last_char) {
                 $filecontent .= ';';
             }
             // Check if try/catch should be used.
-            $opt_js_try_catch = $conf->get( 'autoptimize_js_trycatch' );
-            if ( 'on' === $opt_js_try_catch ) {
+            $opt_js_try_catch = $conf->get('autoptimize_js_trycatch');
+            if ('on' === $opt_js_try_catch) {
                 // It should, wrap in try/catch.
-                $filecontent = 'try{' . $filecontent . '}catch(e){}';
+                $filecontent = 'try{'.$filecontent.'}catch(e){}';
             }
-        } elseif ( $is_css_file ) {
-            $filecontent = autoptimizeStyles::fixurls( $filepath, $filecontent );
+        } elseif ($is_css_file) {
+            $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent);
         } else {
             $filecontent = '';
         }
 
         // Return modified (or empty!) code/content.
-        return "\n" . $filecontent;
+        return "\n".$filecontent;
     }
 
     /**
@@ -497,13 +497,13 @@ 
      *
      * @return string
      */
-    protected function inject_minified( $in )
+    protected function inject_minified($in)
     {
         $out = $in;
-        if ( false !== strpos( $in, '%%INJECTLATER%%' ) ) {
+        if (false !== strpos($in, '%%INJECTLATER%%')) {
             $out = preg_replace_callback(
-                '#\/\*\!%%INJECTLATER' . AUTOPTIMIZE_HASH . '%%(.*?)%%INJECTLATER%%\*\/#is',
-                array( $this, 'inject_minified_callback' ),
+                '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
+                array($this, 'inject_minified_callback'),
                 $in
             );
         }
@@ -523,9 +523,9 @@ 
      *
      * @return string
      */
-    public static function build_injectlater_marker( $filepath, $hash )
+    public static function build_injectlater_marker($filepath, $hash)
     {
-        $contents = '/*!' . self::build_marker( 'INJECTLATER', $filepath, $hash ) . '*/';
+        $contents = '/*!'.self::build_marker('INJECTLATER', $filepath, $hash).'*/';
 
         return $contents;
     }
@@ -543,18 +543,18 @@ 
      *
      * @return string
      */
-    public static function build_marker( $name, $data, $hash = null )
+    public static function build_marker($name, $data, $hash = null)
     {
         // Start the marker, add the data.
-        $marker = '%%' . $name . AUTOPTIMIZE_HASH . '%%' . base64_encode( $data );
+        $marker = '%%'.$name.AUTOPTIMIZE_HASH.'%%'.base64_encode($data);
 
         // Add the hash if provided.
-        if ( null !== $hash ) {
-            $marker .= '|' . $hash;
+        if (null !== $hash) {
+            $marker .= '|'.$hash;
         }
 
         // Close the marker.
-        $marker .= '%%' . $name . '%%';
+        $marker .= '%%'.$name.'%%';
 
         return $marker;
     }
@@ -574,22 +574,22 @@ 
      *
      * @return string
      */
-    public static function replace_contents_with_marker_if_exists( $marker, $search, $re_replace_pattern, $content )
+    public static function replace_contents_with_marker_if_exists($marker, $search, $re_replace_pattern, $content)
     {
         $found = false;
 
-        $is_regex = autoptimizeUtils::str_is_valid_regex( $search );
-        if ( $is_regex ) {
-            $found = preg_match( $search, $content );
+        $is_regex = autoptimizeUtils::str_is_valid_regex($search);
+        if ($is_regex) {
+            $found = preg_match($search, $content);
         } else {
-            $found = ( false !== strpos( $content, $search ) );
+            $found = (false !== strpos($content, $search));
         }
 
-        if ( $found ) {
+        if ($found) {
             $content = preg_replace_callback(
                 $re_replace_pattern,
-                function( $matches ) use ( $marker ) {
-                    return autoptimizeBase::build_marker( $marker, $matches[0] );
+                function($matches) use ($marker) {
+                    return autoptimizeBase::build_marker($marker, $matches[0]);
                 },
                 $content
             );
@@ -606,13 +606,13 @@ 
      *
      * @return string
      */
-    public static function restore_marked_content( $marker, $content )
+    public static function restore_marked_content($marker, $content)
     {
-        if ( false !== strpos( $content, $marker ) ) {
+        if (false !== strpos($content, $marker)) {
             $content = preg_replace_callback(
-                '#%%' . $marker . AUTOPTIMIZE_HASH . '%%(.*?)%%' . $marker . '%%#is',
-                function ( $matches ) {
-                    return base64_decode( $matches[1] );
+                '#%%'.$marker.AUTOPTIMIZE_HASH.'%%(.*?)%%'.$marker.'%%#is',
+                function($matches) {
+                    return base64_decode($matches[1]);
                 },
                 $content
             );
@@ -628,17 +628,17 @@ 
      *
      * @return void
      */
-    protected function debug_log( $data )
+    protected function debug_log($data)
     {
-        if ( ! isset( $this->debug_log ) || ! $this->debug_log ) {
+        if (!isset($this->debug_log) || !$this->debug_log) {
             return;
         }
 
-        if ( ! is_string( $data ) && ! is_resource( $data ) ) {
-            $data = var_export( $data, true );
+        if (!is_string($data) && !is_resource($data)) {
+            $data = var_export($data, true);
         }
 
-        error_log( $data );
+        error_log($data);
     }
 
     /**
@@ -648,12 +648,12 @@ 
      *
      * @return bool|string to be minified code or false.
      */
-    protected function prepare_minify_single( $filepath )
+    protected function prepare_minify_single($filepath)
     {
         // Decide what we're dealing with, return false if we don't know.
-        if ( autoptimizeUtils::str_ends_in( $filepath, '.js' ) ) {
+        if (autoptimizeUtils::str_ends_in($filepath, '.js')) {
             $type = 'js';
-        } elseif ( autoptimizeUtils::str_ends_in( $filepath, '.css' ) ) {
+        } elseif (autoptimizeUtils::str_ends_in($filepath, '.css')) {
             $type = 'css';
         } else {
             return false;
@@ -662,18 +662,18 @@ 
         // Bail if it looks like its already minifed (by having -min or .min
         // in filename) or if it looks like WP jquery.js (which is minified).
         $minified_variants = array(
-            '-min.' . $type,
-            '.min.' . $type,
+            '-min.'.$type,
+            '.min.'.$type,
             'js/jquery/jquery.js',
         );
-        foreach ( $minified_variants as $ending ) {
-            if ( autoptimizeUtils::str_ends_in( $filepath, $ending ) ) {
+        foreach ($minified_variants as $ending) {
+            if (autoptimizeUtils::str_ends_in($filepath, $ending)) {
                 return false;
             }
         }
 
         // Get file contents, bail if empty.
-        $contents = file_get_contents( $filepath );
+        $contents = file_get_contents($filepath);
 
         return $contents;
     }
@@ -686,12 +686,12 @@ 
      *
      * @return string
      */
-    protected function build_minify_single_url( autoptimizeCache $cache )
+    protected function build_minify_single_url(autoptimizeCache $cache)
     {
-        $url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+        $url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
 
         // CDN-replace the resulting URL if needed...
-        $url = $this->url_replace_cdn( $url );
+        $url = $this->url_replace_cdn($url);
 
         return $url;
     }

config/default.php

Indentation +42 added lines, -42 removed lines

@@ -2,9 +2,9 @@ 
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@ 
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') &&
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
 {
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
-	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
+    $code = file_get_contents(__FILE__.'.none');
+    $contents = gzencode($code,9,$flag);
 }else{
-	//Get data
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
+    //Get data
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
 }
 
 // first check if we have to send 304
@@ -52,36 +52,36 @@ 
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
-	if ($encoding != 'none') {
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    // send all sorts of headers
+    $expireTime=60*60*24*355; // 1y max according to RFC
+    if ($encoding != 'none') {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 
-	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
-	{
-		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+    //And write to filesystem cache if not done yet
+    if($encoding != 'none' && $iscompressed == false)
+    {
+        //Write the content we sent
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
 
-		//And write the new content
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
-	}
+        //And write the new content
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
+        $contents = gzencode($code,9,$flag);
+        file_put_contents(__FILE__.'.'.$ext,$contents);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,19 +44,19 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -66,22 +66,22 @@ 
 	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		file_put_contents(__FILE__.'.'.$encoding, $contents);
 
 		//And write the new content
 		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
 		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

Braces +14 added lines, -9 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$version = floatval($matches[1]);
 
-	if ($version < 6)
-		$encoding = 'none';
+	if ($version < 6) {
+			$encoding = 'none';
+	}
 
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
-		$encoding = 'none';
-}
+	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) {
+			$encoding = 'none';
+	}
+	}
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
@@ -36,7 +41,7 @@ 
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
 	$contents = gzencode($code,9,$flag);
-}else{
+} else{
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }

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

Spacing +18 added lines, -18 removed lines

@@ -38,18 +38,18 @@ 
         $l = floatval(str_replace('%', '', $hslValues[2]));
 
         // Wrap and clamp, then fraction!
-        $h = ((($h % 360) + 360) % 360) / 360;
-        $s = self::clampNumber($s, 0, 100) / 100;
-        $l = self::clampNumber($l, 0, 100) / 100;
+        $h = ((($h%360) + 360)%360)/360;
+        $s = self::clampNumber($s, 0, 100)/100;
+        $l = self::clampNumber($l, 0, 100)/100;
 
         if ($s == 0) {
-            $r = $g = $b = self::roundNumber(255 * $l);
+            $r = $g = $b = self::roundNumber(255*$l);
         } else {
-            $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
-            $v1 = (2 * $l) - $v2;
-            $r = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h + (1/3)));
-            $g = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h));
-            $b = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h - (1/3)));
+            $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l);
+            $v1 = (2*$l) - $v2;
+            $r = self::roundNumber(255*self::hueToRgb($v1, $v2, $h + (1/3)));
+            $g = self::roundNumber(255*self::hueToRgb($v1, $v2, $h));
+            $b = self::roundNumber(255*self::hueToRgb($v1, $v2, $h - (1/3)));
         }
 
         return array($r, $g, $b);
@@ -66,16 +66,16 @@ 
     {
         $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 
-        if ($vh * 6 < 1) {
-            return $v1 + ($v2 - $v1) * 6 * $vh;
+        if ($vh*6 < 1) {
+            return $v1 + ($v2 - $v1)*6*$vh;
         }
 
-        if ($vh * 2 < 1) {
+        if ($vh*2 < 1) {
             return $v2;
         }
 
-        if ($vh * 3 < 2) {
-            return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
+        if ($vh*3 < 2) {
+            return $v1 + ($v2 - $v1)*((2/3) - $vh)*6;
         }
 
         return $v1;
@@ -94,13 +94,13 @@ 
             switch ($letter) {
                 case 'M':
                 case 'm':
-                    return (int) $size * 1048576;
+                    return (int) $size*1048576;
                 case 'K':
                 case 'k':
-                    return (int) $size * 1024;
+                    return (int) $size*1024;
                 case 'G':
                 case 'g':
-                    return (int) $size * 1073741824;
+                    return (int) $size*1073741824;
             }
         }
         return (int) $size;
@@ -114,7 +114,7 @@ 
     public static function rgbPercentageToRgbInteger($rgbPercentage)
     {
         if (strpos($rgbPercentage, '%') !== false) {
-            $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55);
+            $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55);
         }
 
         return intval($rgbPercentage, 10);

classes/autoptimizeCLI.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
  * WP-CLI commands for Autoptimize.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
 // This is a WP-CLI command, so bail if it's not available.
-if ( ! defined( 'WP_CLI' ) ) {
+if (!defined('WP_CLI')) {
     return;
 }
 
@@ -24,11 +24,11 @@ 
      *
      * @return void
      */
-    public function clear( $args, $args_assoc ) {
-        WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+    public function clear($args, $args_assoc) {
+        WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize'));
         autoptimizeCache::clearall();
-        WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+        WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize'));
     }
 }
 
-WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' );
+WP_CLI::add_command('autoptimize', 'autoptimizeCLI');

classes/autoptimizeCSSmin.php

Spacing +7 added lines, -7 removed lines

@@ -3,7 +3,7 @@ 
  * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,9 +21,9 @@ 
      *
      * @param bool $raise_limits Whether to raise memory limits or not. Default true.
      */
-    public function __construct( $raise_limits = true )
+    public function __construct($raise_limits = true)
     {
-        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits );
+        $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits);
     }
 
     /**
@@ -34,9 +34,9 @@ 
      *
      * @return string
      */
-    public function run( $css )
+    public function run($css)
     {
-        $result = $this->minifier->run( $css );
+        $result = $this->minifier->run($css);
 
         return $result;
     }
@@ -48,10 +48,10 @@ 
      *
      * @return string
      */
-    public static function minify( $css )
+    public static function minify($css)
     {
         $minifier = new self();
 
-        return $minifier->run( $css );
+        return $minifier->run($css);
     }
 }

classes/autoptimizeSpeedupper.php

Spacing +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
  * new in Autoptimize 2.2
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,94 +17,94 @@ 
 
     public function add_hooks()
     {
-        if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
-            add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 );
-            add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 );
+        if (apply_filters('autoptimize_js_do_minify', true)) {
+            add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2);
+            add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1);
         }
-        if ( apply_filters( 'autoptimize_css_do_minify', true ) ) {
-            add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 );
-            add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 );
+        if (apply_filters('autoptimize_css_do_minify', true)) {
+            add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2);
+            add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1);
         }
     }
 
-    public function js_snippetcacher( $jsin, $jsfilename )
+    public function js_snippetcacher($jsin, $jsfilename)
     {
-        $md5hash = 'snippet_' . md5( $jsin );
-        $ccheck  = new autoptimizeCache( $md5hash, 'js' );
-        if ( $ccheck->check() ) {
+        $md5hash = 'snippet_'.md5($jsin);
+        $ccheck  = new autoptimizeCache($md5hash, 'js');
+        if ($ccheck->check()) {
             $scriptsrc = $ccheck->retrieve();
         } else {
-            if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) {
-                $tmp_jscode = trim( JSMin::minify( $jsin ) );
-                if ( ! empty( $tmp_jscode ) ) {
+            if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+                $tmp_jscode = trim(JSMin::minify($jsin));
+                if (!empty($tmp_jscode)) {
                     $scriptsrc = $tmp_jscode;
-                    unset( $tmp_jscode );
+                    unset($tmp_jscode);
                 } else {
                     $scriptsrc = $jsin;
                 }
             } else {
                 // Removing comments, linebreaks and stuff!
-                $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin );
-                $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc );
-                $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc );
+                $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin);
+                $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc);
+                $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
             }
 
-            $last_char = substr( $scriptsrc, -1, 1 );
-            if ( ';' !== $last_char && '}' !== $last_char ) {
+            $last_char = substr($scriptsrc, -1, 1);
+            if (';' !== $last_char && '}' !== $last_char) {
                 $scriptsrc .= ';';
             }
 
-            if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) {
+            if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) {
                 // Don't cache inline CSS or if filter says no!
-                $ccheck->cache( $scriptsrc, 'text/javascript' );
+                $ccheck->cache($scriptsrc, 'text/javascript');
             }
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         return $scriptsrc;
     }
 
-    public function css_snippetcacher( $cssin, $cssfilename )
+    public function css_snippetcacher($cssin, $cssfilename)
     {
-        $md5hash = 'snippet_' . md5( $cssin );
-        $ccheck  = new autoptimizeCache( $md5hash, 'css' );
-        if ( $ccheck->check() ) {
+        $md5hash = 'snippet_'.md5($cssin);
+        $ccheck  = new autoptimizeCache($md5hash, 'css');
+        if ($ccheck->check()) {
             $stylesrc = $ccheck->retrieve();
         } else {
-            if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) {
+            if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
                 $cssmin   = new autoptimizeCSSmin();
-                $tmp_code = trim( $cssmin->run( $cssin ) );
+                $tmp_code = trim($cssmin->run($cssin));
 
-                if ( ! empty( $tmp_code ) ) {
+                if (!empty($tmp_code)) {
                     $stylesrc = $tmp_code;
-                    unset( $tmp_code );
+                    unset($tmp_code);
                 } else {
                     $stylesrc = $cssin;
                 }
             } else {
                 // .min.css -> no heavy-lifting, just some cleanup!
-                $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin );
-                $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc );
-                $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc );
+                $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin);
+                $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+                $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
             }
-            if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) {
+            if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) {
                 // Only caching CSS if it's not inline and is allowed by filter!
-                $ccheck->cache( $stylesrc, 'text/css' );
+                $ccheck->cache($stylesrc, 'text/css');
             }
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         return $stylesrc;
     }
 
-    public function css_cleanup( $cssin )
+    public function css_cleanup($cssin)
     {
         // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed.
-        return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) );
+        return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
     }
 
-    public function js_cleanup( $jsin )
+    public function js_cleanup($jsin)
     {
-        return trim( $jsin );
+        return trim($jsin);
     }
 }

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 characters 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 +461 added lines, -461 removed lines

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

classes/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];
     }
 
     /**