From 53de77421dbfa5c6080b0d77edda65587bd96df8 Mon Sep 17 00:00:00 2001 From: Alexey Zakhlestin Date: Wed, 15 Jul 2009 13:55:39 +0000 Subject: [PATCH] fix tests corrupted by svn's eol-style=native --- ext/json/tests/pass001.1.phpt | 24 ++++-------- ext/json/tests/pass001.phpt | 24 ++++-------- .../tests/array/array_combine_variation3.phpt | 12 ++---- .../array_intersect_assoc_variation3.phpt | 6 +-- .../array_intersect_assoc_variation4.phpt | 6 +-- .../array/array_intersect_variation3.phpt | 12 ++---- .../array/array_intersect_variation4.phpt | 12 ++---- .../array_merge_recursive_variation3.phpt | 12 ++---- .../tests/array/array_pad_variation3.phpt | 12 ++---- .../tests/array/array_pad_variation6.phpt | 12 ++---- .../tests/array/array_unique_variation2.phpt | 6 +-- .../tests/array/array_unshift_variation7.phpt | 12 ++---- .../tests/array/array_unshift_variation9.phpt | 6 +-- .../tests/array/arsort_variation5.phpt | 18 +++------ .../tests/array/asort_variation5.phpt | 18 +++------ .../tests/array/krsort_variation5.phpt | 18 +++------ .../tests/array/ksort_variation5.phpt | 18 +++------ ext/standard/tests/array/sort_variation5.phpt | 9 ++--- ext/standard/tests/file/bug39538.phpt | 6 +-- .../tests/file/fgetss_variation2.phpt | 18 +++------ .../general_functions/debug_zval_dump_b.phpt | Bin 7277 -> 7277 bytes .../tests/general_functions/print_r.phpt | 9 ++--- .../tests/general_functions/var_dump.phpt | 6 +-- .../tests/strings/addcslashes_001.phpt | Bin 1604 -> 1604 bytes ext/standard/tests/strings/chop_basic.phpt | Bin 861 -> 861 bytes .../tests/strings/chunk_split_variation7.phpt | Bin 2462 -> 2462 bytes .../tests/strings/chunk_split_variation9.phpt | Bin 3344 -> 3344 bytes .../htmlspecialchars_decode_variation3.phpt | 3 +- .../htmlspecialchars_decode_variation5.phpt | 28 ++++---------- ext/standard/tests/strings/nl2br.phpt | 35 +++++------------- .../tests/strings/nl2br_variation1.phpt | 8 +--- .../tests/strings/nl2br_variation3.phpt | 27 ++++---------- .../tests/strings/nl2br_variation4.phpt | 6 +-- .../tests/strings/str_split_variation3.phpt | Bin 3006 -> 3006 bytes .../tests/strings/str_split_variation5.phpt | 3 +- .../tests/strings/strip_tags_variation5.phpt | 3 +- .../tests/strings/strip_tags_variation9.phpt | 6 +-- ext/standard/tests/strings/strlen.phpt | Bin 7030 -> 7030 bytes .../tests/strings/strrchr_variation5.phpt | 13 ++----- .../tests/strings/strrev_variation1.phpt | Bin 2941 -> 2941 bytes .../tests/strings/strtr_variation3.phpt | 3 +- ext/standard/tests/strings/ucwords_basic.phpt | 3 +- .../tests/strings/ucwords_variation2.phpt | 6 +-- .../tests/strings/ucwords_variation4.phpt | 3 +- 44 files changed, 135 insertions(+), 288 deletions(-) diff --git a/ext/json/tests/pass001.1.phpt b/ext/json/tests/pass001.1.phpt index 828a6499f7..7e15a7622a 100644 --- a/ext/json/tests/pass001.1.phpt +++ b/ext/json/tests/pass001.1.phpt @@ -220,8 +220,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -334,8 +333,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -401,8 +399,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -515,8 +512,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -586,8 +582,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -700,8 +695,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -767,8 +761,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -881,8 +874,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> diff --git a/ext/json/tests/pass001.phpt b/ext/json/tests/pass001.phpt index 6c3bcc269a..43be11e2b0 100644 --- a/ext/json/tests/pass001.phpt +++ b/ext/json/tests/pass001.phpt @@ -202,8 +202,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -275,8 +274,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -340,8 +338,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -413,8 +410,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -482,8 +478,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -555,8 +550,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> @@ -620,8 +614,7 @@ array(14) { string(1) "\" ["controls"]=> string(5) " - - " + " ["slash"]=> string(5) "/ & /" ["alpha"]=> @@ -693,8 +686,7 @@ array(14) { ["quotes"]=> string(27) "" " %22 0x22 034 "" ["/\"쫾몾ꮘﳞ볚 - - `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> + `1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=> string(23) "A key can be any string" } [9]=> diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt index f048808d36..51d8462d51 100644 --- a/ext/standard/tests/array/array_combine_variation3.phpt +++ b/ext/standard/tests/array/array_combine_variation3.phpt @@ -120,10 +120,8 @@ array(1) { array(6) { ["a "]=> string(3) "a " - ["aaaa -"]=> - string(5) "aaaa -" + ["aaaa "]=> + string(5) "aaaa " ["b"]=> string(1) "b" ["b bbb"]=> @@ -162,13 +160,11 @@ This is a double quoted string"]=> The quick brown fox jumped over; the lazy dog This is a double quoted string" - ["hello - world + ["hello world 1111 != 2222 heredoc double quoted string. with different white spaces"]=> - string(88) "hello - world + string(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 5cd0222e55..50be080590 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) { ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" } array(1) { ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 7771b412c3..ed2e3d9514 100644 --- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt @@ -156,16 +156,14 @@ array(0) { -- Iteration 8 -- array(1) { ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" } array(1) { ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index b40366b0c8..b2b7d8ac01 100644 --- a/ext/standard/tests/array/array_intersect_variation3.phpt +++ b/ext/standard/tests/array/array_intersect_variation3.phpt @@ -154,13 +154,11 @@ array(1) { -- Iterator 6 -- array(1) { [1]=> - string(5) "aaaa -" + string(5) "aaaa " } array(1) { [1]=> - string(5) "aaaa -" + string(5) "aaaa " } -- Iterator 7 -- array(1) { @@ -174,8 +172,7 @@ array(1) { -- Iterator 8 -- array(2) { [2]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -188,8 +185,7 @@ double quoted string. with different white spaces" } array(2) { [2]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt index 2f1a341064..4f1d6f3dd5 100644 --- a/ext/standard/tests/array/array_intersect_variation4.phpt +++ b/ext/standard/tests/array/array_intersect_variation4.phpt @@ -165,13 +165,11 @@ array(2) { -- Iteration 6 -- array(1) { [10]=> - string(5) "aaaa -" + string(5) "aaaa " } array(1) { [10]=> - string(5) "aaaa -" + string(5) "aaaa " } -- Iteration 7 -- array(1) { @@ -191,8 +189,7 @@ array(2) { 2222 != 1111. 0000 = 0000 " [12]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -205,8 +202,7 @@ array(2) { 2222 != 1111. 0000 = 0000 " [12]=> - string(88) "hello - world + string(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 ce6cb8575f..722388a015 100644 --- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt +++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt @@ -241,8 +241,7 @@ array(4) { [0]=> string(3) "a " [1]=> - string(5) "aaaa -" + string(5) "aaaa " [2]=> string(1) "b" [3]=> @@ -253,8 +252,7 @@ array(8) { [0]=> string(3) "a " [1]=> - string(5) "aaaa -" + string(5) "aaaa " [2]=> string(1) "b" [3]=> @@ -325,8 +323,7 @@ The quick brown fox jumped over; the lazy dog This is a double quoted string" ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" @@ -342,8 +339,7 @@ The quick brown fox jumped over; the lazy dog This is a double quoted string" ["h3"]=> - string(88) "hello - world + string(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 f7aa025e28..75df118220 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]=> - string(25) " Hello world!! -string + string(25) " Hello world!! string " [3]=> - string(25) " Hello world!! -string + string(25) " Hello world!! string " } array(4) { [0]=> - string(25) " Hello world!! -string + string(25) " Hello world!! string " [1]=> - string(25) " Hello world!! -string + string(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 f0f5693a4a..2f97e3ee5f 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]=> string(3) "a " [1]=> - string(5) "aaaa -" + string(5) "aaaa " [2]=> string(5) "b bbb" [3]=> @@ -261,8 +260,7 @@ array(6) { [2]=> string(3) "a " [3]=> - string(5) "aaaa -" + string(5) "aaaa " [4]=> string(5) "b bbb" [5]=> @@ -308,8 +306,7 @@ The big brown fox jumped over; the lazy dog This is a double quoted string" ["h3"]=> - string(88) "hello - world + string(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" ["h3"]=> - string(88) "hello - world + string(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index e9003f7d04..3ec3f288ba 100644 --- a/ext/standard/tests/array/array_unique_variation2.phpt +++ b/ext/standard/tests/array/array_unique_variation2.phpt @@ -116,8 +116,7 @@ array(4) { [0]=> string(3) "a " [1]=> - string(5) "aaaa -" + string(5) "aaaa " [2]=> string(1) "b" [4]=> @@ -145,8 +144,7 @@ The quick brown fox jumped over; the lazy dog This is a double quoted string" ["h3"]=> - string(87) "hello - world + string(87) "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 a255e47410..08f4db081b 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]=> - string(49) " - The quick brown fo x jumped over the lazy dog" + string(49) " The quick brown fo x jumped over the lazy dog" ["f"]=> string(5) "first" ["s"]=> @@ -105,8 +104,7 @@ array(5) { int(7) array(7) { [0]=> - string(49) " - The quick brown fo x jumped over the lazy dog" + string(49) " The quick brown fo x jumped over the lazy dog" [1]=> string(5) "hello" [2]=> @@ -186,8 +184,7 @@ array(7) { int(5) array(5) { [0]=> - string(70) "This is a text in bold letters -\s\malong with slashes + string(70) "This is a text in bold letters \s\malong with slashes : HELLO WORLD " ["f"]=> string(5) "first" @@ -201,8 +198,7 @@ array(5) { int(7) array(7) { [0]=> - string(70) "This is a text in bold letters -\s\malong with slashes + string(70) "This is a text in bold letters \s\malong with slashes : HELLO WORLD " [1]=> string(5) "hello" diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt index 4f6aab927b..a667e6da03 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]=> - string(88) "hello - world + string(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]=> - string(88) "hello - world + string(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 a0392d63f5..e69c269880 100644 --- a/ext/standard/tests/array/arsort_variation5.phpt +++ b/ext/standard/tests/array/arsort_variation5.phpt @@ -76,10 +76,8 @@ array(12) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> @@ -108,10 +106,8 @@ array(12) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> @@ -140,10 +136,8 @@ array(12) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index a2cba27924..faf7a5de5d 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -80,10 +80,8 @@ array(12) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> @@ -112,10 +110,8 @@ array(12) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> @@ -144,10 +140,8 @@ array(12) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index c118fb9381..59621654c2 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -76,10 +76,8 @@ array(11) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> @@ -106,10 +104,8 @@ array(11) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> @@ -136,10 +132,8 @@ array(11) { string(3) "\cx" ["\a"]=> string(2) "\a" - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " [" "]=> string(1) " " [" "]=> diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt index 6b5bbac3d7..958476c015 100644 --- a/ext/standard/tests/array/ksort_variation5.phpt +++ b/ext/standard/tests/array/ksort_variation5.phpt @@ -78,10 +78,8 @@ array(11) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> @@ -108,10 +106,8 @@ array(11) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> @@ -138,10 +134,8 @@ array(11) { string(1) " " [" "]=> string(1) " " - [" -"]=> - string(1) " -" + [" "]=> + string(1) " " ["\a"]=> string(2) "\a" ["\cx"]=> diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt index 0ba53e3b34..061a1cbac3 100644 --- a/ext/standard/tests/array/sort_variation5.phpt +++ b/ext/standard/tests/array/sort_variation5.phpt @@ -74,8 +74,7 @@ array(12) { [5]=> string(1) " " [6]=> - string(1) " -" + string(1) " " [7]=> string(2) "\a" [8]=> @@ -104,8 +103,7 @@ array(12) { [5]=> string(1) " " [6]=> - string(1) " -" + string(1) " " [7]=> string(2) "\a" [8]=> @@ -134,8 +132,7 @@ array(12) { [5]=> string(1) " " [6]=> - string(1) " -" + string(1) " " [7]=> string(2) "\a" [8]=> diff --git a/ext/standard/tests/file/bug39538.phpt b/ext/standard/tests/file/bug39538.phpt index 504865e651..71b5dea616 100644 --- a/ext/standard/tests/file/bug39538.phpt +++ b/ext/standard/tests/file/bug39538.phpt @@ -32,10 +32,8 @@ arsed Array ( [0] => - -this is an test + this is an test [1] => next data [2] => p - -arsed + arsed ) diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt index f13f8be82a..d155f08683 100644 --- a/ext/standard/tests/file/fgetss_variation2.phpt +++ b/ext/standard/tests/file/fgetss_variation2.phpt @@ -113,8 +113,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) @@ -174,8 +173,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) @@ -235,8 +233,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) @@ -296,8 +293,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) @@ -357,8 +353,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) @@ -418,8 +413,7 @@ string(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -string(41) "this is the text containing - character +string(41) "this is the text containing character " int(383) bool(false) diff --git a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt index 4cc403c4eec64a5b9b7389894306dc4f92132bec..7cadd2c62cc36b8a85ce30877ec1f205a985e7da 100644 GIT binary patch delta 28 gcmaEB@z!F)UO`6Q$@>Itz@*INZb8A#8bYpI0HEp#eEItz@*INZb8A#8bYpI0HA~kcK`qY diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index 86bc6e8943..673b853ea3 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -626,16 +626,13 @@ abcdefghijklmnop0qrstuvwx0yz -- Iteration 14 -- 1234 5678 - 9100 -abcda + 9100 abcda 1234 5678 - 9100 -abcda + 9100 abcda 1234 5678 - 9100 -abcda + 9100 abcda *** Testing print_r() on boolean variables *** -- Iteration 1 -- diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 6f5e46b295..55fb56e594 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -462,8 +462,7 @@ string(34) "abcdefghijklmnop0qrstuvwx0yz" -- Iteration 14 -- string(22) "1234 5678 - 9100 -abcda" + 9100 abcda" *** Testing var_dump() on boolean variables *** -- Iteration 1 -- @@ -1303,8 +1302,7 @@ array(14) { [13]=> string(22) "1234 5678 - 9100 -abcda" + 9100 abcda" } array(15) { [0]=> diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt index ba45504c3ad6f27ac6d727b6dc02781782bbcffe..b9161cd27ed224115718e65b4f2996fa640e2e46 100644 GIT binary patch delta 71 zcmX@YbA)HZUnWN0$^V#KfTT0?Q6S05;szuGSU@6ESvr8E9IGdg%wTl|lIvLAf#f$< PS596|B`%lzyi_g#)msvW delta 71 zcmX@YbA)HZUnWMb$^V#KfTT0?Q6S05;szuGSU@6ESvr8E9IGdg%wTl|lIvLAf#f$< PS57WYB`%lzyi_g#(IXOR diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt index 2b8d3daab73ecf1043d0b08e49f6a5f9357e3728..99a03cb0f1b81e8eb4b6df8218132db99ccd09ed 100644 GIT binary patch delta 50 zcmcc1c9(5~F|!sg1Gf@aaY<2TUb=>%g{Fd1Mruw@zCw9^QBDdc7f@C~L5a&HKQEOF E0BIEsF#rGn delta 50 zcmcc1c9(5~F|!sI1Gf@aaY<2TUb=>%g{Fd1Mruw@zCw9^QBDdc7f@C~L5a&HKQEOF E0BCa!D*ylh diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt index 9253f0e716372254688176d5fa67bdd063f72167..a27ff3cacd0e64425c866fb2c30ebf56543f2ee0 100644 GIT binary patch delta 14 VcmbOyJWqH-1v?|}=1O)|CIBN#1Nr~} delta 14 VcmbOyJWqH-1v?|x=1O)|CIBNj1NQ&` diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index b576b0e99cd35fff726813fb3ca07845d8450cae..5601bbc1e28cba8c62e34e5235f2cc0ee84ba4d2 100644 GIT binary patch delta 73 zcmbOrH9=~F1BVT7u|i3{LJ4nbafw2525)Izc6@OGZ%$^3hNc2Roy's height > Sam's height 1111 & 0000 = 0000 "This is a double quoted string"" -- Iteration 4 -- -string(130) "Roy's height - > Sam 's height +string(130) "Roy's height > Sam 's height 1111 & 0000 = 0000 " heredoc double quoted string. with different white spaces"" diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt index c2f0056d01..307cfe6d90 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -43,17 +43,13 @@ string(99) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... &q string(84) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" -- Iteration 2 -- string(82) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" string(82) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" string(92) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" string(72) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" -- Iteration 3 -- string(44) " Roy's height > ; Sam's height " @@ -64,18 +60,10 @@ Roy's height > ; Sam's height " string(34) " Roy's height > ; Sam's height " -- Iteration 4 -- -string(44) " - Roy's height > -; Sam 's height" -string(44) " - Roy's height > -; Sam 's height" -string(44) " - Roy's height > -; Sam 's height" -string(34) " - Roy's height > -; Sam 's height" +string(44) " Roy's height > ; Sam 's height" +string(44) " Roy's height > ; Sam 's height" +string(44) " Roy's height > ; Sam 's height" +string(34) " Roy's height > ; Sam 's height" -- Iteration 5 -- string(30) " 1 3 & gt; 11 but 11 & lt; 12" diff --git a/ext/standard/tests/strings/nl2br.phpt b/ext/standard/tests/strings/nl2br.phpt index e43d435dfe..6a3b94023c 100644 --- a/ext/standard/tests/strings/nl2br.phpt +++ b/ext/standard/tests/strings/nl2br.phpt @@ -23,38 +23,23 @@ string(8) "
" string(7) "
" -string(7) "
-" +string(7) "
" string(8) "
- -" + " string(44) "
- -
-
-
-
-
-" +
+



