From: Dmitry Stogov Date: Wed, 23 Sep 2009 16:34:05 +0000 (+0000) Subject: Fixed tests ("\r" and "\n" mismatch) X-Git-Tag: php-5.4.0alpha1~191^2~2597 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe796df92d7248dbac4a93eb6f2de04c303608dd;p=php 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 baa3754087..8623fb012e 100644 --- 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 "]=> unicode(3) "a " - [u"aaaa -"]=> - unicode(5) "aaaa -" + [u"aaaa "]=> + unicode(5) "aaaa " [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 world 1111 != 2222 heredoc double quoted string. with different white spaces"]=> - unicode(88) "hello - world + unicode(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt index 142d44778e..0a4a48d911 100644 --- 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 world 1111 != 2222 heredoc double quoted string. with different white spaces" } array(1) { [u"h3"]=> - unicode(88) "hello - world + unicode(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt index 0b51d63051..3eaad5007f 100644 --- 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 " [1]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " [2]=> unicode(1) "b" [3]=> @@ -254,8 +253,7 @@ array(8) { [0]=> unicode(3) "a " [1]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " [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 world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -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 world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt index 90ba52bdce..e5da831434 100644 --- 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) " Hello world!! -string + unicode(25) " Hello world!! string " [3]=> - unicode(25) " Hello world!! -string + unicode(25) " Hello world!! string " } array(4) { [0]=> - unicode(25) " Hello world!! -string + unicode(25) " Hello world!! string " [1]=> - unicode(25) " Hello world!! -string + unicode(25) " Hello world!! string " [2]=> int(1) diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt index 7a427d465d..2d0d57046b 100644 --- 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 " [1]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " [2]=> unicode(5) "b bbb" [3]=> @@ -261,8 +260,7 @@ array(6) { [2]=> unicode(3) "a " [3]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " [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 world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -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 world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt index f8674460b8..fa1369266b 100644 --- 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) " - The quick brown fo x jumped over the lazy dog" + unicode(49) " The quick brown fo x 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) " - The quick brown fo x jumped over the lazy dog" + unicode(49) " The quick brown fo x 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 \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 \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 8157724e27..88e183583b 100644 --- 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 world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -218,8 +217,7 @@ double quoted string. with different white spaces" int(7) array(7) { [0]=> - unicode(88) "hello - world + unicode(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt index 75ae044f48..64a8ee78a3 100644 --- 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" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> @@ -108,10 +106,8 @@ array(12) { unicode(3) "\cx" [u"\a"]=> unicode(2) "\a" - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> @@ -140,10 +136,8 @@ array(12) { unicode(3) "\cx" [u"\a"]=> unicode(2) "\a" - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index 52481bef42..1face6d0d7 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -78,10 +78,8 @@ array(11) { unicode(1) " " [u" "]=> unicode(1) " " - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u"\a"]=> unicode(2) "\a" [u"\cx"]=> @@ -108,10 +106,8 @@ array(11) { unicode(1) " " [u" "]=> unicode(1) " " - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u"\a"]=> unicode(2) "\a" [u"\cx"]=> @@ -138,10 +134,8 @@ array(11) { unicode(1) " " [u" "]=> unicode(1) " " - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [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 d3a025609f..c9f41c9ce9 100644 --- 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) " " [6]=> - unicode(1) " -" + unicode(1) " " [7]=> unicode(2) "\a" [8]=> @@ -105,8 +104,7 @@ array(12) { [5]=> unicode(1) " " [6]=> - unicode(1) " -" + unicode(1) " " [7]=> unicode(2) "\a" [8]=> @@ -135,8 +133,7 @@ array(12) { [5]=> unicode(1) " " [6]=> - unicode(1) " -" + unicode(1) " " [7]=> unicode(2) "\a" [8]=>