From: Alexey Zakhlestin Date: Wed, 15 Jul 2009 14:08:18 +0000 (+0000) Subject: fix tests corrupted by svn's eol-style=native X-Git-Tag: php-5.4.0alpha1~191^2~3107 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b6eae5402bd574e25a872503cc2adec3174f47d;p=php fix tests corrupted by svn's eol-style=native --- diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt index 2a62ea27eb..667366cb71 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) { [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_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt index fea579eee2..3b9aa2a1c2 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]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " } array(1) { [1]=> - unicode(5) "aaaa -" + unicode(5) "aaaa " } -- Iterator 7 -- array(1) { @@ -174,8 +172,7 @@ array(1) { -- Iterator 8 -- array(2) { [2]=> - unicode(88) "hello - world + unicode(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]=> - 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_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt index 6e375f2494..3cfcfba2b2 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]=> %unicode|string%(3) "a " [1]=> - %unicode|string%(5) "aaaa -" + %unicode|string%(5) "aaaa " [2]=> %unicode|string%(1) "b" [4]=> @@ -145,8 +144,7 @@ The quick brown fox jumped over; the lazy dog This is a double quoted string" [%b|u%"h3"]=> - %unicode|string%(88) "hello - world + %unicode|string%(88) "hello world 1111 != 2222 heredoc double quoted string. with different white spaces" diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt index 2c80491df1..208da495c6 100644 --- a/ext/standard/tests/array/asort_variation5.phpt +++ b/ext/standard/tests/array/asort_variation5.phpt @@ -80,10 +80,8 @@ array(12) { unicode(1) " " [u" "]=> unicode(1) " " - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u"\a"]=> unicode(2) "\a" [u"\cx"]=> @@ -112,10 +110,8 @@ array(12) { unicode(1) " " [u" "]=> unicode(1) " " - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u"\a"]=> unicode(2) "\a" [u"\cx"]=> @@ -144,10 +140,8 @@ array(12) { 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/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt index d259205ac2..2e5c2d5e3b 100644 --- a/ext/standard/tests/array/krsort_variation5.phpt +++ b/ext/standard/tests/array/krsort_variation5.phpt @@ -76,10 +76,8 @@ array(11) { unicode(3) "\cx" [u"\a"]=> unicode(2) "\a" - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> @@ -106,10 +104,8 @@ array(11) { unicode(3) "\cx" [u"\a"]=> unicode(2) "\a" - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> @@ -136,10 +132,8 @@ array(11) { unicode(3) "\cx" [u"\a"]=> unicode(2) "\a" - [u" -"]=> - unicode(1) " -" + [u" "]=> + unicode(1) " " [u" "]=> unicode(1) " " [u" "]=> 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 f973299795..2d0b85ef75 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 @@ unicode(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -unicode(41) "this is the text containing - character +unicode(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 @@ unicode(27) "rectly after 80 characters int(342) bool(false) -- Line 8 -- -unicode(41) "this is the text containing - character +unicode(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 8a5eae3297..78109ad946 100644 Binary files a/ext/standard/tests/general_functions/debug_zval_dump_b.phpt and b/ext/standard/tests/general_functions/debug_zval_dump_b.phpt differ diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index 8d506dc9ff..81a523ad0b 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 360af71e8e..daead839b7 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -462,8 +462,7 @@ unicode(34) "abcdefghijklmnop0qrstuvwx0yz" -- Iteration 14 -- unicode(22) "1234 5678 - 9100 -abcda" + 9100 abcda" *** Testing var_dump() on boolean variables *** -- Iteration 1 -- @@ -1303,8 +1302,7 @@ array(14) { [13]=> unicode(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 28a30aa52e..734bd88b37 100644 Binary files a/ext/standard/tests/strings/addcslashes_001.phpt and b/ext/standard/tests/strings/addcslashes_001.phpt differ diff --git a/ext/standard/tests/strings/chop_basic.phpt b/ext/standard/tests/strings/chop_basic.phpt index a589dab02c..71407d65df 100644 Binary files a/ext/standard/tests/strings/chop_basic.phpt and b/ext/standard/tests/strings/chop_basic.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation7.phpt b/ext/standard/tests/strings/chunk_split_variation7.phpt index 55f6deb303..7591192151 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation7.phpt and b/ext/standard/tests/strings/chunk_split_variation7.phpt differ diff --git a/ext/standard/tests/strings/chunk_split_variation9.phpt b/ext/standard/tests/strings/chunk_split_variation9.phpt index ee6b85c185..858382aec5 100644 Binary files a/ext/standard/tests/strings/chunk_split_variation9.phpt and b/ext/standard/tests/strings/chunk_split_variation9.phpt differ diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt index 609f07b66d..38d4398688 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt @@ -83,8 +83,7 @@ unicode(103) "Roy's height > Sam's height 1111 & 0000 = 0000 "This is a double quoted string"" -- Iteration 4 -- -unicode(130) "Roy's height - > Sam 's height +unicode(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 60195b303c..96db0ddee1 100644 --- a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt +++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt @@ -43,17 +43,13 @@ unicode(99) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... & unicode(84) "Roy's height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string "" -- Iteration 2 -- unicode(82) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" unicode(82) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" unicode(92) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" unicode(72) "Roy's height > Sam's height... 13 < 15... - - " double quote string "" + " double quote string "" -- Iteration 3 -- unicode(44) " Roy's height > ; Sam's height " @@ -64,18 +60,10 @@ Roy's height > ; Sam's height " unicode(34) " Roy's height > ; Sam's height " -- Iteration 4 -- -unicode(44) " - Roy's height > -; Sam 's height" -unicode(44) " - Roy's height > -; Sam 's height" -unicode(44) " - Roy's height > -; Sam 's height" -unicode(34) " - Roy's height > -; Sam 's height" +unicode(44) " Roy's height > ; Sam 's height" +unicode(44) " Roy's height > ; Sam 's height" +unicode(44) " Roy's height > ; Sam 's height" +unicode(34) " Roy's height > ; Sam 's height" -- Iteration 5 -- unicode(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 9c031ac886..32f314c339 100644 --- a/ext/standard/tests/strings/nl2br.phpt +++ b/ext/standard/tests/strings/nl2br.phpt @@ -23,38 +23,23 @@ unicode(8) "
" unicode(7) "
" -unicode(7) "
-" +unicode(7) "
" unicode(8) "
- -" + " unicode(44) "
- -
-
-
-
-
-" +
+



" unicode(47) "
- -
-
- -
- +

+
+

" unicode(66) "
- -
-
+


-
-
-
-
-" +


+
" diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt index 8a49f8c47d..654e5583e3 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 -- -unicode(17) "Hello
-World" +unicode(17) "Hello
World" -- Iteration 4 -- -unicode(31) "
-Hello
-World
-" +unicode(31) "
Hello
World
" -- Iteration 5 -- unicode(18) "Hello
World" diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt index e6b0e5b754..ddd57ec03f 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 *** unicode(147) "

- -
- -
+
+


nn


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


r

+
+

-r
-n" +r
n" unicode(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 83baeb1945..a98a7ffddf 100644 --- a/ext/standard/tests/strings/nl2br_variation4.phpt +++ b/ext/standard/tests/strings/nl2br_variation4.phpt @@ -34,10 +34,8 @@ unicode(29) "Hello
world" unicode(19) "
" unicode(45) "
Hello
-world
-" +world
" unicode(37) "

-
-" +
" Done diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt index 236c5a4ce9..9697378fad 100644 Binary files a/ext/standard/tests/strings/str_split_variation3.phpt and b/ext/standard/tests/strings/str_split_variation3.phpt differ diff --git a/ext/standard/tests/strings/str_split_variation5.phpt b/ext/standard/tests/strings/str_split_variation5.phpt index 1b00fa8630..1f246e6fd9 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) { unicode(10) "it() Escap" [3]=> - unicode(7) "e -chars" + unicode(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 52c19a78bd..33c2fe0a02 100644 --- a/ext/standard/tests/strings/strip_tags_variation5.phpt +++ b/ext/standard/tests/strings/strip_tags_variation5.phpt @@ -89,8 +89,7 @@ unicode(67) "hello world This is a double quoted string" -- Iteration 4 -- -unicode(44) "hello - world +unicode(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 2f6b41d893..2c809f18bf 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 -- unicode(50) " $ -> This represents the dollar sign" -- Iteration 2 -- -unicode(59) " - The quick brown fo x jumped over the lazy dog

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

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

This is a paragraph

" -- Iteration 6 -- -unicode(62) "This is a text in bold letters -\s\malong with slashes +unicode(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 218ec4bdae..81aeb889cd 100644 Binary files a/ext/standard/tests/strings/strlen.phpt and b/ext/standard/tests/strings/strlen.phpt differ diff --git a/ext/standard/tests/strings/strrchr_variation5.phpt b/ext/standard/tests/strings/strrchr_variation5.phpt index bc2f0f3e87..48bde44394 100644 --- a/ext/standard/tests/strings/strrchr_variation5.phpt +++ b/ext/standard/tests/strings/strrchr_variation5.phpt @@ -39,26 +39,19 @@ echo "*** Done ***"; ?> --EXPECT-- *** Testing strrchr() function: with heredoc strings *** -unicode(33) " st - -ch - using +unicode(33) " st ch using \escape \seque ce" unicode(9) "\seque ce" -unicode(25) " - using +unicode(25) " using \escape \seque ce" unicode(9) "\seque ce" unicode(3) " ce" -unicode(33) " st - -ch - using +unicode(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 f631c2861e..e73ac13485 100644 Binary files a/ext/standard/tests/strings/strrev_variation1.phpt and b/ext/standard/tests/strings/strrev_variation1.phpt differ diff --git a/ext/standard/tests/strings/strtr_variation3.phpt b/ext/standard/tests/strings/strtr_variation3.phpt index a8d92595ec..9ed9155eb6 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 -- unicode(9) "SesSTsttE" -unicode(9) " es \stt -" +unicode(9) " es \stt " -- Iteration 2 -- unicode(12) "TtestTTstrtr" unicode(12) "\test\\strtr" diff --git a/ext/standard/tests/strings/ucwords_basic.phpt b/ext/standard/tests/strings/ucwords_basic.phpt index 3f5cecac8a..31fcb82e3c 100644 --- a/ext/standard/tests/strings/ucwords_basic.phpt +++ b/ext/standard/tests/strings/ucwords_basic.phpt @@ -75,8 +75,7 @@ unicode(16) "Testing Ucwords" -- Iteration 15 -- unicode(16) "Testing\rucwords" -- Iteration 16 -- -unicode(15) "Testing -Ucwords" +unicode(15) "Testing Ucwords" -- Iteration 17 -- unicode(16) "Testing\fucwords" -- Iteration 18 -- diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt index 05cd3e12a5..be805f5e19 100644 --- a/ext/standard/tests/strings/ucwords_variation2.phpt +++ b/ext/standard/tests/strings/ucwords_variation2.phpt @@ -80,15 +80,13 @@ unicode(52) "Testing Ucword() With Multiline String Using Heredoc" -- Iteration 4 -- -unicode(93) "Testing -Ucword(str) With +unicode(93) "Testing Ucword(str) With Multiline String Using Heredoc String.with Different White Spaces" -- Iteration 5 -- unicode(53) "12sting 123string 4567 -String 123string -12 Test +String 123string 12 Test 5test" -- Iteration 6 -- unicode(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 840d58ca60..4806f13396 100644 --- a/ext/standard/tests/strings/ucwords_variation4.phpt +++ b/ext/standard/tests/strings/ucwords_variation4.phpt @@ -92,8 +92,7 @@ unicode(24) " Testing Testing Ucwords" -- Iteration 13 -- unicode(26) "\ttesting\ttesting Ucwords" -- Iteration 14 -- -unicode(31) "Testing -Ucwords Testing Ucwords" +unicode(31) "Testing Ucwords Testing Ucwords" -- Iteration 15 -- unicode(32) "Testing\rucwords Testing Ucwords" -- Iteration 16 --