Inspection of "Fix for quotes bug introduced in #106" - futtta/autoptimize - Measure and Improve Code Quality continuously with Scrutinizer

Completed
Pull Request — master (#107)

unknown
created 2017-07-25 20:26 UTC
Status

Spacing +188 added lines, -188 removed lines patch added patch discarded remove patch

@@ -1,5 +1,5 @@  discard block
 block discarded – undo
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeStyles extends autoptimizeBase {
 
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
 
     //Reads the page and collects style tags
     public function read($options) {
-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
         if ($noptimizeCSS) return false;
 
-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );
+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
         if (!empty($whitelistCSS)) {
-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
         }
         
         if ($options['nogooglefont'] == true) {
@@ -36,54 +36,54 @@  discard block
 block discarded – undo
         } else {
             $removableCSS = "";
         }
-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS);
+        $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
         if (!empty($removableCSS)) {
-            $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
+            $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
         }
 
-        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
 
         // filter to "late inject minified CSS", default to true for now (it is faster)
-        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
 
         // Remove everything that's not the header
-        if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
-            $content = explode('</head>',$this->content,2);
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
+            $content = explode('</head>', $this->content, 2);
             $this->content = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // include inline?
-        if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
             $this->include_inline = true;
         }
         
         // what CSS shouldn't be autoptimized
         $excludeCSS = $options['css_exclude'];
-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content );
-        if ($excludeCSS!=="") {
-            $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);
+        if ($excludeCSS !== "") {
+            $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
         } else {
             $this->dontmove = array();
         }
         
         // forcefully exclude CSS with data-noptimize attrib
-        $this->dontmove[]="data-noptimize";
+        $this->dontmove[] = "data-noptimize";
 
         // should we defer css?
         // value: true/ false
         $this->defer = $options['defer'];
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
 
         // should we inline while deferring?
         // value: inlined CSS
         $this->defer_inline = $options['defer_inline'];
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);
 
         // should we inline?
         // value: true/ false
         $this->inline = $options['inline'];
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
         
         // get cdn url
         $this->cdn_url = $options['cdn_url'];
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
         $this->content = $this->hide_noptimize($this->content);
         
         // exclude (no)script, as those may contain CSS which should be left as is
