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 +148 added lines, -148 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,28 +138,28 @@ 
         }
 
         // 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);
         }
 
-        $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( '//', '/', WP_ROOT_DIR . $path );
+        $path = str_replace('//', '/', 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;
@@ -176,18 +176,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;
         }
 
@@ -201,7 +201,7 @@ 
      *
      * @return string
      */
-    protected function hide_noptimize( $markup )
+    protected function hide_noptimize($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'NOPTIMIZE',
@@ -218,9 +218,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);
     }
 
     /**
@@ -230,7 +230,7 @@ 
      *
      * @return string
      */
-    protected function hide_iehacks( $markup )
+    protected function hide_iehacks($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'IEHACK', // Marker name...
@@ -247,9 +247,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);
     }
 
     /**
@@ -261,7 +261,7 @@ 
      *
      * @return string
      */
-    protected function hide_comments( $markup )
+    protected function hide_comments($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'COMMENTS',
@@ -279,9 +279,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);
     }
 
     /**
@@ -292,44 +292,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;
     }
@@ -347,18 +347,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(
@@ -367,14 +367,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;
             }
         }
@@ -388,10 +388,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;
             }
         }
@@ -406,10 +406,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();
         }
 
@@ -424,62 +424,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;
     }
 
     /**
@@ -489,13 +489,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
             );
         }
@@ -515,9 +515,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;
     }
@@ -535,18 +535,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;
     }
@@ -566,22 +566,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
             );
@@ -598,13 +598,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
             );
@@ -620,17 +620,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);
     }
 
     /**
@@ -640,12 +640,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;
@@ -654,18 +654,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;
     }
@@ -678,12 +678,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;
     }

classes/autoptimizeCache.php

Doc Comments +1 added lines, -1 removed lines

@@ -434,7 +434,7 @@
      * size = total filesize (in bytes) of found files
      * timestamp = unix timestamp when the scan was last performed/finished.
      *
-     * @return array
+     * @return integer[]
      */
     protected static function stats_scan()
     {

Spacing +165 added lines, -165 removed lines

@@ -3,7 +3,7 @@ 
  * Handles disk-cache-related operations.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -38,17 +38,17 @@ 
      * @param string $md5 Hash.
      * @param string $ext Extension.
      */
-    public function __construct( $md5, $ext = 'php' )
+    public function __construct($md5, $ext = 'php')
     {
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->nogzip   = AUTOPTIMIZE_CACHE_NOGZIP;
-        if ( ! $this->nogzip ) {
-            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.php';
+        if (!$this->nogzip) {
+            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php';
         } else {
-            if ( in_array( $ext, array( 'js', 'css' ) ) ) {
-                $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext;
+            if (in_array($ext, array('js', 'css'))) {
+                $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             } else {
-                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext;
+                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             }
         }
     }
@@ -60,7 +60,7 @@ 
      */
     public function check()
     {
-        return file_exists( $this->cachedir . $this->filename );
+        return file_exists($this->cachedir.$this->filename);
     }
 
     /**
@@ -70,11 +70,11 @@ 
      */
     public function retrieve()
     {
-        if ( $this->check() ) {
-            if ( false == $this->nogzip ) {
-                return file_get_contents( $this->cachedir . $this->filename . '.none' );
+        if ($this->check()) {
+            if (false == $this->nogzip) {
+                return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
-                return file_get_contents( $this->cachedir . $this->filename );
+                return file_get_contents($this->cachedir.$this->filename);
             }
         }
         return false;
@@ -88,43 +88,43 @@ 
      *
      * @return void
      */
-    public function cache( $data, $mime )
+    public function cache($data, $mime)
     {
         // off by default; check if cachedirs exist every time before caching
         //
         // to be activated for users that experience these ugly errors;
         // PHP Warning: file_put_contents failed to open stream: No such file or directory.
-        if ( apply_filters( 'autoptimize_filter_cache_checkdirs_on_write', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_checkdirs_on_write', false)) {
             $this->check_and_create_dirs();
         }
 
-        if ( false === $this->nogzip ) {
+        if (false === $this->nogzip) {
             // We handle gzipping ourselves.
             $file    = 'default.php';
-            $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file );
-            $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode );
+            $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file);
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
 
-            file_put_contents( $this->cachedir . $this->filename, $phpcode );
-            file_put_contents( $this->cachedir . $this->filename . '.none', $data );
+            file_put_contents($this->cachedir.$this->filename, $phpcode);
+            file_put_contents($this->cachedir.$this->filename.'.none', $data);
         } else {
             // Write code to cache without doing anything else.
-            file_put_contents( $this->cachedir . $this->filename, $data );
+            file_put_contents($this->cachedir.$this->filename, $data);
 
             // save fallback .js or .css file if filter true (to be false by default) but not if snippet or single.
-            if ( self::do_fallback() && strpos( $this->filename, '_snippet_' ) === false && strpos( $this->filename, '_single_' ) === false ) {
-                $_extension     = pathinfo( $this->filename, PATHINFO_EXTENSION );
-                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX . 'fallback.' . $_extension;
-                if ( ! file_exists( $this->cachedir . $_extension . '/' . $_fallback_file ) ) {
-                    file_put_contents( $this->cachedir . $_extension . '/' . $_fallback_file, $data );
+            if (self::do_fallback() && strpos($this->filename, '_snippet_') === false && strpos($this->filename, '_single_') === false) {
+                $_extension     = pathinfo($this->filename, PATHINFO_EXTENSION);
+                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX.'fallback.'.$_extension;
+                if (!file_exists($this->cachedir.$_extension.'/'.$_fallback_file)) {
+                    file_put_contents($this->cachedir.$_extension.'/'.$_fallback_file, $data);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) {
+            if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file.
-                file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) );
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP));
                 // If PHP Brotli extension is installed, create an additional cached Brotli file.
-                if ( function_exists( 'brotli_compress' ) ) {
-                    file_put_contents( $this->cachedir . $this->filename . '.br', brotli_compress( $data, 11, BROTLI_GENERIC ) );
+                if (function_exists('brotli_compress')) {
+                    file_put_contents($this->cachedir.$this->filename.'.br', brotli_compress($data, 11, BROTLI_GENERIC));
                 }
             }
         }
@@ -142,7 +142,7 @@ 
         // The original idea here was to provide 3rd party code a hook so that
         // it can "listen" to all the complete autoptimized-urls that the page
         // will emit... Or something to that effect I think?
-        apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename );
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
 
         return $this->filename;
     }
@@ -155,11 +155,11 @@ 
      * @param string $file Filename.
      * @return bool
      */
-    protected static function is_valid_cache_file( $dir, $file )
+    protected static function is_valid_cache_file($dir, $file)
     {
-        if ( '.' !== $file && '..' !== $file &&
-            false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) &&
-            is_file( $dir . $file ) ) {
+        if ('.' !== $file && '..' !== $file &&
+            false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) &&
+            is_file($dir.$file)) {
 
             // It's a valid file!
             return true;
@@ -177,16 +177,16 @@ 
     protected static function clear_cache_classic()
     {
         $contents = self::get_cache_contents();
-        foreach ( $contents as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    @unlink( $dir . $file ); // @codingStandardsIgnoreLine
+        foreach ($contents as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    @unlink($dir.$file); // @codingStandardsIgnoreLine
                 }
             }
         }
 
-        @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine
+        @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -197,19 +197,19 @@ 
      *
      * @return bool
      */
-    protected static function rmdir( $pathname )
+    protected static function rmdir($pathname)
     {
-        $files = self::get_dir_contents( $pathname );
-        foreach ( $files as $file ) {
-            $path = $pathname . '/' . $file;
-            if ( is_dir( $path ) ) {
-                self::rmdir( $path );
+        $files = self::get_dir_contents($pathname);
+        foreach ($files as $file) {
+            $path = $pathname.'/'.$file;
+            if (is_dir($path)) {
+                self::rmdir($path);
             } else {
-                unlink( $path );
+                unlink($path);
             }
         }
 
-        return rmdir( $pathname );
+        return rmdir($pathname);
     }
 
     /**
@@ -230,12 +230,12 @@ 
         $new_name = self::get_unique_name();
 
         // Makes sure the new pathname is on the same level...
-        $new_pathname = dirname( $dir ) . '/' . $new_name;
-        $renamed      = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine
+        $new_pathname = dirname($dir).'/'.$new_name;
+        $renamed      = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine
 
         // When renamed, re-create the default cache directory back so it's
         // available again...
-        if ( $renamed ) {
+        if ($renamed) {
             $ok = self::cacheavail();
         }
 
@@ -249,7 +249,7 @@ 
      */
     public static function advanced_cache_clear_enabled()
     {
-        return apply_filters( 'autoptimize_filter_cache_clear_advanced', false );
+        return apply_filters('autoptimize_filter_cache_clear_advanced', false);
     }
 
     /**
@@ -260,7 +260,7 @@ 
     protected static function get_unique_name()
     {
         $prefix   = self::get_advanced_cache_clear_prefix();
-        $new_name = uniqid( $prefix, true );
+        $new_name = uniqid($prefix, true);
 
         return $new_name;
     }
@@ -273,8 +273,8 @@ 
     protected static function get_advanced_cache_clear_prefix()
     {
         $pathname = self::get_pathname_base();
-        $basename = basename( $pathname );
-        $prefix   = $basename . '-artifact-';
+        $basename = basename($pathname);
+        $prefix   = $basename.'-artifact-';
 
         return $prefix;
     }
@@ -287,9 +287,9 @@ 
      *
      * @return array
      */
-    protected static function get_dir_contents( $pathname )
+    protected static function get_dir_contents($pathname)
     {
-        return array_slice( scandir( $pathname ), 2 );
+        return array_slice(scandir($pathname), 2);
     }
 
     /**
@@ -302,24 +302,24 @@ 
     public static function delete_advanced_cache_clear_artifacts()
     {
         // Don't go through these motions (called from the cachechecker) if advanced cache clear isn't even active.
-        if ( ! self::advanced_cache_clear_enabled() ) {
+        if (!self::advanced_cache_clear_enabled()) {
             return false;
         }
 
         $dir    = self::get_pathname_base();
         $prefix = self::get_advanced_cache_clear_prefix();
-        $parent = dirname( $dir );
+        $parent = dirname($dir);
         $ok     = false;
 
         // Returns the list of files without '.' and '..' elements.
-        $files = self::get_dir_contents( $parent );
-        if ( is_array( $files ) && ! empty( $files ) ) {
-            foreach ( $files as $file ) {
-                $path     = $parent . '/' . $file;
-                $prefixed = ( false !== strpos( $path, $prefix ) );
+        $files = self::get_dir_contents($parent);
+        if (is_array($files) && !empty($files)) {
+            foreach ($files as $file) {
+                $path     = $parent.'/'.$file;
+                $prefixed = (false !== strpos($path, $prefix));
                 // Removing only our own (prefixed) directories...
-                if ( is_dir( $path ) && $prefixed ) {
-                    $ok = self::rmdir( $path );
+                if (is_dir($path) && $prefixed) {
+                    $ok = self::rmdir($path);
                 }
             }
         }
@@ -339,9 +339,9 @@ 
     {
         $pathname = self::get_pathname_base();
 
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
 
         return $pathname;
@@ -354,7 +354,7 @@ 
      */
     protected static function get_pathname_base()
     {
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
 
         return $pathname;
     }
@@ -366,46 +366,46 @@ 
      *
      * @return bool
      */
-    public static function clearall( $propagate = true )
+    public static function clearall($propagate = true)
     {
-        if ( ! self::cacheavail() ) {
+        if (!self::cacheavail()) {
             return false;
         }
 
         // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically?
-        if ( self::advanced_cache_clear_enabled() ) {
+        if (self::advanced_cache_clear_enabled()) {
             self::clear_cache_via_rename();
         } else {
             self::clear_cache_classic();
         }
 
         // Remove 404 handler if required.
-        if ( self::do_fallback() ) {
-            $_fallback_php = trailingslashit( WP_CONTENT_DIR ) . 'autoptimize_404_handler.php';
-            @unlink( $_fallback_php ); // @codingStandardsIgnoreLine
+        if (self::do_fallback()) {
+            $_fallback_php = trailingslashit(WP_CONTENT_DIR).'autoptimize_404_handler.php';
+            @unlink($_fallback_php); // @codingStandardsIgnoreLine
         }
 
         // Remove the transient so it gets regenerated...
-        delete_transient( 'autoptimize_stats' );
+        delete_transient('autoptimize_stats');
 
         // Cache was just purged, clear page cache and allow others to hook into our purging...
-        if ( true === $propagate ) {
-            if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) {
+        if (true === $propagate) {
+            if (!function_exists('autoptimize_do_cachepurged_action')) {
                 function autoptimize_do_cachepurged_action() {
-                    do_action( 'autoptimize_action_cachepurged' );
+                    do_action('autoptimize_action_cachepurged');
                 }
             }
-            add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 );
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 );
+            add_action('shutdown', 'autoptimize_do_cachepurged_action', 11);
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0);
         }
 
         // Warm cache (part of speedupper)!
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) && false == get_transient( 'autoptimize_cache_warmer_protector' ) ) {
-            set_transient( 'autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60 * 10 );
-            $url   = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 );
-            $url   = apply_filters( 'autoptimize_filter_cache_warmer_url', $url );
-            $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine
-            unset( $cache );
+        if (apply_filters('autoptimize_filter_speedupper', true) && false == get_transient('autoptimize_cache_warmer_protector')) {
+            set_transient('autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60*10);
+            $url   = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000);
+            $url   = apply_filters('autoptimize_filter_cache_warmer_url', $url);
+            $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine
+            unset($cache);
         }
 
         return true;
@@ -420,7 +420,7 @@ 
      */
     public static function clearall_actionless()
     {
-        return self::clearall( false );
+        return self::clearall(false);
     }
 
     /**
@@ -432,8 +432,8 @@ 
     {
         $contents = array();
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir );
+        foreach (array('', 'js', 'css') as $dir) {
+            $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir);
         }
 
         return $contents;
@@ -446,21 +446,21 @@ 
      */
     public static function stats()
     {
-        $stats = get_transient( 'autoptimize_stats' );
+        $stats = get_transient('autoptimize_stats');
 
         // If no transient, do the actual scan!
-        if ( ! is_array( $stats ) ) {
-            if ( ! self::cacheavail() ) {
+        if (!is_array($stats)) {
+            if (!self::cacheavail()) {
                 return 0;
             }
             $stats = self::stats_scan();
             $count = $stats[0];
-            if ( $count > 100 ) {
+            if ($count > 100) {
                 // Store results in transient.
                 set_transient(
                     'autoptimize_stats',
                     $stats,
-                    apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS )
+                    apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS)
                 );
             }
         }
@@ -483,30 +483,30 @@ 
         $size  = 0;
 
         // Scan everything in our cache directories.
-        foreach ( self::get_cache_contents() as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    if ( AUTOPTIMIZE_CACHE_NOGZIP &&
+        foreach (self::get_cache_contents() as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    if (AUTOPTIMIZE_CACHE_NOGZIP &&
                         (
-                            false !== strpos( $file, '.js' ) ||
-                            false !== strpos( $file, '.css' ) ||
-                            false !== strpos( $file, '.img' ) ||
-                            false !== strpos( $file, '.txt' )
+                            false !== strpos($file, '.js') ||
+                            false !== strpos($file, '.css') ||
+                            false !== strpos($file, '.img') ||
+                            false !== strpos($file, '.txt')
                         )
                     ) {
                         // Web server is gzipping, we count .js|.css|.img|.txt files.
                         $count++;
-                    } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) {
+                    } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) {
                         // We are gzipping ourselves via php, counting only .none files.
                         $count++;
                     }
-                    $size += filesize( $dir . $file );
+                    $size += filesize($dir.$file);
                 }
             }
         }
 
-        $stats = array( $count, $size, time() );
+        $stats = array($count, $size, time());
 
         return $stats;
     }
@@ -520,22 +520,22 @@ 
      */
     public static function cacheavail()
     {
-        if ( false === autoptimizeCache::check_and_create_dirs() ) {
+        if (false === autoptimizeCache::check_and_create_dirs()) {
             return false;
         }
 
         // Using .htaccess inside our cache folder to overrule wp-super-cache.
-        $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess';
-        if ( ! is_file( $htaccess ) ) {
+        $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htaccess)) {
             /**
              * Create `wp-content/AO_htaccess_tmpl` file with
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl';
-            if ( is_file( $htaccess_tmpl ) ) {
-                $content = file_get_contents( $htaccess_tmpl );
-            } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) {
+            $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl';
+            if (is_file($htaccess_tmpl)) {
+                $content = file_get_contents($htaccess_tmpl);
+            } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) {
                 $content = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
@@ -589,13 +589,13 @@ 
 </IfModule>';
             }
 
-            if ( self::do_fallback() ) {
-                $content .= "\nErrorDocument 404 " . trailingslashit( parse_url( content_url(), PHP_URL_PATH ) ) . 'autoptimize_404_handler.php';
+            if (self::do_fallback()) {
+                $content .= "\nErrorDocument 404 ".trailingslashit(parse_url(content_url(), PHP_URL_PATH)).'autoptimize_404_handler.php';
             }
-            @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine
+            @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine
         }
 
-        if ( self::do_fallback() ) {
+        if (self::do_fallback()) {
             self::check_fallback_php();
         }
 
@@ -610,17 +610,17 @@ 
      */
     public static function check_fallback_php() {
         $_fallback_filename = 'autoptimize_404_handler.php';
-        $_fallback_php      = trailingslashit( WP_CONTENT_DIR ) . $_fallback_filename;
+        $_fallback_php      = trailingslashit(WP_CONTENT_DIR).$_fallback_filename;
         $_fallback_status   = true;
 
-        if ( ! file_exists( $_fallback_php ) ) {
-            $_fallback_php_contents = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $_fallback_filename );
-            $_fallback_php_contents = str_replace( '<?php exit;', '<?php', $_fallback_php_contents );
-            $_fallback_php_contents = str_replace( '<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents );
-            if ( apply_filters( 'autoptimize_filter_cache_fallback_log_errors', false ) ) {
-                $_fallback_php_contents = str_replace( '// error_log', 'error_log', $_fallback_php_contents );
+        if (!file_exists($_fallback_php)) {
+            $_fallback_php_contents = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$_fallback_filename);
+            $_fallback_php_contents = str_replace('<?php exit;', '<?php', $_fallback_php_contents);
+            $_fallback_php_contents = str_replace('<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents);
+            if (apply_filters('autoptimize_filter_cache_fallback_log_errors', false)) {
+                $_fallback_php_contents = str_replace('// error_log', 'error_log', $_fallback_php_contents);
             }
-            $_fallback_status = file_put_contents( $_fallback_php, $_fallback_php_contents );
+            $_fallback_status = file_put_contents($_fallback_php, $_fallback_php_contents);
         }
 
         return $_fallback_status;
@@ -633,7 +633,7 @@ 
      * Return bool
      */
     public static function do_fallback() {
-        return apply_filters( 'autoptimize_filter_cache_do_fallback', false );
+        return apply_filters('autoptimize_filter_cache_do_fallback', false);
     }
 
     /**
@@ -643,13 +643,13 @@ 
      * @return bool
      */
     public static function check_and_create_dirs() {
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache.
             return false;
         }
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) {
+        foreach (array('', 'js', 'css') as $dir) {
+            if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) {
                 return false;
             }
         }
@@ -664,25 +664,25 @@ 
      *
      * @return bool
      */
-    protected static function check_cache_dir( $dir )
+    protected static function check_cache_dir($dir)
     {
         // Try creating the dir if it doesn't exist.
-        if ( ! file_exists( $dir ) ) {
-            @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine
-            if ( ! file_exists( $dir ) ) {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // If we still cannot write, bail.
-        if ( ! is_writable( $dir ) ) {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // Create an index.html in there to avoid prying eyes!
-        $idx_file = rtrim( $dir, '/\\' ) . '/index.html';
-        if ( ! is_file( $idx_file ) ) {
-            @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine
+        $idx_file = rtrim($dir, '/\\').'/index.html';
+        if (!is_file($idx_file)) {
+            @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine
         }
 
         return true;
@@ -696,50 +696,50 @@ 
     // @codingStandardsIgnoreStart
     public static function flushPageCache()
     {
-        if ( function_exists( 'wp_cache_clear_cache' ) ) {
-            if ( is_multisite() ) {
+        if (function_exists('wp_cache_clear_cache')) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                wp_cache_clear_cache( $blog_id );
+                wp_cache_clear_cache($blog_id);
             } else {
                 wp_cache_clear_cache();
             }
-        } elseif ( has_action( 'cachify_flush_cache' ) ) {
-            do_action( 'cachify_flush_cache' );
-        } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) {
+        } elseif (has_action('cachify_flush_cache')) {
+            do_action('cachify_flush_cache');
+        } elseif (function_exists('w3tc_pgcache_flush')) {
             w3tc_pgcache_flush();
-        } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) {
+        } elseif (function_exists('wp_fast_cache_bulk_delete_all')) {
             wp_fast_cache_bulk_delete_all();
-        } elseif ( class_exists( 'WpFastestCache' ) ) {
+        } elseif (class_exists('WpFastestCache')) {
             $wpfc = new WpFastestCache();
             $wpfc->deleteCache();
-        } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) {
+        } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) {
             c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache
-        } elseif ( class_exists( 'zencache' ) ) {
+        } elseif (class_exists('zencache')) {
             zencache::clear();
-        } elseif ( class_exists( 'comet_cache' ) ) {
+        } elseif (class_exists('comet_cache')) {
             comet_cache::clear();
-        } elseif ( class_exists( 'WpeCommon' ) ) {
+        } elseif (class_exists('WpeCommon')) {
             // WPEngine cache purge/flush methods to call by default
             $wpe_methods = array(
                 'purge_varnish_cache',
             );
 
             // More agressive clear/flush/purge behind a filter
-            if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) {
-                $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) );
+            if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+                $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache'));
             }
 
             // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing)
-            $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods );
+            $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods);
 
-            foreach ( $wpe_methods as $wpe_method ) {
-                if ( method_exists( 'WpeCommon', $wpe_method ) ) {
+            foreach ($wpe_methods as $wpe_method) {
+                if (method_exists('WpeCommon', $wpe_method)) {
                     WpeCommon::$wpe_method();
                 }
             }
-        } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) {
+        } elseif (function_exists('sg_cachepress_purge_cache')) {
             sg_cachepress_purge_cache();
-        } elseif ( array_key_exists( 'KINSTA_CACHE_ZONE', $_SERVER ) ) {
+        } elseif (array_key_exists('KINSTA_CACHE_ZONE', $_SERVER)) {
             $_kinsta_clear_cache_url = 'https://localhost/kinsta-clear-cache-all';
             $_kinsta_response        = wp_remote_get(
                 $_kinsta_clear_cache_url,
@@ -748,18 +748,18 @@ 
                     'timeout' => 5,
                     )
             );
-        } elseif ( defined('NGINX_HELPER_BASENAME') ) {
-            do_action( 'rt_nginx_helper_purge_all' );
-        } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) {
+        } elseif (defined('NGINX_HELPER_BASENAME')) {
+            do_action('rt_nginx_helper_purge_all');
+        } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
             // fallback for WP-Super-Cache
             global $cache_path;
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                prune_super_cache( get_supercache_dir( $blog_id ), true );
-                prune_super_cache( $cache_path . 'blogs/', true );
+                prune_super_cache(get_supercache_dir($blog_id), true);
+                prune_super_cache($cache_path.'blogs/', true);
             } else {
-                prune_super_cache( $cache_path . 'supercache/', true );
-                prune_super_cache( $cache_path, true );
+                prune_super_cache($cache_path.'supercache/', true);
+                prune_super_cache($cache_path, true);
             }
         }
     }

classes/autoptimizeScripts.php

Doc Comments +9 added lines, -1 removed lines

@@ -418,6 +418,10 @@ 
     }
 
     // Checks against the white- and blacklists
+
+    /**
+     * @param string $tag
+     */
     private function ismergeable($tag)
     {
         if ( ! $this->aggregate ) {
@@ -457,6 +461,10 @@ 
     }
 
     // Checks agains the blacklist
+
+    /**
+     * @param string $tag
+     */
     private function ismovable($tag)
     {
         if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
@@ -538,7 +546,7 @@ 
      * @param string $filepath Filepath.
      * @param bool $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified js file or false.
+     * @return false|string Url pointing to the minified js file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {

Spacing +158 added lines, -158 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,18 +13,18 @@ 
     );
 
     private $dontmove = array(
-        'document.write','html5.js','show_ads.js','google_ad','histats.com/js','statcounter.com/counter/counter.js',
-        'ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar',
-        'intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject',
-        'plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'
+        'document.write', 'html5.js', 'show_ads.js', 'google_ad', 'histats.com/js', 'statcounter.com/counter/counter.js',
+        'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar',
+        'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject',
+        'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'
         ,'logHuman'
     );
     private $domove     = array(
-        'gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'
+        'gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'
     );
     private $domovelast = array(
-        'addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/',
-        'jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'
+        'addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/',
+        'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'
     );
     public $cdn_url = '';
 
@@ -43,92 +43,92 @@ 
     private $minify_excluded = true;
 
     // Reads the page and collects script tags.
-    public function read( $options )
+    public function read($options)
     {
-        $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
-        if ( $noptimizeJS ) {
+        $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
+        if ($noptimizeJS) {
             return false;
         }
 
         // only optimize known good JS?
-        $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
-        if ( ! empty( $whitelistJS ) ) {
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistJS ) ) );
+        $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content);
+        if (!empty($whitelistJS)) {
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistJS)));
         }
 
         // is there JS we should simply remove?
-        $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
-        if ( !empty( $removableJS ) ) {
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removableJS ) ) );
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content);
+        if (!empty($removableJS)) {
+            $this->jsremovables = array_filter(array_map('trim', explode(',', $removableJS)));
         }
 
         // only header?
