fix tests corrupted by svn's eol-style=native

ext/json/tests/pass001.1.phpt

@@ -220,8 +220,7 @@ array(14) {
     string(1) "\"
     ["controls"]=>
     string(5) "
-
-	"
+
 	"
     ["slash"]=>
     string(5) "/ & /"
@@ -334,8 +333,7 @@ array(14) {
     string(49) "{"object with 1 member":["array with 1 element"]}"
     ["quotes"]=>
     string(27) "" " %22 0x22 034 ""
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["/\"쫾몾ꮘﳞ볚
 
 	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     string(23) "A key can be any string"
@@ -401,8 +399,7 @@ array(14) {
     string(1) """
     ["backslash"]=>
     string(1) "\"
-
-	"
+    ["controls"]=>
     string(5) "
 
 	"
@@ -515,8 +512,7 @@ array(14) {
     }
     ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["quotes"]=>
     string(27) "&#34; " %22 0x22 034 &#x22;"
     ["/\"쫾몾ꮘﳞ볚
 
@@ -586,8 +582,7 @@ array(14) {
     string(1) " "
     ["quote"]=>
     string(1) """
-
-	"
+    ["backslash"]=>
     string(1) "\"
     ["controls"]=>
     string(5) "
@@ -700,8 +695,7 @@ array(14) {
       [6]=>
       int(7)
     }
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"
     ["quotes"]=>
     string(27) "&#34; " %22 0x22 034 &#x22;"
@@ -767,8 +761,7 @@ array(14) {
     int(1)
     ["space"]=>
     string(1) " "
-
-	"
+    ["quote"]=>
     string(1) """
     ["backslash"]=>
     string(1) "\"
@@ -881,8 +874,7 @@ array(14) {
       [5]=>
       int(6)
       [6]=>
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+      int(7)
     }
     ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"

ext/json/tests/pass001.phpt

@@ -202,8 +202,7 @@ array(14) {
     string(1) "\"
     ["controls"]=>
     string(5) "
-
-	"
+
 	"
     ["slash"]=>
     string(5) "/ & /"
@@ -275,8 +274,7 @@ array(14) {
     string(49) "{"object with 1 member":["array with 1 element"]}"
     ["quotes"]=>
     string(27) "" " %22 0x22 034 ""
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["/\"쫾몾ꮘﳞ볚
 
 	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
     string(23) "A key can be any string"
@@ -340,8 +338,7 @@ array(14) {
     string(1) """
     ["backslash"]=>
     string(1) "\"
-
-	"
+    ["controls"]=>
     string(5) "
 
 	"
@@ -413,8 +410,7 @@ array(14) {
     }
     ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["quotes"]=>
     string(27) "&#34; " %22 0x22 034 &#x22;"
     ["/\"쫾몾ꮘﳞ볚
 
@@ -482,8 +478,7 @@ array(14) {
     string(1) " "
     ["quote"]=>
     string(1) """
-
-	"
+    ["backslash"]=>
     string(1) "\"
     ["controls"]=>
     string(5) "
@@ -555,8 +550,7 @@ array(14) {
       [6]=>
       int(7)
     }
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+    ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"
     ["quotes"]=>
     string(27) "&#34; " %22 0x22 034 &#x22;"
@@ -620,8 +614,7 @@ array(14) {
     int(1)
     ["space"]=>
     string(1) " "
-
-	"
+    ["quote"]=>
     string(1) """
     ["backslash"]=>
     string(1) "\"
@@ -693,8 +686,7 @@ array(14) {
       [5]=>
       int(6)
       [6]=>
-
-	`1~!@#$%^&*()_+-=[]{}|;:',./<>?"]=>
+      int(7)
     }
     ["jsontext"]=>
     string(49) "{"object with 1 member":["array with 1 element"]}"

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"]=>
@@ -162,13 +160,11 @@ This is a double quoted string"]=>
 This is a double quoted string"]=>
   string(88) "hello world
 The quick brown fox jumped over;
-  ["hello
- world	
+the lazy dog
 This is a double quoted string"
   ["hello
  world	
-  string(88) "hello
- world	
+1111		 != 2222
 heredoc
 double quoted string. withdifferentwhitespaces"]=>
   string(88) "hello

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. withdifferentwhitespaces"
 }
 array(1) {
-  string(88) "hello
- world	
+  ["h3"]=>
   string(88) "hello
  world	
 1111		 != 2222

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. withdifferentwhitespaces"
 }
 array(1) {
-  string(88) "hello
- world	
+  ["h3"]=>
   string(88) "hello
  world	
 1111		 != 2222

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) {
-  string(5) "aaaa
-"
+  [1]=>
   string(5) "aaaa
 "
 }
@@ -174,8 +172,7 @@ array(1) {
   string(6) "aaaa\r"
 }
 -- Iterator 8 --
-  string(88) "hello
- world	
+array(2) {
   [2]=>
   string(88) "hello
  world	
@@ -188,8 +185,7 @@ double quoted string. withdifferentwhitespaces"
 "double quoted string"
 2222 != 1111.	 0000 = 0000
 "
-  string(88) "hello
- world	
+}
 array(2) {
   [2]=>
   string(88) "hello

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) {
-  string(5) "aaaa
-"
+  [10]=>
   string(5) "aaaa
 "
 }
@@ -191,8 +189,7 @@ array(2) {
 'single quoted string'
 "double quoted string"
 2222 != 1111.	 0000 = 0000
-  string(88) "hello
- world	
+"
   [12]=>
   string(88) "hello
  world	
@@ -205,8 +202,7 @@ array(2) {
   string(90) "11 < 12. 123 >22
 'single quoted string'
 "double quoted string"
-  string(88) "hello
- world	
+2222 != 1111.	 0000 = 0000
 "
   [12]=>
   string(88) "hello

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"
@@ -253,8 +252,7 @@ array(8) {
 array(8) {
   [0]=>
   string(3) "a"
-  string(5) "aaaa
-"
+  [1]=>
   string(5) "aaaa
 "
   [2]=>
@@ -325,8 +323,7 @@ The quick brown fox jumped over;
   string(88) "hello world
 The quick brown fox jumped over;
 the lazy dog
-  string(88) "hello
- world	
+This is a double quoted string"
   ["h3"]=>
   string(88) "hello
  world	
@@ -342,8 +339,7 @@ The quick brown fox jumped over;
   ["h2"]=>
   string(88) "hello world
 The quick brown fox jumped over;
-  string(88) "hello
- world	
+the lazy dog
 This is a double quoted string"
   ["h3"]=>
   string(88) "hello

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
 "
-  string(25) "Hello	 world!! 
-string
+  [3]=>
   string(25) "Hello	 world!! 
 string
 "
 }
-  string(25) "Hello	 world!! 
-string
+array(4) {
   [0]=>
   string(25) "Hello	 world!! 
-  string(25) "Hello	 world!! 
-string
+string
 "
   [1]=>
   string(25) "Hello	 world!! 

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"
@@ -261,8 +260,7 @@ array(6) {
   string(5) "HELLO"
   [2]=>
   string(3) "a"
-  string(5) "aaaa
-"
+  [3]=>
   string(5) "aaaa
 "
   [4]=>
@@ -308,8 +306,7 @@ The big brown fox jumped over;
   string(86) "hello world
 The big brown fox jumped over;
 the lazy dog
-  string(88) "hello
- world	
+This is a double quoted string"
   ["h3"]=>
   string(88) "hello
  world	
@@ -338,8 +335,7 @@ The big brown fox jumped over;
   ["h2"]=>
   string(86) "hello world
 The big brown fox jumped over;
-  string(88) "hello
- world	
+the lazy dog
 This is a double quoted string"
   ["h3"]=>
   string(88) "hello

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"
@@ -145,8 +144,7 @@ The quick brown fox jumped over;
 The quick brown fox jumped over;
 the lazy dog
 This is a double quoted string"
-  string(87) "hello
- world
+  ["h3"]=>
   string(87) "hello
  world
 1111		 != 2222

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"
@@ -105,8 +104,7 @@ array(5) {
 }
 int(7)
 array(7) {
-  string(49) "	
- The quick brown fox jumped over the lazy dog"
+  [0]=>
   string(49) "	
  The quick brown fox jumped over the lazy dog"
   [1]=>
@@ -186,8 +184,7 @@ array(7) {
 }
 -- Iteration 5 --
 int(5)
-  string(70) "This is 	a text in bold letters
-\s\malong with slashes
+array(5) {
   [0]=>
   string(70) "This is 	a text in bold letters
 \s\malong with slashes
@@ -201,8 +198,7 @@ array(5) {
   [2]=>
   float(2.222)
 }
-  string(70) "This is 	a text in bold letters
-\s\malong with slashes
+int(7)
 array(7) {
   [0]=>
   string(70) "This is 	a text in bold letters

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
@@ -218,8 +217,7 @@ double quoted string. withdifferentwhitespaces"
 }
 int(7)
 array(7) {
-  string(88) "hello
- world	
+  [0]=>
   string(88) "hello
  world	
 1111		 != 2222

ext/standard/tests/array/arsort_variation5.phpt

@@ -76,10 +76,8 @@ array(12) {
   string(3) "\cx"
   ["\a"]=>
   string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
+  ["
+"]=>
   string(1) "
 "
   [""]=>
@@ -108,10 +106,8 @@ array(12) {
   string(4) "\ddd"
   ["\cx"]=>
   string(3) "\cx"
-  ["
-"]=>
-  string(1) "
-"
+  ["\a"]=>
+  string(2) "\a"
   ["
 "]=>
   string(1) "
@@ -140,10 +136,8 @@ array(12) {
   string(2) "\e"
   ["\ddd"]=>
   string(4) "\ddd"
-  ["
-"]=>
-  string(1) "
-"
+  ["\cx"]=>
+  string(3) "\cx"
   ["\a"]=>
   string(2) "\a"
   ["

ext/standard/tests/array/asort_variation5.phpt

@@ -80,10 +80,8 @@ array(12) {
   string(1) ""
   [""]=>
   string(1) ""
-  ["
-"]=>
-  string(1) "
-"
+  ["
+"]=>
   string(1) "
 "
   ["\a"]=>
@@ -112,10 +110,8 @@ array(12) {
 "
   [""]=>
   string(1) ""
-  ["
-"]=>
-  string(1) "
-"
+  [""]=>
+  string(1) ""
   ["
 "]=>
   string(1) "
@@ -144,10 +140,8 @@ array(12) {
 "]=>
   string(1) "
 "
-  ["
-"]=>
-  string(1) "
-"
+  [""]=>
+  string(1) ""
   [""]=>
   string(1) ""
   ["

ext/standard/tests/array/krsort_variation5.phpt

@@ -76,10 +76,8 @@ array(11) {
   string(3) "\cx"
   ["\a"]=>
   string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
+  ["
+"]=>
   string(1) "
 "
   [""]=>
@@ -106,10 +104,8 @@ array(11) {
   string(4) "\ddd"
   ["\cx"]=>
   string(3) "\cx"
-  ["
-"]=>
-  string(1) "
-"
+  ["\a"]=>
+  string(2) "\a"
   ["
 "]=>
   string(1) "
@@ -136,10 +132,8 @@ array(11) {
   string(2) "\e"
   ["\ddd"]=>
   string(4) "\ddd"
-  ["
-"]=>
-  string(1) "
-"
+  ["\cx"]=>
+  string(3) "\cx"
   ["\a"]=>
   string(2) "\a"
   ["

ext/standard/tests/array/ksort_variation5.phpt

@@ -78,10 +78,8 @@ array(11) {
   string(1) ""
   [""]=>
   string(1) ""
-  ["
-"]=>
-  string(1) "
-"
+  ["
+"]=>
   string(1) "
 "
   ["\a"]=>
@@ -108,10 +106,8 @@ array(11) {
 "
   [""]=>
   string(1) ""
-  ["
-"]=>
-  string(1) "
-"
+  [""]=>
+  string(1) ""
   ["
 "]=>
   string(1) "
@@ -138,10 +134,8 @@ array(11) {
 "]=>
   string(1) "
 "
-  ["
-"]=>
-  string(1) "
-"
+  [""]=>
+  string(1) ""
   [""]=>
   string(1) ""
   ["

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"
@@ -104,8 +103,7 @@ array(12) {
   string(1) ""
   [5]=>
   string(1) ""
-  string(1) "
-"
+  [6]=>
   string(1) "
 "
   [7]=>
@@ -134,8 +132,7 @@ array(12) {
   [4]=>
   string(1) ""
   [5]=>
-  string(1) "
-"
+  string(1) ""
   [6]=>
   string(1) "
 "

ext/standard/tests/file/bug39538.phpt

@@ -32,10 +32,8 @@ arsed
 Array
 (
     [0] => 
-
-this is an test
+
 this is an test
     [1] => next data
-
-arsed
+    [2] => p
 

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)
@@ -174,8 +173,7 @@ string(27) "rectly after 80 characters
 "
 int(342)
 bool(false)
-string(41) "this is the text containing 
- character 
+-- Line 8 --
 string(41) "this is the text containing 
  character 
 "
@@ -235,8 +233,7 @@ string(27) "rectly after 80 characters
 string(27) "rectly after 80 characters
 "
 int(342)
-string(41) "this is the text containing 
- character 
+bool(false)
 -- Line 8 --
 string(41) "this is the text containing 
  character 
@@ -296,8 +293,7 @@ string(27) "rectly after 80 characters
 -- Line 7 --
 string(27) "rectly after 80 characters
 "
-string(41) "this is the text containing 
- character 
+int(342)
 bool(false)
 -- Line 8 --
 string(41) "this is the text containing 
@@ -357,8 +353,7 @@ string(27) "rectly after 80 characters
 bool(false)
 -- Line 7 --
 string(27) "rectly after 80 characters
-string(41) "this is the text containing 
- character 
+"
 int(342)
 bool(false)
 -- Line 8 --
@@ -418,8 +413,7 @@ string(27) "rectly after 80 characters
 int(315)
 bool(false)
 -- Line 7 --
-string(41) "this is the text containing 
- character 
+string(27) "rectly after 80 characters
 "
 int(342)
 bool(false)

ext/standard/tests/general_functions/print_r.phpt

@@ -626,16 +626,13 @@ abcdefghijklmnop0qrstuvwx0yz
 -- Iteration 14 --
 1234	
 5678
-	9100
-abcda
+	9100
 abcda
 1234	
-	9100
-abcda
+5678
 	9100
 abcda
-	9100
-abcda
+1234	
 5678
 	9100
 abcda

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 ***
@@ -1303,8 +1302,7 @@ array(14) {
   string(34) "abcdefghijklmnop0qrstuvwx0yz"
   [13]=>
   string(22) "1234	
-	9100
-abcda"
+5678
 	9100
 abcda"
 }

ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt

@@ -83,8 +83,7 @@ string(103) "<html>Roy&#039;s height > Sam&#039;s height
 1111 & 0000 = 0000
 "This is a double quoted string""
 -- Iteration 4 --
-string(130) "<html>Roy&#039;s height
- > Sam	&#039;s height
+string(130) "<html>Roy&#039;s height
  > Sam	&#039;s height
 1111		 & 0000 = 0000
 " heredoc

ext/standard/tests/strings/htmlspecialchars_decode_variation5.phpt

@@ -43,17 +43,13 @@ string(99) "Roy&#039s height > Sam's $height... 1111 ≈ 0000 = 0000... &q
 string(84) "Roy&#039s height > Sam's $height... 1111 ≈ 0000 = 0000... " double quote string ""
 -- Iteration 2 --
 string(82) "Roy&#039;s height > Sam&#039;s height... 		 13 < 15...
-
- " double quote string ""
+
  " double quote string ""
-
- " double quote string ""
+string(82) "Roy&#039;s height > Sam&#039;s height... 		 13 < 15...
 
-
- &quot; double quote string &quot;"
+ " double quote string ""
 string(92) "Roy&#039;s height > Sam&#039;s height... 		 13 < 15...
-
- " double quote string ""
+
  &quot; double quote string &quot;"
 string(72) "Roy's height > Sam's height... 		 13 < 15...
 
@@ -64,18 +60,10 @@ Roy&#039;s height &gt	; Sam&#039;s height"
 string(44) "
 Roy&#039;s height &gt	; Sam&#039;s height"
 string(44) "
-string(44) "
-	Roy&#039;s height &gt
-; Sam	&#039;s height"
-string(44) "
-	Roy&#039;s height &gt
-; Sam	&#039;s height"
-string(44) "
-	Roy&#039;s height &gt
-; Sam	&#039;s height"
-string(34) "
-	Roy's height &gt
-; Sam	's height"
+Roy&#039;s height &gt	; Sam&#039;s height"
+string(34) "
+Roy's height &gt	; Sam's height"
+-- Iteration 4 --
 string(44) "
 	Roy&#039;s height &gt
 ; Sam	&#039;s height"

ext/standard/tests/strings/nl2br.phpt

@@ -23,38 +23,23 @@ string(8) "<br />
 "
 string(7) "<br />
 "
-string(7) "<br />
-"
+string(7) "<br />
 "
-
-"
+string(8) "<br />
 
-
-<br />
-<br />
-<br />
-<br />
-<br />
-"
+"
+string(44) "<br />
 
-
-<br />
-<br />
-
-<br />
-
+<br />
 <br />
+<br />
+<br />
 <br />
 "
 string(47) "<br />
-
+
 <br />
 <br />
 
-<br />
-
-<br />
-<br />
-<br />
-<br />
-"
+<br />
+

ext/standard/tests/strings/nl2br_variation1.phpt

@@ -56,13 +56,9 @@ Hello<br />
 World<br />
 "
 -- Iteration 3 --
-string(17) "Hello<br />
-World"
+string(17) "Hello<br />
 World"
-string(31) "<br />
-Hello<br />
-World<br />
-"
+-- Iteration 4 --
 string(31) "<br />
 Hello<br />
 World<br />

ext/standard/tests/strings/nl2br_variation3.phpt

@@ -38,29 +38,20 @@ echo "Done";
 *** Testing nl2br() : usage variations ***
 string(147) "<br />
 <br />
-
-<br />
-
-<br />
+
+<br />
 
 <br />
 <br />
 <br />
 nn<br />
 <br />
-
-rr<br />
+<br />
 n<br />
+
+rr<br />
 <br />
-r<br />
-<br />
-
-<br />
-
-<br />
-<br />
-r<br />
-n"
+<br />
 r<br />
 <br />
 
@@ -68,8 +59,6 @@ This is 	es	 for <br />
 
 <br />
 <br />
- <br />
- <br />
-
- and etc"
+r<br />
+n"
 string(118) "Hello<br />

ext/standard/tests/strings/nl2br_variation4.phpt

@@ -34,10 +34,8 @@ string(29) "<html>Hello<br />world</html>"
 string(19) "<html><br /></html>"
 string(45) "<html><br />
 Hello<br />
-world<br />
-</html>"
+world<br />
 </html>"
 string(37) "<html><br />
- <br />
-</html>"
+ <br />
  <br />

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 --

ext/standard/tests/strings/strip_tags_variation5.phpt

@@ -89,8 +89,7 @@ string(67) "<html>hello world</html>
 
 This is a double quoted string"
 -- Iteration 4 --
-string(44) "<html>hello
- world	
+string(44) "<html>hello
  world	
 1111		 != 2222</html>
 "

ext/standard/tests/strings/strip_tags_variation9.phpt

@@ -41,8 +41,7 @@ echo "Done";
 -- Iteration 1 --
 string(50) "<html> $ -> This represents the dollar sign</html>"
 -- Iteration 2 --
-string(59) "<html>	
- The quick brown fox jumped over the lazy dog</p>"
+string(59) "<html>	
  The quick brown fox jumped over the lazy dog</p>"
 -- Iteration 3 --
 string(31) "<a>This is a hyper text tag</a>"
@@ -50,7 +49,6 @@ string(0) ""
 string(0) ""
 -- Iteration 5 --
 string(26) "<p>This is a paragraph</p>"
-string(62) "<b>This is 	a text in bold letters
-\s\malong with slashes
+-- Iteration 6 --
 string(62) "<b>This is 	a text in bold letters
 \s\malong with slashes

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
-string(25) "
- using
+ce"
 string(9) "\seque
 ce"
 string(25) "
  using
-string(33) "	 st
-
-ch
- using
+\escape \seque
 ce"
 string(9) "\seque
 ce"

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"

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"

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.withDifferentWhiteSpaces"
 -- Iteration 5 --
-String	123string
-12 Test
+string(53) "12sting 123string 4567
 String	123string
 12 Test
 5test"

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"