Fixed tests ("\r" and "\n" mismatch)

diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt
index baa3754087d5dd99a5107c32740d8916b80a1843..8623fb012ea18a95883e4a30c3d1b0b45f727363 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation3.phpt
+++ b/ext/standard/tests/array/array_combine_variation3.phpt
@@ -121,10 +121,8 @@ array(1) {
 array(6) {
   [u"a\v\f"]=>
   unicode(3) "a\v\f"
-  [u"aaaa
-"]=>
-  unicode(5) "aaaa
-"
+  [u"aaaa\r"]=>
+  unicode(5) "aaaa\r"
   [u"b"]=>
   unicode(1) "b"
   [u"b bbb"]=>
@@ -163,13 +161,11 @@ This is a double quoted string"]=>
 The quick brown fox jumped over;
 the lazy dog
 This is a double quoted string"
-  [u"hello
- world 
+  [u"hello\r world      
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index 142d44778e4849b1c59d76603686bb95e68b3fdb..0a4a48d911a24fcb8c05813c1309b5556f567e62 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -149,16 +149,14 @@ array(1) {
 -- Iteration 8 --
 array(1) {
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"
 }
 array(1) {
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
index 0b51d63051962bd70c285ca55d507d031d61146d..3eaad5007f0d0ba5761d3037dcc26b5ea2c13d89 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
@@ -242,8 +242,7 @@ array(4) {
   [0]=>
   unicode(3) "a\v\f"
   [1]=>
-  unicode(5) "aaaa
-"
+  unicode(5) "aaaa\r"
   [2]=>
   unicode(1) "b"
   [3]=>
@@ -254,8 +253,7 @@ array(8) {
   [0]=>
   unicode(3) "a\v\f"
   [1]=>
-  unicode(5) "aaaa
-"
+  unicode(5) "aaaa\r"
   [2]=>
   unicode(1) "b"
   [3]=>
@@ -326,8 +324,7 @@ The quick brown fox jumped over;
 the lazy dog
 This is a double quoted string"
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"
@@ -343,8 +340,7 @@ The quick brown fox jumped over;
 the lazy dog
 This is a double quoted string"
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt
index 90ba52bdce7315ad136c3b5c34b9ff8b82317b34..e5da831434f7e8efacdc5a7e6b4f3b5ee0662c12 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation3.phpt
+++ b/ext/standard/tests/array/array_pad_variation3.phpt
@@ -718,22 +718,18 @@ array(4) {
   [1]=>
   int(2)
   [2]=>
-  unicode(25) "\v\fHello  world!! 
-string
+  unicode(25) "\v\fHello  world!! \rstring
 "
   [3]=>
-  unicode(25) "\v\fHello  world!! 
-string
+  unicode(25) "\v\fHello  world!! \rstring
 "
 }
 array(4) {
   [0]=>
-  unicode(25) "\v\fHello  world!! 
-string
+  unicode(25) "\v\fHello  world!! \rstring
 "
   [1]=>
-  unicode(25) "\v\fHello  world!! 
-string
+  unicode(25) "\v\fHello  world!! \rstring
 "
   [2]=>
   int(1)

diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt
index 7a427d465df575a7541c7196f012ef3000f58996..2d0d57046bdbb441626facfd2934f8fd590269b1 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation6.phpt
+++ b/ext/standard/tests/array/array_pad_variation6.phpt
@@ -242,8 +242,7 @@ array(6) {
   [0]=>
   unicode(3) "a\v\f"
   [1]=>
-  unicode(5) "aaaa
-"
+  unicode(5) "aaaa\r"
   [2]=>
   unicode(5) "b        bbb"
   [3]=>
@@ -261,8 +260,7 @@ array(6) {
   [2]=>
   unicode(3) "a\v\f"
   [3]=>
-  unicode(5) "aaaa
-"
+  unicode(5) "aaaa\r"
   [4]=>
   unicode(5) "b        bbb"
   [5]=>
@@ -308,8 +306,7 @@ The big brown fox jumped over;
 the lazy dog
 This is a double quoted string"
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"
@@ -338,8 +335,7 @@ The big brown fox jumped over;
 the lazy dog
 This is a double quoted string"
   [u"h3"]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt
index f8674460b8a79d2a9888c8b39e03bb3840752ee9..fa1369266b8885daf2050ef1e8c5c48d2e33bc63 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation7.phpt
+++ b/ext/standard/tests/array/array_unshift_variation7.phpt
@@ -91,8 +91,7 @@ array(7) {
 int(5)
 array(5) {
   [0]=>
-  unicode(49) "        
-\v The quick brown fo\fx jumped over the lazy dog"
+  unicode(49) "        \r\v The quick brown fo\fx jumped over the lazy dog"
   [u"f"]=>
   unicode(5) "first"
   [u"s"]=>
@@ -105,8 +104,7 @@ array(5) {
 int(7)
 array(7) {
   [0]=>
-  unicode(49) "        
-\v The quick brown fo\fx jumped over the lazy dog"
+  unicode(49) "        \r\v The quick brown fo\fx jumped over the lazy dog"
   [1]=>
   unicode(5) "hello"
   [2]=>
@@ -186,8 +184,7 @@ array(7) {
 int(5)
 array(5) {
   [0]=>
-  unicode(70) "This is         a text in bold letters
-\s\malong with slashes
+  unicode(70) "This is         a text in bold letters\r\s\malong with slashes
  : HELLO WORLD "
   [u"f"]=>
   unicode(5) "first"
@@ -201,8 +198,7 @@ array(5) {
 int(7)
 array(7) {
   [0]=>
-  unicode(70) "This is         a text in bold letters
-\s\malong with slashes
+  unicode(70) "This is         a text in bold letters\r\s\malong with slashes
  : HELLO WORLD "
   [1]=>
   unicode(5) "hello"

diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt
index 8157724e27734a41863b1db6ed98b7a47b3c808d..88e183583b423df564fa24c3181a293e2676d1e8 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation9.phpt
+++ b/ext/standard/tests/array/array_unshift_variation9.phpt
@@ -201,8 +201,7 @@ This is a double quoted string"
 int(5)
 array(5) {
   [0]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"
@@ -218,8 +217,7 @@ double quoted string. with\vdifferent\fwhite\vspaces"
 int(7)
 array(7) {
   [0]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt
index 75ae044f48a494a14587f1ab07c6ea340ae31232..64a8ee78a3a859c5883697647c31f3d13d1ce67c 100644 (file)
--- a/ext/standard/tests/array/arsort_variation5.phpt
+++ b/ext/standard/tests/array/arsort_variation5.phpt
@@ -76,10 +76,8 @@ array(12) {
   unicode(3) "\cx"
   [u"\a"]=>
   unicode(2) "\a"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\f"]=>
   unicode(1) "\f"
   [u"\v"]=>
@@ -108,10 +106,8 @@ array(12) {
   unicode(3) "\cx"
   [u"\a"]=>
   unicode(2) "\a"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\f"]=>
   unicode(1) "\f"
   [u"\v"]=>
@@ -140,10 +136,8 @@ array(12) {
   unicode(3) "\cx"
   [u"\a"]=>
   unicode(2) "\a"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\f"]=>
   unicode(1) "\f"
   [u"\v"]=>

diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt
index 52481bef42f75095c74d70904b34f86870c4747c..1face6d0d748715449cbc90fab30de5bab469fa4 100644 (file)
--- a/ext/standard/tests/array/ksort_variation5.phpt
+++ b/ext/standard/tests/array/ksort_variation5.phpt
@@ -78,10 +78,8 @@ array(11) {
   unicode(1) "\v"
   [u"\f"]=>
   unicode(1) "\f"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\a"]=>
   unicode(2) "\a"
   [u"\cx"]=>
@@ -108,10 +106,8 @@ array(11) {
   unicode(1) "\v"
   [u"\f"]=>
   unicode(1) "\f"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\a"]=>
   unicode(2) "\a"
   [u"\cx"]=>
@@ -138,10 +134,8 @@ array(11) {
   unicode(1) "\v"
   [u"\f"]=>
   unicode(1) "\f"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\a"]=>
   unicode(2) "\a"
   [u"\cx"]=>

diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt
index d3a025609f7ece9f98542901fad91cfba000d28d..c9f41c9ce905f6c648cde91eab4b0460f545da9a 100644 (file)
--- a/ext/standard/tests/array/sort_variation5.phpt
+++ b/ext/standard/tests/array/sort_variation5.phpt
@@ -75,8 +75,7 @@ array(12) {
   [5]=>
   unicode(1) "\f"
   [6]=>
-  unicode(1) "
-"
+  unicode(1) "\r"
   [7]=>
   unicode(2) "\a"
   [8]=>
@@ -105,8 +104,7 @@ array(12) {
   [5]=>
   unicode(1) "\f"
   [6]=>
-  unicode(1) "
-"
+  unicode(1) "\r"
   [7]=>
   unicode(2) "\a"
   [8]=>
@@ -135,8 +133,7 @@ array(12) {
   [5]=>
   unicode(1) "\f"
   [6]=>
-  unicode(1) "
-"
+  unicode(1) "\r"
   [7]=>
   unicode(2) "\a"
   [8]=>