" string(47) "
- -
-
- -
- +

+
+

" string(66) "
- -
-
+


-
-
-
-
-" +


+
" diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index 89480cbca5..ab15ca1fe4 100644 --- a/ext/standard/tests/strings/nl2br_variation1.phpt +++ b/ext/standard/tests/strings/nl2br_variation1.phpt @@ -56,13 +56,9 @@ Hello
World
" -- Iteration 3 -- -string(17) "Hello
-World" +string(17) "Hello
World" -- Iteration 4 -- -string(31) "
-Hello
-World
-" +string(31) "
Hello
World
" -- Iteration 5 -- string(18) "Hello
World" diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt index c7baced910..b1341d13d6 100644 --- a/ext/standard/tests/strings/nl2br_variation3.phpt +++ b/ext/standard/tests/strings/nl2br_variation3.phpt @@ -38,29 +38,20 @@ echo "Done"; *** Testing nl2br() : usage variations *** string(147) "

- -
- -
+
+


nn


n
- -rr
-
-
-r
-
- -
- + rr


r

+
+

-r
-n" +r
n" string(118) "Hello
World
This is es for
@@ -68,8 +59,6 @@ This is es for
ew lines
like

-
-
- - and etc" +

+ and etc" Done diff --git a/ext/standard/tests/strings/nl2br_variation4.phpt b/ext/standard/tests/strings/nl2br_variation4.phpt index eceb067021..63931afaf0 100644 --- a/ext/standard/tests/strings/nl2br_variation4.phpt +++ b/ext/standard/tests/strings/nl2br_variation4.phpt @@ -34,10 +34,8 @@ string(29) "Hello
world" string(19) "
" string(45) "
Hello
-world
-" +world
" string(37) "