-        if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_js_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing JS-files aggregation or not.
-        if ( ! $options['aggregate'] ) {
+        if (!$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_js_dontaggregate', false)) {
             $this->aggregate = false;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline'])) {
             $this->include_inline = true;
         }
 
         // filter to "late inject minified JS", default to true for now (it is faster).
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_js_inject_min_late', true );
+        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true);
 
         // filters to override hardcoded do(nt)move(last) array contents (array in, array out!).
-        $this->dontmove   = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove );
-        $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast );
-        $this->domove     = apply_filters( 'autoptimize_filter_js_domove', $this->domove );
+        $this->dontmove   = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove);
+        $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast);
+        $this->domove     = apply_filters('autoptimize_filter_js_domove', $this->domove);
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_js_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_js_minify_excluded', $this->minify_excluded, '');
 
         // get extra exclusions settings or filter.
         $excludeJS = $options['js_exclude'];
-        $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content );
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content);
 
-        if ( '' !== $excludeJS ) {
-            if ( is_array( $excludeJS ) ) {
-                if ( ( $removeKeys = array_keys( $excludeJS, 'remove' ) ) !== false ) {
-                    foreach ( $removeKeys as $removeKey ) {
-                        unset( $excludeJS[$removeKey] );
+        if ('' !== $excludeJS) {
+            if (is_array($excludeJS)) {
+                if (($removeKeys = array_keys($excludeJS, 'remove')) !== false) {
+                    foreach ($removeKeys as $removeKey) {
+                        unset($excludeJS[$removeKey]);
                         $this->jsremovables[] = $removeKey;
                     }
                 }
-                $exclJSArr = array_keys( $excludeJS );
+                $exclJSArr = array_keys($excludeJS);
             } else {
-                $exclJSArr = array_filter( array_map( 'trim', explode( ',', $excludeJS ) ) );
+                $exclJSArr = array_filter(array_map('trim', explode(',', $excludeJS)));
             }
-            $this->dontmove = array_merge( $exclJSArr, $this->dontmove );
+            $this->dontmove = array_merge($exclJSArr, $this->dontmove);
         }
 
         // Should we add try-catch?
-        if ( $options['trycatch'] ) {
+        if ($options['trycatch']) {
             $this->trycatch = true;
         }
 
         // force js in head?
-        if ( $options['forcehead'] ) {
+        if ($options['forcehead']) {
             $this->forcehead = true;
         } else {
             $this->forcehead = false;
         }
 
-        $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead );
+        $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead);
 
         // get cdn url.
         $this->cdn_url = $options['cdn_url'];
@@ -143,26 +143,26 @@ 
         $this->content = $this->hide_comments($this->content);
 
         // Get script files.
-        if ( preg_match_all( '#<script.*</script>#Usmi', $this->content, $matches ) ) {
-            foreach( $matches[0] as $tag ) {
+        if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
                 // only consider script aggregation for types whitelisted in should_aggregate-function.
                 $should_aggregate = $this->should_aggregate($tag);
-                if ( ! $should_aggregate ) {
+                if (!$should_aggregate) {
                     $tag = '';
                     continue;
                 }
 
-                if ( preg_match( '#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source ) ) {
+                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) {
                     // non-inline script.
-                    if ( $this->isremovable($tag, $this->jsremovables) ) {
-                        $this->content = str_replace( $tag, '', $this->content );
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
 
                     $origTag = null;
-                    $url = current( explode( '?', $source[2], 2 ) );
+                    $url = current(explode('?', $source[2], 2));
                     $path = $this->getpath($url);
-                    if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable($tag) ) {
+                    if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array.
                         $this->scripts[] = $path;
                     } else {
@@ -170,11 +170,11 @@ 
                         $newTag  = $tag;
 
                         // non-mergeable script (excluded or dynamic or external).
-                        if ( is_array( $excludeJS ) ) {
+                        if (is_array($excludeJS)) {
                             // should we add flags?
-                            foreach ( $excludeJS as $exclTag => $exclFlags) {
-                                if ( false !== strpos( $origTag, $exclTag ) && in_array( $exclFlags, array( 'async', 'defer' ) ) ) {
-                                    $newTag = str_replace( '<script ', '<script ' . $exclFlags . ' ', $newTag );
+                            foreach ($excludeJS as $exclTag => $exclFlags) {
+                                if (false !== strpos($origTag, $exclTag) && in_array($exclFlags, array('async', 'defer'))) {
+                                    $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag);
                                 }
                             }
                         }
@@ -182,28 +182,28 @@ 
                         // Should we minify the non-aggregated script?
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $minified_url = $this->minify_single($path);
                                 // replace orig URL with minified URL from cache if so.
-                                if ( ! empty( $minified_url ) ) {
-                                    $newTag = str_replace( $url, $minified_url, $newTag );
+                                if (!empty($minified_url)) {
+                                    $newTag = str_replace($url, $minified_url, $newTag);
                                 }
                             }
                         }
 
-                        if ( $this->ismovable($newTag) ) {
+                        if ($this->ismovable($newTag)) {
                             // can be moved, flags and all.
-                            if ( $this->movetolast($newTag) )  {
+                            if ($this->movetolast($newTag)) {
                                 $this->move['last'][] = $newTag;
                             } else {
                                 $this->move['first'][] = $newTag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately.
-                            if ( $origTag !== $newTag ) {
-                                $this->content = str_replace( $origTag, $newTag, $this->content );
+                            if ($origTag !== $newTag) {
+                                $this->content = str_replace($origTag, $newTag, $this->content);
                                 $origTag = '';
                             }
                             // and forget about the $tag (not to be touched any more).
@@ -212,23 +212,23 @@ 
                     }
                 } else {
                     // Inline script.
-                    if ( $this->isremovable($tag, $this->jsremovables) ) {
-                        $this->content = str_replace( $tag, '', $this->content );
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
 
                     // unhide comments, as javascript may be wrapped in comment-tags for old times' sake.
                     $tag = $this->restore_comments($tag);
-                    if ( $this->ismergeable($tag) && $this->include_inline ) {
-                        preg_match( '#<script.*>(.*)</script>#Usmi', $tag , $code );
-                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] );
-                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code );
-                        $this->scripts[] = 'INLINE;' . $code;
+                    if ($this->ismergeable($tag) && $this->include_inline) {
+                        preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code);
+                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]);
+                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code);
+                        $this->scripts[] = 'INLINE;'.$code;
                     } else {
                         // Can we move this?
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag );
-                        if ( $this->ismovable($tag) || '' !== $autoptimize_js_moveable ) {
-                            if ( $this->movetolast($tag) || 'last' === $autoptimize_js_moveable ) {
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
+                        if ($this->ismovable($tag) || '' !== $autoptimize_js_moveable) {
+                            if ($this->movetolast($tag) || 'last' === $autoptimize_js_moveable) {
                                 $this->move['last'][] = $tag;
                             } else {
                                 $this->move['first'][] = $tag;
@@ -243,7 +243,7 @@ 
                 }
 
                 //Remove the original script tag.
-                $this->content = str_replace( $tag, '', $this->content );
+                $this->content = str_replace($tag, '', $this->content);
             }
 
             return true;
@@ -273,21 +273,21 @@ 
         // We're only interested in the type attribute of the <script> tag itself, not any possible
         // inline code that might just contain the 'type=' string...
         $tag_parts = array();
-        preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts);
+        preg_match('#<(script[^>]*)>#i', $tag, $tag_parts);
         $tag_without_contents = null;
-        if ( ! empty( $tag_parts[1] ) ) {
+        if (!empty($tag_parts[1])) {
             $tag_without_contents = $tag_parts[1];
         }
 
-        $has_type = ( strpos( $tag_without_contents, 'type' ) !== false );
+        $has_type = (strpos($tag_without_contents, 'type') !== false);
 
         $type_valid = false;
-        if ( $has_type ) {
-            $type_valid = (bool) preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents );
+        if ($has_type) {
+            $type_valid = (bool) preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents);
         }
 
         $should_aggregate = false;
-        if ( ! $has_type || $type_valid ) {
+        if (!$has_type || $type_valid) {
             $should_aggregate = true;
         }
 
@@ -297,40 +297,40 @@ 
     //Joins and optimizes JS
     public function minify()
     {
-        foreach ( $this->scripts as $script ) {
+        foreach ($this->scripts as $script) {
             // TODO/FIXME: some duplicate code here, can be reduced/simplified
-            if ( preg_match( '#^INLINE;#', $script ) ) {
+            if (preg_match('#^INLINE;#', $script)) {
                 // Inline script
-                $script = preg_replace( '#^INLINE;#', '', $script );
-                $script = rtrim( $script, ";\n\t\r" ) . ';';
+                $script = preg_replace('#^INLINE;#', '', $script);
+                $script = rtrim($script, ";\n\t\r").';';
                 // Add try-catch?
-                if ( $this->trycatch ) {
-                    $script = 'try{' . $script . '}catch(e){}';
+                if ($this->trycatch) {
+                    $script = 'try{'.$script.'}catch(e){}';
                 }
-                $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' );
-                if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscript ) ) {
+                $tmpscript = apply_filters('autoptimize_js_individual_script', $script, '');
+                if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) {
                     $script = $tmpscript;
                     $this->alreadyminified = true;
                 }
-                $this->jscode .= "\n" . $script;
+                $this->jscode .= "\n".$script;
             } else {
                 // External script
-                if ( false !== $script && file_exists( $script ) && is_readable( $script ) ) {
-                    $scriptsrc = file_get_contents( $script );
-                    $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc );
-                    $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';';
+                if (false !== $script && file_exists($script) && is_readable($script)) {
+                    $scriptsrc = file_get_contents($script);
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
                     // Add try-catch?
-                    if ( $this->trycatch ) {
-                        $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}';
+                    if ($this->trycatch) {
+                        $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}';
                     }
-                    $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script );
-                    if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscriptsrc ) ) {
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
                         $scriptsrc = $tmpscriptsrc;
                         $this->alreadyminified = true;
-                    } else if ( $this->can_inject_late($script) ) {
+                    } else if ($this->can_inject_late($script)) {
                         $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc));
                     }
-                    $this->jscode .= "\n" . $scriptsrc;
+                    $this->jscode .= "\n".$scriptsrc;
                 }/*else{
                     //Couldn't read JS. Maybe getpath isn't working?
                 }*/
@@ -338,32 +338,32 @@ 
         }
 
         // Check for already-minified code
-        $this->md5hash = md5( $this->jscode );
+        $this->md5hash = md5($this->jscode);
         $ccheck = new autoptimizeCache($this->md5hash, 'js');
-        if ( $ccheck->check() ) {
+        if ($ccheck->check()) {
             $this->jscode = $ccheck->retrieve();
             return true;
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         // $this->jscode has all the uncompressed code now.
-        if ( true !== $this->alreadyminified ) {
-            if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
-                $tmp_jscode = trim( JSMin::minify( $this->jscode ) );
-                if ( ! empty( $tmp_jscode ) ) {
+        if (true !== $this->alreadyminified) {
+            if (apply_filters('autoptimize_js_do_minify', true)) {
+                $tmp_jscode = trim(JSMin::minify($this->jscode));
+                if (!empty($tmp_jscode)) {
                     $this->jscode = $tmp_jscode;
-                    unset( $tmp_jscode );
+                    unset($tmp_jscode);
                 }
-                $this->jscode = $this->inject_minified( $this->jscode );
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
                 return true;
             } else {
-                $this->jscode = $this->inject_minified( $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
                 return false;
             }
         }
 
-        $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+        $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
         return true;
     }
 
@@ -371,11 +371,11 @@ 
     public function cache()
     {
         $cache = new autoptimizeCache($this->md5hash, 'js');
-        if ( ! $cache->check() ) {
+        if (!$cache->check()) {
             // Cache our code
             $cache->cache($this->jscode, 'text/javascript');
         }
-        $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+        $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         $this->url = $this->url_replace_cdn($this->url);
     }
 
@@ -383,47 +383,47 @@ 
     public function getcontent()
     {
         // Restore the full content
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // Add the scripts taking forcehead/ deferred (default) into account
-        if ( $this->forcehead ) {
-            $replaceTag = array( '</head>', 'before' );
+        if ($this->forcehead) {
+            $replaceTag = array('</head>', 'before');
             $defer = '';
         } else {
-            $replaceTag = array( '</body>', 'before' );
+            $replaceTag = array('</body>', 'before');
             $defer = 'defer ';
         }
 
-        $defer   = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer   = apply_filters('autoptimize_filter_js_defer', $defer);
         $type_js = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_js = 'type="text/javascript" ';
         }
 
-        $bodyreplacementpayload = '<script ' . $type_js . $defer . 'src="' . $this->url . '"></script>';
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
+        $bodyreplacementpayload = '<script '.$type_js.$defer.'src="'.$this->url.'"></script>';
+        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload);
 
-        $bodyreplacement = implode( '', $this->move['first'] );
+        $bodyreplacement = implode('', $this->move['first']);
         $bodyreplacement .= $bodyreplacementpayload;
-        $bodyreplacement .= implode( '', $this->move['last'] );
+        $bodyreplacement .= implode('', $this->move['last']);
 
-        $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag );
+        $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag);
 
-        if ( strlen( $this->jscode ) > 0 ) {
-            $this->inject_in_html( $bodyreplacement, $replaceTag );
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replaceTag);
         }
 
         // Restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // Restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Return the modified HTML.
         return $this->content;
@@ -432,32 +432,32 @@ 
     // Checks against the white- and blacklists
     private function ismergeable($tag)
     {
-        if ( ! $this->aggregate ) {
+        if (!$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->whitelist ) ) {
-            foreach ( $this->whitelist as $match ) {
-                if (false !== strpos( $tag, $match ) ) {
+        if (!empty($this->whitelist)) {
+            foreach ($this->whitelist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // no match with whitelist
             return false;
         } else {
-            foreach($this->domove as $match) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->domove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something
                     return false;
                 }
             }
 
-            if ( $this->movetolast($tag) ) {
+            if ($this->movetolast($tag)) {
                 return false;
             }
 
-            foreach( $this->dontmove as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->dontmove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something
                     return false;
                 }
@@ -471,23 +471,23 @@ 
     // Checks agains the blacklist
     private function ismovable($tag)
     {
-        if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
+        if (true !== $this->include_inline || apply_filters('autoptimize_filter_js_unmovable', true)) {
             return false;
         }
 
-        foreach ( $this->domove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something
                 return true;
             }
         }
 
-        if ( $this->movetolast($tag) ) {
+        if ($this->movetolast($tag)) {
             return true;
         }
 
-        foreach ( $this->dontmove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->dontmove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something
                 return false;
             }
@@ -499,8 +499,8 @@ 
 
     private function movetolast($tag)
     {
-        foreach ( $this->domovelast as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domovelast as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched, return true
                 return true;
             }
@@ -521,11 +521,11 @@ 
      * @return bool
      */
     private function can_inject_late($jsPath) {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-        if ( true !== $this->inject_min_late ) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off
             return false;
-        } else if ( ( false === strpos( $jsPath, 'min.js' ) ) && ( false === strpos( $jsPath, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $jsPath ) === $jsPath ) ) {
+        } else if ((false === strpos($jsPath, 'min.js')) && (false === strpos($jsPath, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) {
             // file not minified based on filename & filter
             return false;
         } else {
@@ -552,26 +552,26 @@ 
      *
      * @return bool|string Url pointing to the minified js file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'js' );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'js');
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
-            $contents = trim( JSMin::minify( $contents ) );
+        if (!$cache->check() || $cache_miss) {
+            $contents = trim(JSMin::minify($contents));
             // Store in cache.
-            $cache->cache( $contents, 'text/javascript' );
+            $cache->cache($contents, 'text/javascript');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         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/external/php/minify-html.php

Spacing +6 added lines, -6 removed lines

@@ -70,7 +70,7 @@ 
     {
         $this->_html = str_replace("\r\n", "\n", trim($html));
         if (isset($options['xhtml'])) {
-            $this->_isXhtml = (bool)$options['xhtml'];
+            $this->_isXhtml = (bool) $options['xhtml'];
         }
         if (isset($options['cssMinifier'])) {
             $this->_cssMinifier = $options['cssMinifier'];
@@ -95,7 +95,7 @@ 
             $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
         }
 
-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
+        $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']);
         $this->_placeholders = array();
 
         // replace SCRIPTs (and minify) with placeholders
@@ -111,7 +111,7 @@ 
             ,$this->_html);
 
         // remove HTML comments (not containing IE conditional comments).
-        if  ($this->_keepComments == false) {
+        if ($this->_keepComments == false) {
             $this->_html = preg_replace_callback(
                 '/<!--([\\s\\S]*?)-->/'
                 ,array($this, '_commentCB')
@@ -173,7 +173,7 @@ 
 
     protected function _reservePlace($content)
     {
-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
+        $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';
         $this->_placeholders[$placeholder] = $content;
         return $placeholder;
     }
@@ -187,7 +187,7 @@ 
 
     protected function _outsideTagCB($m)
     {
-        return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<';
+        return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<';
     }
 
     protected function _removePreCB($m)
@@ -259,7 +259,7 @@ 
     protected function _removeCdata($str)
     {
         return (false !== strpos($str, '<![CDATA['))
-            ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str)
+            ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str)
             : $str;
     }
 

classes/autoptimizeHTML.php

Spacing +27 added lines, -27 removed lines

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

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