Skip to content

Commit 7b6eae5

Browse files
indeyetsindeyets
committed
fix tests corrupted by svn's eol-style=native
1 parent 03fa36f commit 7b6eae5

31 files changed

+76
-170
lines changed

‎ext/standard/tests/array/array_intersect_assoc_variation4.phpt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,14 @@ array(0) {
156156
-- Iteration 8 --
157157
array(1) {
158158
[u"h3"]=>
159-
unicode(88) "hello
160-
world
159+
unicode(88) "hello world
161160
1111 != 2222
162161
heredoc
163162
double quoted string. with different white spaces"
164163
}
165164
array(1) {
166165
[u"h3"]=>
167-
unicode(88) "hello
168-
world
166+
unicode(88) "hello world
169167
1111 != 2222
170168
heredoc
171169
double quoted string. with different white spaces"

‎ext/standard/tests/array/array_intersect_variation3.phpt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,11 @@ array(1) {
154154
-- Iterator 6 --
155155
array(1) {
156156
[1]=>
157-
unicode(5) "aaaa
158-
"
157+
unicode(5) "aaaa"
159158
}
160159
array(1) {
161160
[1]=>
162-
unicode(5) "aaaa
163-
"
161+
unicode(5) "aaaa"
164162
}
165163
-- Iterator 7 --
166164
array(1) {
@@ -174,8 +172,7 @@ array(1) {
174172
-- Iterator 8 --
175173
array(2) {
176174
[2]=>
177-
unicode(88) "hello
178-
world
175+
unicode(88) "hello world
179176
1111 != 2222
180177
heredoc
181178
double quoted string. with different white spaces"
@@ -188,8 +185,7 @@ double quoted string. with different white spaces"
188185
}
189186
array(2) {
190187
[2]=>
191-
unicode(88) "hello
192-
world
188+
unicode(88) "hello world
193189
1111 != 2222
194190
heredoc
195191
double quoted string. with different white spaces"

‎ext/standard/tests/array/array_unique_variation2.phpt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ array(4) {
116116
[0]=>
117117
%unicode|string%(3) "a "
118118
[1]=>
119-
%unicode|string%(5) "aaaa
120-
"
119+
%unicode|string%(5) "aaaa"
121120
[2]=>
122121
%unicode|string%(1) "b"
123122
[4]=>
@@ -145,8 +144,7 @@ The quick brown fox jumped over;
145144
the lazy dog
146145
This is a double quoted string"
147146
[%b|u%"h3"]=>
148-
%unicode|string%(88) "hello
149-
world
147+
%unicode|string%(88) "hello world
150148
1111 != 2222
151149
heredoc
152150
double quoted string. with different white spaces"

‎ext/standard/tests/array/asort_variation5.phpt‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ array(12) {
8080
unicode(1) " "
8181
[u" "]=>
8282
unicode(1) " "
83-
[u"
84-
"]=>
85-
unicode(1) "
86-
"
83+
[u""]=>
84+
unicode(1) ""
8785
[u"\a"]=>
8886
unicode(2) "\a"
8987
[u"\cx"]=>
@@ -112,10 +110,8 @@ array(12) {
112110
unicode(1) " "
113111
[u" "]=>
114112
unicode(1) " "
115-
[u"
116-
"]=>
117-
unicode(1) "
118-
"
113+
[u""]=>
114+
unicode(1) ""
119115
[u"\a"]=>
120116
unicode(2) "\a"
121117
[u"\cx"]=>
@@ -144,10 +140,8 @@ array(12) {
144140
unicode(1) " "
145141
[u" "]=>
146142
unicode(1) " "
147-
[u"
148-
"]=>
149-
unicode(1) "
150-
"
143+
[u""]=>
144+
unicode(1) ""
151145
[u"\a"]=>
152146
unicode(2) "\a"
153147
[u"\cx"]=>

‎ext/standard/tests/array/krsort_variation5.phpt‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ array(11) {
7676
unicode(3) "\cx"
7777
[u"\a"]=>
7878
unicode(2) "\a"
79-
[u"
80-
"]=>
81-
unicode(1) "
82-
"
79+
[u""]=>
80+
unicode(1) ""
8381
[u" "]=>
8482
unicode(1) " "
8583
[u" "]=>
@@ -106,10 +104,8 @@ array(11) {
106104
unicode(3) "\cx"
107105
[u"\a"]=>
108106
unicode(2) "\a"
109-
[u"
110-
"]=>
111-
unicode(1) "
112-
"
107+
[u""]=>
108+
unicode(1) ""
113109
[u" "]=>
114110
unicode(1) " "
115111
[u" "]=>
@@ -136,10 +132,8 @@ array(11) {
136132
unicode(3) "\cx"
137133
[u"\a"]=>
138134
unicode(2) "\a"
139-
[u"
140-
"]=>
141-
unicode(1) "
142-
"
135+
[u""]=>
136+
unicode(1) ""
143137
[u" "]=>
144138
unicode(1) " "
145139
[u" "]=>

‎ext/standard/tests/file/bug39538.phpt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ arsed
3232
Array
3333
(
3434
[0] =>
35-
36-
this is an test
35+
this is an test
3736
[1] => next data
3837
[2] => p
39-
40-
arsed
38+
arsed
4139
)

‎ext/standard/tests/file/fgetss_variation2.phpt‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ string(27) "rectly after 80 characters
113113
int(342)
114114
bool(false)
115115
-- Line 8 --
116-
string(41) "this is the text containing
117-
character
116+
string(41) "this is the text containing character
118117
"
119118
int(383)
120119
bool(false)
@@ -174,8 +173,7 @@ string(27) "rectly after 80 characters
174173
int(342)
175174
bool(false)
176175
-- Line 8 --
177-
string(41) "this is the text containing
178-
character
176+
string(41) "this is the text containing character
179177
"
180178
int(383)
181179
bool(false)
@@ -235,8 +233,7 @@ unicode(27) "rectly after 80 characters
235233
int(342)
236234
bool(false)
237235
-- Line 8 --
238-
unicode(41) "this is the text containing
239-
character
236+
unicode(41) "this is the text containing character
240237
"
241238
int(383)
242239
bool(false)
@@ -296,8 +293,7 @@ string(27) "rectly after 80 characters
296293
int(342)
297294
bool(false)
298295
-- Line 8 --
299-
string(41) "this is the text containing
300-
character
296+
string(41) "this is the text containing character
301297
"
302298
int(383)
303299
bool(false)
@@ -357,8 +353,7 @@ string(27) "rectly after 80 characters
357353
int(342)
358354
bool(false)
359355
-- Line 8 --
360-
string(41) "this is the text containing
361-
character
356+
string(41) "this is the text containing character
362357
"
363358
int(383)
364359
bool(false)
@@ -418,8 +413,7 @@ unicode(27) "rectly after 80 characters
418413
int(342)
419414
bool(false)
420415
-- Line 8 --
421-
unicode(41) "this is the text containing
422-
character
416+
unicode(41) "this is the text containing character
423417
"
424418
int(383)
425419
bool(false)

‎ext/standard/tests/general_functions/debug_zval_dump_b.phpt‎

0 Bytes
Binary file not shown.

‎ext/standard/tests/general_functions/print_r.phpt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -626,16 +626,13 @@ abcdefghijklmnop0qrstuvwx0yz
626626
-- Iteration 14 --
627627
1234
628628
5678
629-
9100
630-
abcda
629+
9100abcda
631630
1234
632631
5678
633-
9100
634-
abcda
632+
9100abcda
635633
1234
636634
5678
637-
9100
638-
abcda
635+
9100abcda
639636
*** Testing print_r() on boolean variables ***
640637

641638
-- Iteration 1 --

‎ext/standard/tests/general_functions/var_dump.phpt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,7 @@ unicode(34) "abcdefghijklmnop0qrstuvwx0yz"
462462
-- Iteration 14 --
463463
unicode(22) "1234
464464
5678
465-
9100
466-
abcda"
465+
9100abcda"
467466

468467
*** Testing var_dump() on boolean variables ***
469468
-- Iteration 1 --
@@ -1303,8 +1302,7 @@ array(14) {
13031302
[13]=>
13041303
unicode(22) "1234
13051304
5678
1306-
9100
1307-
abcda"
1305+
9100abcda"
13081306
}
13091307
array(15) {
13101308
[0]=>

0 commit comments

Comments
 (0)