futtta / autoptimize

classes/autoptimizeScripts.php

Doc Comments +5 added lines, -1 removed lines

@@ -414,6 +414,10 @@ 
     }
 
     // Checks against the white- and blacklists
+
+    /**
+     * @param string $tag
+     */
     private function ismergeable($tag)
     {
         if ( ! $this->aggregate ) {
@@ -534,7 +538,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 +152 added lines, -152 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'
     );
 
     private $aggregate       = true;
@@ -43,84 +43,84 @@ 
     // Reads the page and collects script tags
     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 );
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content);
         if (!empty($removableJS)) {
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $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);
 
         // 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'];
@@ -135,26 +135,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 {
@@ -162,35 +162,35 @@ 
                         $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);
                                 }
                             }
                         }
 
                         // Should we minify the non-aggregated script?
-                        if ( $path && apply_filters( 'autoptimize_filter_js_minify_excluded', true, $url ) ) {
-                            $minified_url = $this->minify_single( $path );
+                        if ($path && apply_filters('autoptimize_filter_js_minify_excluded', true, $url)) {
+                            $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)
@@ -199,24 +199,24 @@ 
                     }
                 } 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?
-                        $changedTag = apply_filters( 'autoptimize_inline_js_tag', $tag );
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $changedTag );
-                        if ( $this->ismovable($changedTag) || '' !== $autoptimize_js_moveable ) {
-                            if ( $this->movetolast($changedTag) || 'last' === $autoptimize_js_moveable ) {
+                        $changedTag = apply_filters('autoptimize_inline_js_tag', $tag);
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $changedTag);
+                        if ($this->ismovable($changedTag) || '' !== $autoptimize_js_moveable) {
+                            if ($this->movetolast($changedTag) || 'last' === $autoptimize_js_moveable) {
                                 $this->move['last'][] = $changedTag;
                             } else {
                                 $this->move['first'][] = $changedTag;
@@ -231,7 +231,7 @@ 
                 }
 
                 //Remove the original script tag
-                $this->content = str_replace( $tag, '', $this->content );
+                $this->content = str_replace($tag, '', $this->content);
             }
 
             return true;
@@ -261,21 +261,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;
         }
 
@@ -285,40 +285,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?
                 }*/
@@ -326,32 +326,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;
     }
 
@@ -359,11 +359,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);
     }
 
@@ -371,43 +371,43 @@ 
     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);
 
-        $bodyreplacementpayload = '<script type="text/javascript" ' . $defer . 'src="' . $this->url . '"></script>';
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
+        $bodyreplacementpayload = '<script type="text/javascript" '.$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;
@@ -416,32 +416,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;
                 }
@@ -455,23 +455,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;
             }
@@ -483,8 +483,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;
             }
@@ -505,11 +505,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 {
@@ -536,26 +536,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;
     }