-
-" +
" Done diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt index 9f5c8665a7081fc30478565a1e91fec93b76434d..1e7be76c3a3eee5111cb861b89c765ccfd6fd721 100644 GIT binary patch delta 23 fcmdldzE6C^5q37-@{G)q)XB9R;+r3`-(>~>ZAA$L delta 23 fcmdldzE6C^5q37N@{G)q)XB9R;+r3`-(>~>Z5Rmw diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 0a76780509..4e4df4f6c3 100644 --- a/ext/standard/tests/strings/str_split_variation5.phpt +++ b/ext/standard/tests/strings/str_split_variation5.phpt @@ -150,8 +150,7 @@ array(4) { string(10) "it() Escap" [3]=> - string(7) "e -chars" + string(7) "e chars" } -- Iteration 8 -- array(8) { diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt index ae7c4f748f..0eaea23de0 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -89,8 +89,7 @@ string(67) "hello world This is a double quoted string" -- Iteration 4 -- -string(44) "hello - world +string(44) "hello world 1111 != 2222 " -- Iteration 5 -- diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt index b133fb356b..2665773a51 100644 --- a/ext/standard/tests/strings/strip_tags_variation9.phpt +++ b/ext/standard/tests/strings/strip_tags_variation9.phpt @@ -41,8 +41,7 @@ echo "Done"; -- Iteration 1 -- string(50) " $ -> This represents the dollar sign" -- Iteration 2 -- -string(59) " - The quick brown fo x jumped over the lazy dog

