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 2a62ea27eb800f98f04a7771b1983a469e2b4b66..667366cb71ca2c11c85c52a4947558f030a7d381 100644 (file)
--- 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\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_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt
index fea579eee207fd46b8bf204017850e223c281d34..3b9aa2a1c2c1890ca11bdda097b78791c6122c85 100644 (file)
--- 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\r"
 }
 array(1) {
   [1]=>
-  unicode(5) "aaaa
-"
+  unicode(5) "aaaa\r"
 }
 -- Iterator 7 --
 array(1) {
@@ -174,8 +172,7 @@ array(1) {
 -- Iterator 8 --
 array(2) {
   [2]=>
-  unicode(88) "hello
- world 
+  unicode(88) "hello\r world    
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"
@@ -188,8 +185,7 @@ double quoted string. with\vdifferent\fwhite\vspaces"
 }
 array(2) {
   [2]=>
-  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_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index 6e375f2494f041d0491e9f70807fa188c4e2b4b8..3cfcfba2b23c22efbdccef48837e10a0d63a6af1 100644 (file)
--- 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\v\f"
   [1]=>
-  %unicode|string%(5) "aaaa
-"
+  %unicode|string%(5) "aaaa\r"
   [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\r world   
 1111            != 2222\v\v
 heredoc
 double quoted string. with\vdifferent\fwhite\vspaces"

diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt
index 2c80491df18753b6c103422a472caaa656c34063..208da495c690a55fa14b89632b5eddeecc0653c3 100644 (file)
--- a/ext/standard/tests/array/asort_variation5.phpt
+++ b/ext/standard/tests/array/asort_variation5.phpt
@@ -80,10 +80,8 @@ array(12) {
   unicode(1) "\v"
   [u"\f"]=>
   unicode(1) "\f"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\a"]=>
   unicode(2) "\a"
   [u"\cx"]=>
@@ -112,10 +110,8 @@ array(12) {
   unicode(1) "\v"
   [u"\f"]=>
   unicode(1) "\f"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\a"]=>
   unicode(2) "\a"
   [u"\cx"]=>
@@ -144,10 +140,8 @@ array(12) {
   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/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt
index d259205ac2a115b554b4358b48ce2cc6f538144c..2e5c2d5e3b65dcd84fcb900b4536318e996ad3df 100644 (file)
--- 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"\r"]=>
+  unicode(1) "\r"
   [u"\f"]=>
   unicode(1) "\f"
   [u"\v"]=>
@@ -106,10 +104,8 @@ array(11) {
   unicode(3) "\cx"
   [u"\a"]=>
   unicode(2) "\a"
-  [u"
-"]=>
-  unicode(1) "
-"
+  [u"\r"]=>
+  unicode(1) "\r"
   [u"\f"]=>
   unicode(1) "\f"
   [u"\v"]=>
@@ -136,10 +132,8 @@ array(11) {
   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/file/bug39538.phpt b/ext/standard/tests/file/bug39538.phpt
index 504865e651ff8b7827127c89aebd57587ea3ec53..71b5dea61674055008cab492c7266aa7f69ab291 100644 (file)
--- 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
+\rthis is an test
     [1] => next data
     [2] => p
-
-arsed
+\rarsed
 )

diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt
index f9732997953335a362d8730a5b4b9b446177f0c8..2d0b85ef75af440d23f768b24d20a7604270dd1c 100644 (file)
--- 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 \r 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 \r 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 \r 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 \r 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 \r 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 \r 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 8a5eae329736c9399c6ada8892311cf98b1f8695..78109ad94696e0075e54bd5fb414f9604904a298 100644 (file)
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 8d506dc9ffc0918473ff1a2621d424866db1f742..81a523ad0bc90d645a89d55935b377e24d44aaf0 100644 (file)
--- a/ext/standard/tests/general_functions/print_r.phpt
+++ b/ext/standard/tests/general_functions/print_r.phpt
@@ -626,16 +626,13 @@ abcd\0efgh\0ijkl\0mnop\00qrst\0uvwx\00yz
 -- Iteration 14 --
 1234   
 5678
-       9100
-abcda
+       9100\rabcda
 1234   
 5678
-       9100
-abcda
+       9100\rabcda
 1234   
 5678
-       9100
-abcda
+       9100\rabcda
 *** 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 360af71e8eaf02fbfd5cc0783ea4a727ff519b8f..daead839b732368a3223a6f8eb725c0f90b94958 100644 (file)
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -462,8 +462,7 @@ unicode(34) "abcd\0efgh\0ijkl\0mnop\00qrst\0uvwx\00yz"
 -- Iteration 14 --
 unicode(22) "1234      
 5678
-       9100
-abcda"
+       9100\rabcda"
 
 *** Testing var_dump() on boolean variables ***
 -- Iteration 1 --
@@ -1303,8 +1302,7 @@ array(14) {
   [13]=>
   unicode(22) "1234    
 5678
-       9100
-abcda"
+       9100\rabcda"
 }
 array(15) {
   [0]=>

diff --git a/ext/standard/tests/strings/addcslashes_001.phpt b/ext/standard/tests/strings/addcslashes_001.phpt
index 28a30aa52e035e307614b2768598d14595f97c5d..734bd88b37acca507ccebf582a948bc7196dd284 100644 (file)
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 a589dab02c63ec17fe1761c9dbcd781f412d4557..71407d65df2536b562a4d55b8819f15ba7770a6e 100644 (file)
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 55f6deb3032cb66c41a332432104b4dec6960830..759119215192cfa32d7226f0f1bd55ec244d78b5 100644 (file)
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 ee6b85c185c243d51edf11796ecdfb7e69d1dbdb..858382aec51da2bd34bb25dc079ba6f7ad0a1929 100644 (file)
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 609f07b66dc82b0c42d9c72c8021eb67b742f80d..38d4398688d3a08b0b8c28c424f7cf835a598205 100644 (file)
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
@@ -83,8 +83,7 @@ unicode(103) "<html>Roy&#039;s height > Sam&#039;s height
 1111 & 0000 = 0000
 "This is a double quoted string""
 -- Iteration 4 --
-unicode(130) "<html>Roy&#039;s height
- > Sam &#039;s height
+unicode(130) "<html>Roy&#039;s height\r > Sam   &#039;s height
 1111            & 0000\v\v = \f0000
 " heredoc
 double quoted string. with\vdifferent\fwhite\vspaces""

diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt
index 60195b303c5e7b69cc7200657a8d9925b3262905..96db0ddee130550450fb8f4407db543b9c305f53 100644 (file)
--- 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&#039s height > Sam's $height... 1111 ≈ 0000 = 0000... &
 unicode(84) "Roy&#039s height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string ""
 -- Iteration 2 --
 unicode(82) "Roy&#039;s height > Sam&#039;s height...           13 < 15...
-
- " double quote\f\v string ""
+\r " double quote\f\v string ""
 unicode(82) "Roy&#039;s height > Sam&#039;s height...           13 < 15...
-
- " double quote\f\v string ""
+\r " double quote\f\v string ""
 unicode(92) "Roy&#039;s height > Sam&#039;s height...           13 < 15...
-
- &quot; double quote\f\v string &quot;"
+\r &quot; double quote\f\v string &quot;"
 unicode(72) "Roy's height > Sam's height...             13 < 15...
-
- " double quote\f\v string ""
+\r " double quote\f\v string ""
 -- Iteration 3 --
 unicode(44) "
 Roy&#039;s height &gt  ; Sam&#039;s\v height\f"
@@ -64,18 +60,10 @@ Roy&#039;s height &gt       ; Sam&#039;s\v height\f"
 unicode(34) "
 Roy's height &gt       ; Sam's\v height\f"
 -- Iteration 4 --
-unicode(44) "
-       Roy&#039;s height &gt
-; Sam  &#039;s height"
-unicode(44) "
-       Roy&#039;s height &gt
-; Sam  &#039;s height"
-unicode(44) "
-       Roy&#039;s height &gt
-; Sam  &#039;s height"
-unicode(34) "
-       Roy's height &gt
-; Sam  's height"
+unicode(44) "\r Roy&#039;s height &gt\r; Sam     &#039;s height"
+unicode(44) "\r Roy&#039;s height &gt\r; Sam     &#039;s height"
+unicode(44) "\r Roy&#039;s height &gt\r; Sam     &#039;s height"
+unicode(34) "\r Roy's height &gt\r; 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 9c031ac8863931f74fea9800d7036e63b2e25cb1..32f314c339cd5a2fc1e97884e817401ef0aa60f3 100644 (file)
--- a/ext/standard/tests/strings/nl2br.phpt
+++ b/ext/standard/tests/strings/nl2br.phpt
@@ -23,38 +23,23 @@ unicode(8) "<br />
 "
 unicode(7) "<br />
 "
-unicode(7) "<br />
-"
+unicode(7) "<br />\r"
 unicode(8) "<br />
-
-"
+\r"
 unicode(44) "<br />
-
-<br />
-<br />
-<br />
-<br />
-<br />
-"
+\r<br />
+<br />\r<br />\r<br />\r<br />\r"
 unicode(47) "<br />
-
-<br />
-<br />
-
-<br />
-
+\r<br />
 <br />
+\r<br />
+\r<br />
 <br />
 "
 unicode(66) "<br />
-
-<br />
-<br />
+\r<br />
 <br />
 <br />
-
 <br />
-<br />
-<br />
-<br />
-"
+\r<br />\r<br />\r<br />
+<br />\r"

diff --git a/ext/standard/tests/strings/nl2br_variation1.phpt b/ext/standard/tests/strings/nl2br_variation1.phpt
index 8a49f8c47dba2cb59ced87b513c40cdc5ca14f95..654e5583e306069111989a35f186fddbd7a18d43 100644 (file)
--- a/ext/standard/tests/strings/nl2br_variation1.phpt
+++ b/ext/standard/tests/strings/nl2br_variation1.phpt
@@ -56,13 +56,9 @@ Hello<br />
 World<br />
 "
 -- Iteration 3 --
-unicode(17) "Hello<br />
-World"
+unicode(17) "Hello<br />\rWorld"
 -- Iteration 4 --
-unicode(31) "<br />
-Hello<br />
-World<br />
-"
+unicode(31) "<br />\rHello<br />\rWorld<br />\r"
 -- Iteration 5 --
 unicode(18) "Hello<br />
 World"

diff --git a/ext/standard/tests/strings/nl2br_variation3.phpt b/ext/standard/tests/strings/nl2br_variation3.phpt
index e6b0e5b75449891766d47d2aaa426cc2e81a723c..ddd57ec03fdcf47fbee2a6ffd66b600c42a5028b 100644 (file)
--- 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) "<br />
 <br />
-
-<br />
-
-<br />
+\r<br />
+\r<br />
 <br />
 <br />
 nn<br />
 <br />
 <br />
 n<br />
-
-rr<br />
-<br />
-<br />
-r<br />
-<br />
-
-<br />
-
+\rrr<br />\r<br />\r<br />\rr<br />
 <br />
+\r<br />
+\r<br />
 <br />
-r<br />
-n"
+r<br />\rn"
 unicode(118) "Hello<br />
 World<br />
 This is        es       for <br />
@@ -68,8 +59,6 @@ This is       es       for <br />
 ew lines<br />
 like <br />
  <br />
- <br />
- <br />
-
- and etc"
+ <br />\r <br />
+\r and etc"
 Done

diff --git a/ext/standard/tests/strings/nl2br_variation4.phpt b/ext/standard/tests/strings/nl2br_variation4.phpt
index 83baeb194540c89d765edbfa7676cf90a006ebb5..a98a7ffddf4e46bf9588bd51bcdb6c3a9deaeaff 100644 (file)
--- a/ext/standard/tests/strings/nl2br_variation4.phpt
+++ b/ext/standard/tests/strings/nl2br_variation4.phpt
@@ -34,10 +34,8 @@ unicode(29) "<html>Hello<br />world</html>"
 unicode(19) "<html><br /></html>"
 unicode(45) "<html><br />
 Hello<br />
-world<br />
-</html>"
+world<br />\r</html>"
 unicode(37) "<html><br />
  <br />
- <br />
-</html>"
+ <br />\r</html>"
 Done

diff --git a/ext/standard/tests/strings/str_split_variation3.phpt b/ext/standard/tests/strings/str_split_variation3.phpt
index 236c5a4ce9cb6c683e70e89aaee25ee63bf6c1ea..9697378fad3d84602b109b859ba2049b93a15a61 100644 (file)
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 1b00fa8630b3009177da9265d003c55664a46548..1f246e6fd950152ef61dad3a595afae981f8d92c 100644 (file)
--- 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\rchars"
 }
 -- 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 52c19a78bd0ac9f3f12e554d77c78a5952f02dd9..33c2fe0a0213f540f3ad98f407779dec559b5f97 100644 (file)
--- a/ext/standard/tests/strings/strip_tags_variation5.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation5.phpt
@@ -89,8 +89,7 @@ unicode(67) "<html>hello world</html>
 
 This is a double quoted string"
 -- Iteration 4 --
-unicode(44) "<html>hello
- world 
+unicode(44) "<html>hello\r world        
 1111            != 2222\v\v</html>
 "
 -- Iteration 5 --

diff --git a/ext/standard/tests/strings/strip_tags_variation9.phpt b/ext/standard/tests/strings/strip_tags_variation9.phpt
index 2f6b41d89322b3b1e18fcbd4a18aae7471087f1e..2c809f18bf8f0197fdbbb64b51f59d7f0c6a768c 100644 (file)
--- 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) "<html> $ -> This represents the dollar sign</html>"
 -- Iteration 2 --
-unicode(59) "<html>    
-\v The quick brown fo\fx jumped over the lazy dog</p>"
+unicode(59) "<html>    \r\v The quick brown fo\fx jumped over the lazy dog</p>"
 -- Iteration 3 --
 unicode(31) "<a>This is a hyper text tag</a>"
 -- Iteration 4 --
@@ -50,7 +49,6 @@ unicode(0) ""
 -- Iteration 5 --
 unicode(26) "<p>This is a paragraph</p>"
 -- Iteration 6 --
-unicode(62) "<b>This is        a text in bold letters
-\s\malong with slashes
+unicode(62) "<b>This is        a text in bold letters\r\s\malong with slashes
 </b>"
 Done

diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index 218ec4bdae2eadbe6f64be89df07da0251f6e7b4..81aeb889cd7c5d626e0595487e15297fdae2d730 100644 (file)
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 bc2f0f3e877a32eb182487099b8354069812e526..48bde443940741f6232b94b29cbe0df009c2a163 100644 (file)
--- 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\r\rch\r using
 \escape \seque
 ce"
 unicode(9) "\seque
 ce"
-unicode(25) "
- using
+unicode(25) "\r using
 \escape \seque
 ce"
 unicode(9) "\seque
 ce"
 unicode(3) "
 ce"
-unicode(33) "   st
-
-ch
- using
+unicode(33) "   st\r\rch\r using
 \escape \seque
 ce"
 *** Done ***

diff --git a/ext/standard/tests/strings/strrev_variation1.phpt b/ext/standard/tests/strings/strrev_variation1.phpt
index f631c2861e3cd9b59f6d1b759920ee493df70ffc..e73ac13485de89b6ed046a9e1415e50a028995bb 100644 (file)
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 a8d92595ec9bf2499c553b2ede5d7c4bb34226ec..9ed9155eb6eafed18facda381229f17a2bdb06fe 100644 (file)
--- 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\r"
 -- 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 3f5cecac8ae9c4d51a49441e553e2b035c5cb11f..31fcb82e3cb32d18f6ee2d99dfc7f8d88e40f11f 100644 (file)
--- 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\rUcwords"
 -- 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 05cd3e12a5e3fc3120e771a6baa50bec52ac7536..be805f5e190e8f1f38df0b4fba841d848abf7ec9 100644 (file)
--- 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\rUcword(str)       With
 Multiline   String             Using
 Heredoc
 String.with\vDifferent\fWhite\vSpaces"
 -- Iteration 5 --
 unicode(53) "12sting 123string 4567
-String 123string
-12 Test
+String 123string\r12 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 840d58ca609fa3f56f161255b28fa171a77c0eda..4806f1339689d1bfbdfb6b3e06723a3c9110e826 100644 (file)
--- 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\rUcwords Testing Ucwords"
 -- Iteration 15 --
 unicode(32) "Testing\rucwords Testing Ucwords"
 -- Iteration 16 --