Skip to content

Commit 534dbf9

Browse files
author
Mark Randall
committed
Additional latin-1 encoding fixes of files dealing with binary strings.
1 parent b15983b commit 534dbf9

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

ext/standard/tests/strings/strcasecmp.phpt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,44 +120,44 @@ Array
120120
(
121121
[0] => a
122122
[1] => A
123-
[2] =>
124-
[3] =>
123+
[2] =>
124+
[3] => ÿ
125125
[4] => %0
126126
)
127127

128128
Iteration 0
129129
- strcasecmp of 'a' and 'a' is => int(0)
130130
- strcasecmp of 'a' and 'A' is => int(0)
131-
- strcasecmp of 'a' and '' is => int(-%d)
132-
- strcasecmp of 'a' and '' is => int(-%d)
131+
- strcasecmp of 'a' and '' is => int(-%d)
132+
- strcasecmp of 'a' and 'ÿ' is => int(-%d)
133133
- strcasecmp of 'a' and '%0' is => int(%d)
134134

135135
Iteration 1
136136
- strcasecmp of 'A' and 'a' is => int(0)
137137
- strcasecmp of 'A' and 'A' is => int(0)
138-
- strcasecmp of 'A' and '' is => int(-%d)
139-
- strcasecmp of 'A' and '' is => int(-%d)
138+
- strcasecmp of 'A' and '' is => int(-%d)
139+
- strcasecmp of 'A' and 'ÿ' is => int(-%d)
140140
- strcasecmp of 'A' and '%0' is => int(%d)
141141

142142
Iteration 2
143-
- strcasecmp of '' and 'a' is => int(%d)
144-
- strcasecmp of '' and 'A' is => int(%d)
145-
- strcasecmp of '' and '' is => int(0)
146-
- strcasecmp of '' and '' is => int(-%d)
147-
- strcasecmp of '' and '%0' is => int(%d)
143+
- strcasecmp of '' and 'a' is => int(%d)
144+
- strcasecmp of '' and 'A' is => int(%d)
145+
- strcasecmp of '' and '' is => int(0)
146+
- strcasecmp of '' and 'ÿ' is => int(-%d)
147+
- strcasecmp of '' and '%0' is => int(%d)
148148

149149
Iteration 3
150-
- strcasecmp of '' and 'a' is => int(%d)
151-
- strcasecmp of '' and 'A' is => int(%d)
152-
- strcasecmp of '' and '' is => int(%d)
153-
- strcasecmp of '' and '' is => int(0)
154-
- strcasecmp of '' and '%0' is => int(%d)
150+
- strcasecmp of 'ÿ' and 'a' is => int(%d)
151+
- strcasecmp of 'ÿ' and 'A' is => int(%d)
152+
- strcasecmp of 'ÿ' and '' is => int(%d)
153+
- strcasecmp of 'ÿ' and 'ÿ' is => int(0)
154+
- strcasecmp of 'ÿ' and '%0' is => int(%d)
155155

156156
Iteration 4
157157
- strcasecmp of '%0' and 'a' is => int(-%d)
158158
- strcasecmp of '%0' and 'A' is => int(-%d)
159-
- strcasecmp of '%0' and '' is => int(-%d)
160-
- strcasecmp of '%0' and '' is => int(-%d)
159+
- strcasecmp of '%0' and '' is => int(-%d)
160+
- strcasecmp of '%0' and 'ÿ' is => int(-%d)
161161
- strcasecmp of '%0' and '%0' is => int(0)
162162

163163
*** comparing the strings in an

ext/standard/tests/strings/strcmp.phpt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ Array
122122
[1] => A
123123
[2] => a
124124
[3] => A
125-
[4] => ?
126-
[5] => ?
125+
[4] =>
126+
[5] => ÿ
127127
[6] => %0
128128
)
129129

@@ -132,62 +132,62 @@ Iteration 0
132132
- strcmp of 'a' and 'A' is => int(%d)
133133
- strcmp of 'a' and 'a' is => int(0)
134134
- strcmp of 'a' and 'A' is => int(%d)
135-
- strcmp of 'a' and '?' is => int(-%d)
136-
- strcmp of 'a' and '?' is => int(-%d)
135+
- strcmp of 'a' and '' is => int(-%d)
136+
- strcmp of 'a' and 'ÿ' is => int(-%d)
137137
- strcmp of 'a' and '%0' is => int(%d)
138138

139139
Iteration 1
140140
- strcmp of 'A' and 'a' is => int(-%d)
141141
- strcmp of 'A' and 'A' is => int(0)
142142
- strcmp of 'A' and 'a' is => int(-%d)
143143
- strcmp of 'A' and 'A' is => int(0)
144-
- strcmp of 'A' and '?' is => int(-%d)
145-
- strcmp of 'A' and '?' is => int(-%d)
144+
- strcmp of 'A' and '' is => int(-%d)
145+
- strcmp of 'A' and 'ÿ' is => int(-%d)
146146
- strcmp of 'A' and '%0' is => int(%d)
147147

