Skip to content

Commit d477abe

Browse files
duncan3dcduncan3dc
committed
Fix tests that depend on invalid count() behaviour
1 parent 063776f commit d477abe

File tree

7 files changed

+18
-44
lines changed

7 files changed

+18
-44
lines changed

‎ext/date/tests/timezone_transitions_get_variation2.phpt

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ foreach($inputs as $variation =>$timestamp_begin) {
102102
echo "\n-- $variation --\n";
103103
$tran = timezone_transitions_get($tz, $timestamp_begin, $timestamp_end);
104104
var_dump( gettype($tran) );
105-
var_dump( count($tran) );
105+
if (is_array($tran)) {
106+
var_dump( count($tran) );
107+
}
106108
};
107109

108110
// closing the resource
@@ -145,25 +147,21 @@ int(8)
145147

146148
Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
147149
string(7) "boolean"
148-
int(1)
149150

150151
-- int indexed array --
151152

152153
Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
153154
string(7) "boolean"
154-
int(1)
155155

156156
-- associative array --
157157

158158
Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
159159
string(7) "boolean"
160-
int(1)
161160

162161
-- nested arrays --
163162

164163
Warning: timezone_transitions_get() expects parameter 2 to be integer, array given in %s on line %d
165164
string(7) "boolean"
166-
int(1)
167165

168166
-- uppercase NULL --
169167
string(5) "array"
@@ -193,49 +191,41 @@ int(8)
193191

194192
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
195193
string(7) "boolean"
196-
int(1)
197194

198195
-- empty string SQ --
199196

200197
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
201198
string(7) "boolean"
202-
int(1)
203199

204200
-- string DQ --
205201

206202
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
207203
string(7) "boolean"
208-
int(1)
209204

210205
-- string SQ --
211206

212207
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
213208
string(7) "boolean"
214-
int(1)
215209

216210
-- mixed case string --
217211

218212
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
219213
string(7) "boolean"
220-
int(1)
221214

222215
-- heredoc --
223216

224217
Warning: timezone_transitions_get() expects parameter 2 to be integer, string given in %s on line %d
225218
string(7) "boolean"
226-
int(1)
227219

228220
-- instance of classWithToString --
229221

230222
Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
231223
string(7) "boolean"
232-
int(1)
233224

234225
-- instance of classWithoutToString --
235226

236227
Warning: timezone_transitions_get() expects parameter 2 to be integer, object given in %s on line %d
237228
string(7) "boolean"
238-
int(1)
239229

240230
-- undefined var --
241231
string(5) "array"
@@ -249,5 +239,4 @@ int(8)
249239

250240
Warning: timezone_transitions_get() expects parameter 2 to be integer, resource given in %s on line %d
251241
string(7) "boolean"
252-
int(1)
253242
===DONE===

‎ext/date/tests/timezone_transitions_get_variation3.phpt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ foreach($inputs as $variation =>$timestamp_end) {
102102
echo "\n-- $variation --\n";
103103
$tran = timezone_transitions_get($tz, $timestamp_begin, $timestamp_end);
104104
var_dump( gettype($tran) );
105+
if (is_array($tran)) {
105106
var_dump( count($tran) );
107+
}
106108
};
107109

108110
// closing the resource
@@ -145,25 +147,21 @@ int(1)
145147

146148
Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
147149
string(7) "boolean"
148-
int(1)
149150

150151
-- int indexed array --
151152

152153
Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
153154
string(7) "boolean"
154-
int(1)
155155

156156
-- associative array --
157157

158158
Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
159159
string(7) "boolean"
160-
int(1)
161160

162161
-- nested arrays --
163162

164163
Warning: timezone_transitions_get() expects parameter 3 to be integer, array given in %s on line %d
165164
string(7) "boolean"
166-
int(1)
167165

168166
-- uppercase NULL --
169167
string(5) "array"
@@ -193,49 +191,41 @@ int(1)
193191

194192
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
195193
string(7) "boolean"
196-
int(1)
197194

198195
-- empty string SQ --
199196

200197
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
201198
string(7) "boolean"
202-
int(1)
203199

204200
-- string DQ --
205201

206202
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
207203
string(7) "boolean"
208-
int(1)
209204

210205
-- string SQ --
211206

212207
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
213208
string(7) "boolean"
214-
int(1)
215209

216210
-- mixed case string --
217211

218212
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
219213
string(7) "boolean"
220-
int(1)
221214

222215
-- heredoc --
223216

224217
Warning: timezone_transitions_get() expects parameter 3 to be integer, string given in %s on line %d
225218
string(7) "boolean"
226-
int(1)
227219