-        if ( strpos( $this->content, '<script' ) !== false ) { 
+        if (strpos($this->content, '<script') !== false) { 
             $this->content = preg_replace_callback(
                 '#<(?:no)?script.*?<\/(?:no)?script>#is',
                 create_function(
@@ -113,65 +113,65 @@  discard block
 block discarded – undo
         $this->content = $this->hide_comments($this->content);
         
         // Get <style> and <link>
-        if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
-            foreach($matches[0] as $tag) {
-                if ($this->isremovable($tag,$this->cssremovables)) {
-                    $this->content = str_replace($tag,'',$this->content);
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
+                if ($this->isremovable($tag, $this->cssremovables)) {
+                    $this->content = str_replace($tag, '', $this->content);
                 } else if ($this->ismovable($tag)) {
                     // Get the media
-                    if(strpos($tag,'media=')!==false) {
-                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
-                        $medias = explode(',',$medias[1]);
+                    if (strpos($tag, 'media=') !== false) {
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
+                        $medias = explode(',', $medias[1]);
                         $media = array();
-                        foreach($medias as $elem) {
-                            if (empty($elem)) { $elem="all"; }
+                        foreach ($medias as $elem) {
+                            if (empty($elem)) { $elem = "all"; }
                             $media[] = $elem;
                         }
                     } else {
                         // No media specified - applies to all
                         $media = array('all');
                     }
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag );
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
                 
-                    if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
                         // <link>
-                        $explUrl = explode('?',$source[2],2);
+                        $explUrl = explode('?', $source[2], 2);
                         $url = $explUrl[0];
                         $path = $this->getpath($url);
                         
-                        if($path!==false && preg_match('#\.css$#',$path)) {
+                        if ($path !== false && preg_match('#\.css$#', $path)) {
                             // Good link
-                            $this->css[] = array($media,$path);
-                        }else{
+                            $this->css[] = array($media, $path);
+                        } else {
                             // Link is dynamic (.php etc)
                             $tag = '';
                         }
                     } else {
                         // inline css in style tags can be wrapped in comment tags, so restore comments
                         $tag = $this->restore_comments($tag);
-                        preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
 
                         // and re-hide them to be able to to the removal based on tag
                         $tag = $this->hide_comments($tag);
 
-                        if ( $this->include_inline ) {
-                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
-                            $this->css[] = array($media,'INLINE;'.$code);
+                        if ($this->include_inline) {
+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
+                            $this->css[] = array($media, 'INLINE;'.$code);
                         } else {
                             $tag = '';
                         }
                     }
                     
                     // Remove the original style tag
-                    $this->content = str_replace($tag,'',$this->content);
+                    $this->content = str_replace($tag, '', $this->content);
                 } else {
 					// excluded CSS, minify if getpath 
-					if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
-						$explUrl = explode('?',$source[2],2);
+					if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
+						$explUrl = explode('?', $source[2], 2);
                         $url = $explUrl[0];
                         $path = $this->getpath($url);
  					
-						if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
+						if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
 							$_CachedMinifiedUrl = $this->minify_single($path);
 
 							if (!empty($_CachedMinifiedUrl)) {
@@ -182,12 +182,12 @@  discard block
 block discarded – undo
 							}
 							
 							// remove querystring from URL
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
+							if (!empty($explUrl[1])) {
+								$newTag = str_replace("?".$explUrl[1], "", $newTag);
 							}
 
 							// and replace
-							$this->content = str_replace($tag,$newTag,$this->content);
+							$this->content = str_replace($tag, $newTag, $this->content);
 						}
 					}					
 				}
@@ -200,31 +200,31 @@  discard block
 block discarded – undo
     
     // Joins and optimizes CSS
     public function minify() {
-        foreach($this->css as $group) {
-            list($media,$css) = $group;
-            if(preg_match('#^INLINE;#',$css)) {
+        foreach ($this->css as $group) {
+            list($media, $css) = $group;
+            if (preg_match('#^INLINE;#', $css)) {
                 // <style>
-                $css = preg_replace('#^INLINE;#','',$css);
-                $css = $this->fixurls(ABSPATH.'/index.php',$css);
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" );
-                if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
-                    $css=$tmpstyle;
-                    $this->alreadyminified=true;
+                $css = preg_replace('#^INLINE;#', '', $css);
+                $css = $this->fixurls(ABSPATH.'/index.php', $css);
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
+                    $css = $tmpstyle;
+                    $this->alreadyminified = true;
                 }
             } else {
                 //<link>
-                if($css !== false && file_exists($css) && is_readable($css)) {
+                if ($css !== false && file_exists($css) && is_readable($css)) {
                     $cssPath = $css;
                     $cssContents = file_get_contents($cssPath);
                     $cssHash = md5($cssContents);
-                    $css = $this->fixurls($cssPath,$cssContents);
-                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );
+                    $css = $this->fixurls($cssPath, $cssContents);
+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
                     if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
-                        $css=$tmpstyle;
-                        $this->alreadyminified=true;
-                    } else if ($this->can_inject_late($cssPath,$css)) {
-                        $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/";
+                        $css = $tmpstyle;
+                        $this->alreadyminified = true;
+                    } else if ($this->can_inject_late($cssPath, $css)) {
+                        $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/";
                     }
                 } else {
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -232,8 +232,8 @@  discard block
 block discarded – undo
                 }
             }
             
-            foreach($media as $elem) {
-                if(!isset($this->csscode[$elem]))
+            foreach ($media as $elem) {
+                if (!isset($this->csscode[$elem]))
                     $this->csscode[$elem] = '';
                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
             }
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
         // Check for duplicate code
         $md5list = array();
         $tmpcss = $this->csscode;
-        foreach($tmpcss as $media => $code) {
+        foreach ($tmpcss as $media => $code) {
             $md5sum = md5($code);
             $medianame = $media;
-            foreach($md5list as $med => $sum) {
+            foreach ($md5list as $med => $sum) {
                 // If same code
-                if($sum === $md5sum) {
+                if ($sum === $md5sum) {
                     //Add the merged code
                     $medianame = $med.', '.$media;
                     $this->csscode[$medianame] = $code;
@@ -267,30 +267,30 @@  discard block
 block discarded – undo
             $external_imports = "";
 
             // remove comments to avoid importing commented-out imports
-            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
 
-            while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
-                foreach($matches[0] as $import)    {
-                    if ($this->isremovable($import,$this->cssremovables)) {
-                        $thiscss = str_replace($import,'',$thiscss);
+            while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
+                foreach ($matches[0] as $import) {
+                    if ($this->isremovable($import, $this->cssremovables)) {
+                        $thiscss = str_replace($import, '', $thiscss);
                         $import_ok = true;
                     } else {
-                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
                         $path = $this->getpath($url);
                         $import_ok = false;
                         if (file_exists($path) && is_readable($path)) {
-                            $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\");
-                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" );
-                            if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
-                                $code=$tmpstyle;
-                                $this->alreadyminified=true;
-                            } else if ($this->can_inject_late($path,$code)) {
-                                $code="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";
+                            $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\");
+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
+                                $code = $tmpstyle;
+                                $this->alreadyminified = true;
+                            } else if ($this->can_inject_late($path, $code)) {
+                                $code = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";
                             }
                             
-                            if(!empty($code)) {
-                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
+                            if (!empty($code)) {
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
                                 if (!empty($tmp_thiscss)) {
                                     $thiscss = $tmp_thiscss;
                                     $import_ok = true;
@@ -304,31 +304,31 @@  discard block
 block discarded – undo
                     if (!$import_ok) {
                         // external imports and general fall-back
                         $external_imports .= $import;
-                        $thiscss = str_replace($import,'',$thiscss);
+                        $thiscss = str_replace($import, '', $thiscss);
                         $fiximports = true;
                     }
                 }
-                $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
-                $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
                 
                 // and update $thiscss_nocomments before going into next iteration in while loop
-                $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
             }
             unset($thiscss_nocomments);
             
             // add external imports to top of aggregated CSS
-            if($fiximports) {
-                $thiscss=$external_imports.$thiscss;
+            if ($fiximports) {
+                $thiscss = $external_imports.$thiscss;
             }
         }
         unset($thiscss);
         
         // $this->csscode has all the uncompressed code now. 
-        foreach($this->csscode as &$code) {
+        foreach ($this->csscode as &$code) {
             // Check for already-minified code
             $hash = md5($code);
-            $ccheck = new autoptimizeCache($hash,'css');
-            if($ccheck->check()) {
+            $ccheck = new autoptimizeCache($hash, 'css');
+            if ($ccheck->check()) {
                 $code = $ccheck->retrieve();
                 $this->hashmap[md5($code)] = $hash;
                 continue;
@@ -337,44 +337,44 @@  discard block
 block discarded – undo
 
             // Do the imaging!
             $imgreplace = array();
-            preg_match_all( self::ASSETS_REGEX, $code, $matches );
+            preg_match_all(self::ASSETS_REGEX, $code, $matches);
 
-            if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
-                foreach($matches[1] as $count => $quotedurl) {
-                    $iurl = trim($quotedurl," \t\n\r\0\x0B\"'");
+            if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
+                foreach ($matches[1] as $count => $quotedurl) {
+                    $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'");
 
                     // if querystring, remove it from url
-                    if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
+                    if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
                     
                     $ipath = $this->getpath($iurl);
 
                     $datauri_max_size = 4096;
-                    $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size );
-                    $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', "");
+                    $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
+                    $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
                     if (!empty($datauri_exclude)) {
-                        $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
+                        $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
                         foreach ($no_datauris as $no_datauri) {
-                            if (strpos($iurl,$no_datauri)!==false) {
-                                $ipath=false;
+                            if (strpos($iurl, $no_datauri) !== false) {
+                                $ipath = false;
                                 break;
                             }
                         }
                     }
 
-                    if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
-                        $ihash=md5($ipath);
-                        $icheck = new autoptimizeCache($ihash,'img');
-                        if($icheck->check()) {
+                    if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
+                        $ihash = md5($ipath);
+                        $icheck = new autoptimizeCache($ihash, 'img');
+                        if ($icheck->check()) {
                             // we have the base64 image in cache
-                            $headAndData=$icheck->retrieve();
-                            $_base64data=explode(";base64,",$headAndData);
-                            $base64data=$_base64data[1];
+                            $headAndData = $icheck->retrieve();
+                            $_base64data = explode(";base64,", $headAndData);
+                            $base64data = $_base64data[1];
                         } else {
                             // It's an image and we don't have it in cache, get the type
-                            $explA=explode('.',$ipath);
-                            $type=end($explA);
+                            $explA = explode('.', $ipath);
+                            $type = end($explA);
 
-                            switch($type) {
+                            switch ($type) {
                                 case 'jpeg':
                                     $dataurihead = 'data:image/jpeg;base64,';
                                     break;
@@ -396,42 +396,42 @@  discard block
 block discarded – undo
                         
                             // Encode the data
                             $base64data = base64_encode(file_get_contents($ipath));
-                            $headAndData=$dataurihead.$base64data;
+                            $headAndData = $dataurihead.$base64data;
 
                             // Save in cache
-                            $icheck->cache($headAndData,"text/plain");
+                            $icheck->cache($headAndData, "text/plain");
                         }
                         unset($icheck);
 
                         // Add it to the list for replacement
-                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]);
+                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]);
                     } else {
                         // just cdn the URL if applicable
                         if (!empty($this->cdn_url)) {
-                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);
+                            $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]);
 						}
                     }
                 }
             } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
                 // change urls to cdn-url
-                foreach($matches[1] as $count => $quotedurl) {
-                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]);
+                foreach ($matches[1] as $count => $quotedurl) {
+                    $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]);
                 }
             }
             
-            if(!empty($imgreplace)) {
-                $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code);
+            if (!empty($imgreplace)) {
+                $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code);
             }
             
             // Minify
-            if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
+            if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
                 if (class_exists('Minify_CSS_Compressor')) {
                     $tmp_code = trim(Minify_CSS_Compressor::process($code));
-                } else if(class_exists('CSSmin')) {
+                } else if (class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
-                    if (method_exists($cssmin,"run")) {
+                    if (method_exists($cssmin, "run")) {
                         $tmp_code = trim($cssmin->run($code));
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
                         $tmp_code = trim(CssMin::minify($code));
                     }
                 }
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
             
             $code = $this->inject_minified($code);
             
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
             if (!empty($tmp_code)) {
                 $code = $tmp_code;
                 unset($tmp_code);
@@ -458,13 +458,13 @@  discard block
 block discarded – undo
     //Caches the CSS in uncompressed, deflated and gzipped form.
     public function cache() {
         // CSS cache
-        foreach($this->csscode as $media => $code) {
+        foreach ($this->csscode as $media => $code) {
             $md5 = $this->hashmap[md5($code)];
                 
-            $cache = new autoptimizeCache($md5,'css');
-            if(!$cache->check()) {
+            $cache = new autoptimizeCache($md5, 'css');
+            if (!$cache->check()) {
                 // Cache our code
-                $cache->cache($code,'text/css');
+                $cache->cache($code, 'text/css');
             }
             $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         }
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
         $this->content = $this->restore_comments($this->content);
         
         // restore (no)script
-        if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) { 
+        if (strpos($this->content, '%%SCRIPT%%') !== false) { 
             $this->content = preg_replace_callback(
                 '#%%SCRIPT'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is',
                 create_function(
@@ -494,55 +494,55 @@  discard block
 block discarded – undo
         $this->content = $this->restore_noptimize($this->content);
         
         //Restore the full content
-        if(!empty($this->restofcontent)) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
         
         // Inject the new stylesheets
-        $replaceTag = array("<title","before");
-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content );
+        $replaceTag = array("<title", "before");
+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
 
         if ($this->inline == true) {
-            foreach($this->csscode as $media => $code) {
-                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
             }
         } else {
             if ($this->defer == true) {
                 $preloadCssBlock = "";
                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";
-                $defer_inline_code=$this->defer_inline;
-                if(!empty($defer_inline_code)){
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
+                $defer_inline_code = $this->defer_inline;
+                if (!empty($defer_inline_code)) {
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
                         $iCssHash = md5($defer_inline_code);
-                        $iCssCache = new autoptimizeCache($iCssHash,'css');
-                        if($iCssCache->check()) { 
+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');
+                        if ($iCssCache->check()) { 
                             // we have the optimized inline CSS in cache
-                            $defer_inline_code=$iCssCache->retrieve();
+                            $defer_inline_code = $iCssCache->retrieve();
                         } else {
                             if (class_exists('Minify_CSS_Compressor')) {
                                 $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code));
-                            } else if(class_exists('CSSmin')) {
+                            } else if (class_exists('CSSmin')) {
                                 $cssmin = new CSSmin();
                                 $tmp_code = trim($cssmin->run($defer_inline_code));
                             }
                             if (!empty($tmp_code)) {
                                 $defer_inline_code = $tmp_code;
-                                $iCssCache->cache($defer_inline_code,"text/css");
+                                $iCssCache->cache($defer_inline_code, "text/css");
                                 unset($tmp_code);
                             }
                         }
                     }
-                    $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
-                    $this->inject_in_html($code_out,$replaceTag);
+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
+                    $this->inject_in_html($code_out, $replaceTag);
                 }
             }
 
-            foreach($this->url as $media => $url) {
+            foreach ($this->url as $media => $url) {
                 $url = $this->url_replace_cdn($url);
                 
                 //Add the stylesheet either deferred (import at bottom) or normal links in head
-                if($this->defer == true) {
+                if ($this->defer == true) {
                     
                     // Filter to modify the onload attribute - passes value and the stylesheet url
                     $preloadOnLoad = apply_filters('autoptimize_filter_css_preload_onload', "this.rel='stylesheet'", $url);
@@ -552,25 +552,25 @@  discard block
 block discarded – undo
                     
                 } else {
                     if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
-                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
-                    } else if (strlen($this->csscode[$media])>0) {
-                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
+                    } else if (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
                     }
                 }
             }
             
-            if($this->defer == true) {
+            if ($this->defer == true) {
                 $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */
 !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);
 /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
 !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';
                 $noScriptCssBlock .= "</noscript>";
-                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag);
+                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag);
                 
                 // Adds preload polyfill at end of body tag
                 $this->inject_in_html(
                     apply_filters('autoptimize_css_preload_polyfill', $preloadPolyfill),
-                    array('</body>','before')
+                    array('</body>', 'before')
                 );
             }
         }
@@ -581,62 +581,62 @@  discard block
 block discarded – undo
     
     static function fixurls($file, $code) {
         // Switch all imports to the url() syntax
-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
 
-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
-            $file = str_replace( WP_ROOT_DIR, '/', $file );
-            $dir = dirname( $file ); // Like /themes/expound/css
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
+            $dir = dirname($file); // Like /themes/expound/css
 
             // $dir should not contain backslashes, since it's used to replace
             // urls, but it can contain them when running on Windows because
             // fixurls() is sometimes called with `ABSPATH . 'index.php'`
-            $dir = str_replace( '\\', '/', $dir );
-            unset( $file ); // not used below at all
+            $dir = str_replace('\\', '/', $dir);
+            unset($file); // not used below at all
 
             $replace = array();
-            foreach ( $matches[1] as $k => $url ) {
+            foreach ($matches[1] as $k => $url) {
                 // Remove quotes
-                $url    = trim( $url," \t\n\r\0\x0B\"'" );
-                $noQurl = trim( $url, "\"'" );
-                if ( $url !== $noQurl ) {
+                $url    = trim($url, " \t\n\r\0\x0B\"'");
+                $noQurl = trim($url, "\"'");
+                if ($url !== $noQurl) {
                     $removedQuotes = true;
                 } else {
                     $removedQuotes = false;
                 }
 
-                if ( '' === $noQurl ) {
+                if ('' === $noQurl) {
                     continue;
                 }
 
                 $url = $noQurl;
-                if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
+                if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
                     // URL is protocol-relative, host-relative or something we don't touch
                     continue;
                 } else {
                     // Relative URL
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
 
                     // Hash the url + whatever was behind potentially for replacement
                     // We must do this, or different css classes referencing the same bg image (but
                     // different parts of it, say, in sprites and such) loose their stuff...
-                    $hash = md5( $url . $matches[2][$k] );
-                    $code = str_replace( $matches[0][$k], $hash, $code );
+                    $hash = md5($url.$matches[2][$k]);
+                    $code = str_replace($matches[0][$k], $hash, $code);
 
-                    if ( $removedQuotes ) {
-                        $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
+                    if ($removedQuotes) {
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
                     } else {
-                        $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
                     }
                 }
             }
 
-            if ( ! empty( $replace ) ) {
+            if (!empty($replace)) {
                 // Sort the replacements array by key length in desc order (so that the longest strings are replaced first)
-                $keys = array_map( 'strlen', array_keys( $replace ) );
-                array_multisort( $keys, SORT_DESC, $replace );
+                $keys = array_map('strlen', array_keys($replace));
+                array_multisort($keys, SORT_DESC, $replace);
 
                 // Replace URLs found within $code
-                $code = str_replace( array_keys( $replace ), array_values( $replace ), $code );
+                $code = str_replace(array_keys($replace), array_values($replace), $code);
             }
         }
 
@@ -644,11 +644,11 @@  discard block
 block discarded – undo
     }
     
     private function ismovable($tag) {
-		if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
+		if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
 			return false;
         } else if (!empty($this->whitelist)) {
             foreach ($this->whitelist as $match) {
-                if(strpos($tag,$match)!==false) {
+                if (strpos($tag, $match) !== false) {
                     return true;
                 }
             }
@@ -656,8 +656,8 @@  discard block
 block discarded – undo
             return false;
         } else {
             if (is_array($this->dontmove)) {
-                foreach($this->dontmove as $match) {
-                    if(strpos($tag,$match)!==false) {
+                foreach ($this->dontmove as $match) {
+                    if (strpos($tag, $match) !== false) {
                         //Matched something
                         return false;
                     }
@@ -669,21 +669,21 @@  discard block
 block discarded – undo
         }
     }
     
-    private function can_inject_late($cssPath,$css) {
+    private function can_inject_late($cssPath, $css) {
 		$consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
-        if ( $this->inject_min_late !== true ) {
+        if ($this->inject_min_late !== true) {
             // late-inject turned off
             return false;
-        } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
+        } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
 			// file not minified based on filename & filter
 			return false;
-        } else if ( strpos($css,"@import") !== false ) {
+        } else if (strpos($css, "@import") !== false) {
             // can't late-inject files with imports as those need to be aggregated 
             return false;
-        } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
+        } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed
             return false;
-        } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
+        } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
             // don't late-inject CSS with images if CDN is set OR is image inlining is on
             return false;
         } else {
@@ -693,11 +693,11 @@  discard block
 block discarded – undo
     }
     
     private function maybe_cdn_urls($inUrl) {
-        $url = trim($inUrl," \t\n\r\0\x0B\"'");
-        $urlPath = parse_url($url,PHP_URL_PATH);
+        $url = trim($inUrl, " \t\n\r\0\x0B\"'");
+        $urlPath = parse_url($url, PHP_URL_PATH);
 
         // exclude fonts from CDN except if filter returns true
-        if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
+        if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
             $cdn_url = $this->url_replace_cdn($url);
         } else {
             $cdn_url = $url;
Please login to merge, or discard this patch.
futtta / autoptimize

Pull Request — master (#107)

Status

Category

Spacing +188 added lines, -188 removed lines patch added patch discarded remove patch
