Move line-feed normalization, to only affect code files, not file imp…

…orts

Fixes issue #139

src/Minify.php

@@ -77,6 +77,10 @@ public function add($data /* $data = null, ... */)
             $value = $this->load($data);
             $key = ($data != $value) ? $data : count($this->data);
 
+            // replace CR linefeeds etc.
+            // @see https://github.com/matthiasmullie/minify/pull/139
+            $value = str_replace(array("\r\n", "\r"), "\n", $value);
+
             // store data
             $this->data[$key] = $value;
         }
@@ -159,9 +163,6 @@ protected function load($data)
         if ($this->canImportFile($data)) {
             $data = file_get_contents($data);
 
-            // replace CR linefeeds etc.
-            $data = preg_replace('~\R~', "\n", $data);
-
             // strip BOM, if any
             if (substr($data, 0, 3) == "\xef\xbb\xbf") {
                 $data = substr($data, 3);

tests/css/CSSTest.php

@@ -478,6 +478,20 @@ public function dataProvider()
             'p{width:calc(35% + (10% + 10%))}',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/139
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/lf/parent.css',
+            'p{color:green}body{color:red}',
+        );
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/cr/parent.css',
+            'p{color:green}body{color:red}',
+        );
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/crlf/parent.css',
+            'p{color:green}body{color:red}',
+        );
+
         return $tests;
     }
 

tests/css/sample/line_endings/cr/import.css

@@ -0,0 +1 @@
+/* set p color*/p {    color: green;}

tests/css/sample/line_endings/cr/parent.css

@@ -0,0 +1 @@
+/* import some file */@import "import.css";/* set body color */body {    color: red;}

tests/css/sample/line_endings/crlf/import.css

@@ -0,0 +1 @@
+/* set p color*/p {    color: green;}

tests/css/sample/line_endings/crlf/parent.css

@@ -0,0 +1,7 @@
+/* import some file */
+@import "import.css";
+
+/* set body color */
+body {
+    color: red;
+}

tests/css/sample/line_endings/lf/import.css

@@ -0,0 +1,4 @@
+/* set p color*/
+p {
+    color: green;
+}

tests/css/sample/line_endings/lf/parent.css

@@ -0,0 +1,7 @@
+/* import some file */
+@import "import.css";
+
+/* set body color */
+body {
+    color: red;
+}

tests/js/JSTest.php

@@ -818,6 +818,20 @@ function otherFuncName() {
             'matchers.push(/^[0-9]*$/.source);String(dateString).match(/^[0-9]*$/)',
         );
 
+        // https://github.com/matthiasmullie/minify/issues/139
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/lf/script.js',
+            'var a=1',
+        );
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/cr/script.js',
+            'var a=1',
+        );
+        $tests[] = array(
+            __DIR__.'/sample/line_endings/crlf/script.js',
+            'var a=1',
+        );
+
         // update tests' expected results for cross-system compatibility
         foreach ($tests as &$test) {
             if (!empty($test[1])) {

tests/js/sample/line_endings/cr/script.js

@@ -0,0 +1 @@
+// nothing special herevar a = 1;

tests/js/sample/line_endings/crlf/script.js

@@ -0,0 +1 @@
+// nothing special herevar a = 1;

tests/js/sample/line_endings/lf/script.js

@@ -0,0 +1,2 @@
+// nothing special here
+var a = 1;