228220
-- instance of classWithToString --
229221

230222
Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
231223
string(7) "boolean"
232-
int(1)
233224

234225
-- instance of classWithoutToString --
235226

236227
Warning: timezone_transitions_get() expects parameter 3 to be integer, object given in %s on line %d
237228
string(7) "boolean"
238-
int(1)
239229

240230
-- undefined var --
241231
string(5) "array"
@@ -249,5 +239,4 @@ int(1)
249239

250240
Warning: timezone_transitions_get() expects parameter 3 to be integer, resource given in %s on line %d
251241
string(7) "boolean"
252-
int(1)
253242
===DONE===

‎ext/exif/tests/bug62523_1.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ extension_loaded("exif") or die("skip need exif");
77
--FILE--
88
<?php
99
echo "Test\n";
10-
var_dump(count(exif_read_data(__DIR__."/bug62523_1.jpg")));
10+
var_dump(exif_read_data(__DIR__."/bug62523_1.jpg"));
1111
?>
1212
Done
1313
--EXPECTF--
1414
Test
1515

1616
Warning: exif_read_data(bug62523_1.jpg): File not supported in %sbug62523_1.php on line %d
17-
int(1)
17+
bool(false)
1818
Done

‎ext/exif/tests/bug62523_3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ extension_loaded("exif") or die("skip need exif");
77
--FILE--
88
<?php
99
echo "Test\n";
10-
var_dump(count(exif_read_data(__DIR__."/bug62523_3.jpg")));
10+
var_dump(exif_read_data(__DIR__."/bug62523_3.jpg"));
1111
?>
1212
Done
1313
--EXPECTF--
1414
Test
1515

1616
Warning: exif_read_data(bug62523_3.jpg): File not supported in %sbug62523_3.php on line %d
17-
int(1)
17+
bool(false)
1818
Done

‎ext/filter/tests/bug71063.phpt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ PATH=/
88
variables_order=E
99
--FILE--
1010
<?php
11-
var_dump(count($_ENV['PATH']) > 0);
12-
var_dump(count(filter_input(INPUT_ENV, 'PATH')) > 0);
11+
var_dump(filter_input(INPUT_ENV, 'PATH') === $_ENV['PATH']);
1312
?>
14-
--EXPECT--
15-
bool(true)
13+
--EXPECTF--
1614
bool(true)

‎ext/simplexml/tests/000.phpt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ function test($what)
1313
echo "===$what\n";
1414
eval("var_dump(isset(\$$what));");
1515
eval("var_dump((bool)\$$what);");
16-
eval("var_dump(count(\$$what));");
16+
eval(<<<EVAL
17+
if (\$$what instanceof SimpleXMLElement) {
18+
var_dump(count(\$$what));
19+
}
20+
EVAL
21+
);
1722
eval("var_dump(\$$what);");
1823
}
1924

@@ -201,7 +206,6 @@ object(SimpleXMLElement)#%d (1) {
201206
===sxe->elem1[2]
202207
bool(false)
203208
bool(false)
204-
int(0)
205209
NULL
206210
===sxe->elem11
207211
bool(true)
@@ -239,16 +243,13 @@ object(SimpleXMLElement)#%d (0) {
239243
===sxe->elem22->elem222
240244
bool(false)
241245
bool(false)
242-
int(0)
243246
NULL
244247
===sxe->elem22->attr22
245248
bool(false)
246249
bool(false)
247-
int(0)
248250
NULL
249251
===sxe->elem22["attr22"]
250252
bool(false)
251253
bool(false)
252-
int(0)
253254
NULL
254255
===DONE===

‎ext/simplexml/tests/bug35785.phpt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ $xml = simplexml_load_string("<root></root>");
99
$xml->bla->posts->name = "FooBar";
1010
echo $xml->asXML();
1111
$xml = simplexml_load_string("<root></root>");
12-
$count = count($xml->bla->posts);
13-
var_dump($count);
14-
$xml->bla->posts[$count]->name = "FooBar";
12+
$xml->bla->posts[0]->name = "FooBar";
1513
echo $xml->asXML();
1614
$xml = simplexml_load_string("<root></root>");
1715
$xml->bla->posts[]->name = "FooBar";
@@ -22,7 +20,6 @@ echo $xml->asXML();
2220
--EXPECTF--
2321
<?xml version="1.0"?>
2422
<root><bla><posts><name>FooBar</name></posts></bla></root>
25-
int(0)
2623
<?xml version="1.0"?>
2724
<root><bla><posts><name>FooBar</name></posts></bla></root>
2825
<?xml version="1.0"?>

0 commit comments

Comments
 (0)