" +string(59) " The quick brown fo x jumped over the lazy dog

" -- Iteration 3 -- string(31) "This is a hyper text tag" -- Iteration 4 -- @@ -50,7 +49,6 @@ string(0) "" -- Iteration 5 -- string(26) "

This is a paragraph

" -- Iteration 6 -- -string(62) "This is a text in bold letters -\s\malong with slashes +string(62) "This is a text in bold letters \s\malong with slashes " Done diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt index 1a9e5a11fdd3270d022260494ed8e2f1b05fdf55..41529b39f886ea7674231765b9be2d2ef0ba27e2 100644 GIT binary patch delta 18 acmexn_RVa=I#EX6$qk}7XqWYWfiq2#O07j7qWdHyG diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index fe9b91f1d7..88a4a84b01 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -34,24 +34,17 @@ echo "*** Done ***"; ?> --EXPECTF-- *** Testing strrchr() function: with heredoc strings *** -string(33) " st - -ch - using +string(33) " st ch using \escape \seque ce" string(9) "\seque ce" -string(25) " - using +string(25) " using \escape \seque ce" string(9) "\seque ce" -string(33) " st - -ch - using +string(33) " st ch using \escape \seque ce" *** Done *** diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt index 39c1ec41443d702548a1f3eab30c25587285d6fc..c0f8946185c725bb3000762e16798d44ae96852c 100644 GIT binary patch delta 14 Wcmew>_E&7f6*flR%~#o0umAuu;syBt delta 14 Wcmew>_E&7f6*fk$%~#o0umAuu&;|AY diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index d52f8507b3..fe546dc8ce 100644 --- a/ext/standard/tests/strings/strtr_variation3.phpt +++ b/ext/standard/tests/strings/strtr_variation3.phpt @@ -69,8 +69,7 @@ echo "*** Done ***"; *** Testing strtr() : string containing escape sequences for 'str' arg *** -- Iteration 1 -- string(9) "SesSTsttE" -string(9) " es \stt -" +string(9) " es \stt " -- Iteration 2 -- string(12) "TtestTTstrtr" string(12) "\test\\strtr" diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index 74996f6721..f34d8e9120 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -76,8 +76,7 @@ string(16) "Testing Ucwords" -- Iteration 15 -- string(16) "Testing\rucwords" -- Iteration 16 -- -string(15) "Testing -Ucwords" +string(15) "Testing Ucwords" -- Iteration 17 -- string(16) "Testing\fucwords" -- Iteration 18 -- diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt index a6d743f9af..ab6eb2f45c 100644 --- a/ext/standard/tests/strings/ucwords_variation2.phpt +++ b/ext/standard/tests/strings/ucwords_variation2.phpt @@ -80,15 +80,13 @@ string(52) "Testing Ucword() With Multiline String Using Heredoc" -- Iteration 4 -- -string(93) "Testing -Ucword(str) With +string(93) "Testing Ucword(str) With Multiline String Using Heredoc String.with Different White Spaces" -- Iteration 5 -- string(53) "12sting 123string 4567 -String 123string -12 Test +String 123string 12 Test 5test" -- Iteration 6 -- string(108) "It's Bright,but I Cann't See It. diff --git a/ext/standard/tests/strings/ucwords_variation4.phpt b/ext/standard/tests/strings/ucwords_variation4.phpt index 28be9ec0bb..bed6550822 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -92,8 +92,7 @@ string(24) " Testing Testing Ucwords" -- Iteration 13 -- string(26) "\ttesting\ttesting Ucwords" -- Iteration 14 -- -string(31) "Testing -Ucwords Testing Ucwords" +string(31) "Testing Ucwords Testing Ucwords" -- Iteration 15 -- string(32) "Testing\rucwords Testing Ucwords" -- Iteration 16 -- -- 2.40.0