ImportProcessor can handle URIs with query strings

mrclay · mrclay · commit e904f2e1ae5e · 2017-04-03T16:50:53.000-04:00
Fixes #479
diff --git a/lib/Minify/ImportProcessor.php b/lib/Minify/ImportProcessor.php
@@ -54,6 +54,7 @@ private function __construct($currentDir, $previewsDir = "")
 
     private function _getContent($file, $is_imported = false)
     {
+        $file = preg_replace('~\\?.*~', '', $file);
         $file = realpath($file);
         if (! $file
             || in_array($file, self::$filesIncluded)
diff --git a/tests/_test_files/importProcessor/css/input.css b/tests/_test_files/importProcessor/css/input.css
@@ -1,4 +1,4 @@
-@import url(adjacent.css) screen;
+@import url(adjacent.css?ver=1) screen;
 @import "1/tv.css" tv, projection;
 @import "../lib/css/example.css";
 input foo { background: red url(/red.gif); }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ private function __construct($currentDir, $previewsDir = "")`
`54`	`54`
`55`	`55`	`private function _getContent($file, $is_imported = false)`
`56`	`56`	`{`
	`57`	`+ $file = preg_replace('~\\?.*~', '', $file);`
`57`	`58`	`$file = realpath($file);`
`58`	`59`	`if (! $file`
`59`	`60`	`\|\| in_array($file, self::$filesIncluded)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import url(adjacent.css) screen;`
	`1`	`+@import url(adjacent.css?ver=1) screen;`
`2`	`2`	`@import "1/tv.css" tv, projection;`
`3`	`3`	`@import "../lib/css/example.css";`
`4`	`4`	`input foo { background: red url(/red.gif); }`