- MFH: make it portable without loosing pertinent data

1 files changed, 38 insertions, 13 deletions

diff --git a/ext/standard/tests/file/stream_copy_to_stream.phpt b/ext/standard/tests/file/stream_copy_to_stream.phpt
index 3f46eec0cd..716ae1f462 100644
--- a/ext/standard/tests/file/stream_copy_to_stream.phpt
+++ b/ext/standard/tests/file/stream_copy_to_stream.phpt
@@ -2,6 +2,7 @@
 stream_copy_to_stream() tests
 --FILE--
 <?php
+define('WIN', substr(PHP_OS, 0, 3) == 'WIN');
 
 $initial_file = dirname(__FILE__).'/bug38086.txt';
 $new_file = dirname(__FILE__).'/bug38086_1.txt';
@@ -24,8 +25,11 @@ stream_filter_append($src, "string.rot13", STREAM_FILTER_READ);
 $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
-
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -37,7 +41,11 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -48,7 +56,11 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -59,7 +71,12 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, 1000000));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
+
 unlink($new_file);
 
 /* --- */
@@ -70,7 +87,11 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, 10));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 /* --- */
@@ -81,7 +102,11 @@ $dest = fopen($new_file, 'w');
 var_dump(stream_copy_to_stream($src, $dest, -1));
 fclose($src); fclose($dest);
 
-var_dump(file_get_contents($new_file));
+if (WIN) {
+  var_dump(str_replace("\r\n","\n", file_get_contents($new_file)));
+} else {
+  var_dump(file_get_contents($new_file));
+}
 unlink($new_file);
 
 echo "Done\n";
@@ -89,37 +114,37 @@ echo "Done\n";
 --EXPECTF--	
 int(0)
 string(0) ""
-int(134)
+int(%d)
 string(134) "Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 "
-int(134)
+int(%d)
 string(134) "Nabgure qnl
 Jura gur cnvaf bs yvsr jba'g one zl jnl
 V'yy oernx gurfr punvaf
 Gung ubyq zr qbja
 V'yy grne lbh qbja vagb zl cevingr uryy
 "
-int(134)
+int(%d)
 string(134) "Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 "
-int(134)
+int(%d)
 string(134) "Another day
 When the pains of life won't bar my way
 I'll break these chains
 That hold me down
 I'll tear you down into my private hell
 "
-int(10)
+int(%d)
 string(10) "Another da"
-int(134)
+int(%d)
 string(134) "Another day
 When the pains of life won't bar my way
 I'll break these chains