148148
Iteration 2
149149
- strcmp of 'a' and 'a' is => int(0)
150150
- strcmp of 'a' and 'A' is => int(%d)
151151
- strcmp of 'a' and 'a' is => int(0)
152152
- strcmp of 'a' and 'A' is => int(%d)
153-
- strcmp of 'a' and '?' is => int(-%d)
154-
- strcmp of 'a' and '?' is => int(-%d)
153+
- strcmp of 'a' and '' is => int(-%d)
154+
- strcmp of 'a' and 'ÿ' is => int(-%d)
155155
- strcmp of 'a' and '%0' is => int(%d)
156156

157157
Iteration 3
158158
- strcmp of 'A' and 'a' is => int(-%d)
159159
- strcmp of 'A' and 'A' is => int(0)
160160
- strcmp of 'A' and 'a' is => int(-%d)
161161
- strcmp of 'A' and 'A' is => int(0)
162-
- strcmp of 'A' and '?' is => int(-%d)
163-
- strcmp of 'A' and '?' is => int(-%d)
162+
- strcmp of 'A' and '' is => int(-%d)
163+
- strcmp of 'A' and 'ÿ' is => int(-%d)
164164
- strcmp of 'A' and '%0' is => int(%d)
165165

166166
Iteration 4
167-
- strcmp of '?' and 'a' is => int(%d)
168-
- strcmp of '?' and 'A' is => int(%d)
169-
- strcmp of '?' and 'a' is => int(%d)
170-
- strcmp of '?' and 'A' is => int(%d)
171-
- strcmp of '?' and '?' is => int(0)
172-
- strcmp of '?' and '?' is => int(-%d)
173-
- strcmp of '?' and '%0' is => int(%d)
167+
- strcmp of '' and 'a' is => int(%d)
168+
- strcmp of '' and 'A' is => int(%d)
169+
- strcmp of '' and 'a' is => int(%d)
170+
- strcmp of '' and 'A' is => int(%d)
171+
- strcmp of '' and '' is => int(0)
172+
- strcmp of '' and 'ÿ' is => int(-%d)
173+
- strcmp of '' and '%0' is => int(%d)
174174

175175
Iteration 5
176-
- strcmp of '?' and 'a' is => int(%d)
177-
- strcmp of '?' and 'A' is => int(%d)
178-
- strcmp of '?' and 'a' is => int(%d)
179-
- strcmp of '?' and 'A' is => int(%d)
180-
- strcmp of '?' and '?' is => int(%d)
181-
- strcmp of '?' and '?' is => int(0)
182-
- strcmp of '?' and '%0' is => int(%d)
176+
- strcmp of 'ÿ' and 'a' is => int(%d)
177+
- strcmp of 'ÿ' and 'A' is => int(%d)
178+
- strcmp of 'ÿ' and 'a' is => int(%d)
179+
- strcmp of 'ÿ' and 'A' is => int(%d)
180+
- strcmp of 'ÿ' and '' is => int(%d)
181+
- strcmp of 'ÿ' and 'ÿ' is => int(0)
182+
- strcmp of 'ÿ' and '%0' is => int(%d)
183183

184184
Iteration 6
185185
- strcmp of '%0' and 'a' is => int(-%d)
186186
- strcmp of '%0' and 'A' is => int(-%d)
187187
- strcmp of '%0' and 'a' is => int(-%d)
188188
- strcmp of '%0' and 'A' is => int(-%d)
189-
- strcmp of '%0' and '?' is => int(-%d)
190-
- strcmp of '%0' and '?' is => int(-%d)
189+
- strcmp of '%0' and '' is => int(-%d)
190+
- strcmp of '%0' and 'ÿ' is => int(-%d)
191191
- strcmp of '%0' and '%0' is => int(0)
192192

193193
*** comparing the strings in an

ext/standard/tests/strings/strlen.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ String length of '' is => int(0)
137137
String length of ' ' is => int(1)
138138
String length of '%0' is => int(1)
139139
String length of '%00' is => int(2)
140-
String length of 'C' is => int(2)
140+
String length of '«C' is => int(2)
141141
String length of '%00' is => int(2)
142142
String length of '0' is => int(1)
143143
String length of '0' is => int(1)
@@ -155,7 +155,7 @@ String length of 'Hello, World
155155
String length of 'Hello, World ' is => int(13)
156156
String length of 'Hello, World\' is => int(13)
157157
String length of ' ' is => int(14)
158-
String length of '��A�%0' is => int(5)
158+
String length of '€êAÿ%0' is => int(5)
159159
String length of 'abcdefghijklmnopqrstuvwxyz0123456789~!@#$%^&*()_+=|?><-;:$
160160
[]{}{{{}}}[[[[]][]]]***&&&^^%$###@@!!@#$%&^&**/////|\\\
161161
abcdefghijklmnopqrstuvwxyz0123456789~!@#$%^&*()_+=|?><-;:$

0 commit comments

Comments
 (0)