archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix tests: don't count non-countables

Browse source
This commit is contained in:
Christoph M. Becker 2016-11-13 18:16:17 +01:00
parent 5a4bad7b5f
commit 1ccada35c0
5 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/exif/tests/bug62523_1.phpt
View file

@ -7,12 +7,12 @@ extension_loaded("exif") or die("skip need exif");
--FILE-- --FILE--
<?php <?php
echo "Test\n"; echo "Test\n";
var_dump(count(exif_read_data(__DIR__."/bug62523_1.jpg"))); var_dump(exif_read_data(__DIR__."/bug62523_1.jpg"));
?> ?>
Done Done
--EXPECTF-- --EXPECTF--
Test Test
Warning: exif_read_data(bug62523_1.jpg): File not supported in %sbug62523_1.php on line %d Warning: exif_read_data(bug62523_1.jpg): File not supported in %sbug62523_1.php on line %d
int(1) bool(false)
Done Done

4
ext/exif/tests/bug62523_3.phpt
View file

@ -7,12 +7,12 @@ extension_loaded("exif") or die("skip need exif");
--FILE-- --FILE--
<?php <?php
echo "Test\n"; echo "Test\n";
var_dump(count(exif_read_data(__DIR__."/bug62523_3.jpg"))); var_dump(exif_read_data(__DIR__."/bug62523_3.jpg"));
?> ?>
Done Done
--EXPECTF-- --EXPECTF--
Test Test
Warning: exif_read_data(bug62523_3.jpg): File not supported in %sbug62523_3.php on line %d Warning: exif_read_data(bug62523_3.jpg): File not supported in %sbug62523_3.php on line %d
int(1) bool(false)
Done Done

8
ext/filter/tests/bug71063.phpt
View file

@ -8,9 +8,9 @@ PATH=/
variables_order=E variables_order=E
--FILE-- --FILE--
<?php <?php
var_dump(count($_ENV['PATH']) > 0); var_dump($_ENV['PATH']);
var_dump(count(filter_input(INPUT_ENV, 'PATH')) > 0); var_dump(filter_input(INPUT_ENV, 'PATH'));
?> ?>
--EXPECT-- --EXPECT--
bool(true) string(1) "/"
bool(true) string(1) "/"

9
ext/simplexml/tests/000.phpt
View file

@ -13,7 +13,7 @@ function test($what)
echo "===$what\n"; echo "===$what\n";
eval("var_dump(isset(\$$what));"); eval("var_dump(isset(\$$what));");
eval("var_dump((bool)\$$what);"); eval("var_dump((bool)\$$what);");
eval("var_dump(count(\$$what));"); eval("if (isset(\$$what)) var_dump(count(\$$what));");
eval("var_dump(\$$what);"); eval("var_dump(\$$what);");
} }
@ -168,7 +168,6 @@ object(SimpleXMLElement)#%d (2) {
===sxe->elem1[0]->elem2->bla ===sxe->elem1[0]->elem2->bla
bool(false) bool(false)
bool(false) bool(false)
int(0)
object(SimpleXMLElement)#%d (0) { object(SimpleXMLElement)#%d (0) {
} }
===sxe->elem1[0]["attr1"] ===sxe->elem1[0]["attr1"]
@ -182,7 +181,6 @@ object(SimpleXMLElement)#%d (1) {
===sxe->elem1[0]->attr1 ===sxe->elem1[0]->attr1
bool(false) bool(false)
bool(false) bool(false)
int(0)
object(SimpleXMLElement)#%d (0) { object(SimpleXMLElement)#%d (0) {
} }
===sxe->elem1[1] ===sxe->elem1[1]
@ -201,7 +199,6 @@ object(SimpleXMLElement)#%d (1) {
===sxe->elem1[2] ===sxe->elem1[2]
bool(false) bool(false)
bool(false) bool(false)
int(0)
NULL NULL
===sxe->elem11 ===sxe->elem11
bool(true) bool(true)
@ -233,22 +230,18 @@ object(SimpleXMLElement)#%d (0) {
===sxe->elem22 ===sxe->elem22
bool(false) bool(false)
bool(false) bool(false)
int(0)
object(SimpleXMLElement)#%d (0) { object(SimpleXMLElement)#%d (0) {
} }
===sxe->elem22->elem222 ===sxe->elem22->elem222
bool(false) bool(false)
bool(false) bool(false)
int(0)
NULL NULL
===sxe->elem22->attr22 ===sxe->elem22->attr22
bool(false) bool(false)
bool(false) bool(false)
int(0)
NULL NULL
===sxe->elem22["attr22"] ===sxe->elem22["attr22"]
bool(false) bool(false)
bool(false) bool(false)
int(0)
NULL NULL
===DONE=== ===DONE===

7
ext/simplexml/tests/bug35785.phpt
View file

@ -9,9 +9,8 @@ $xml = simplexml_load_string("<root></root>");
$xml->bla->posts->name = "FooBar"; $xml->bla->posts->name = "FooBar";
echo $xml->asXML(); echo $xml->asXML();
$xml = simplexml_load_string("<root></root>"); $xml = simplexml_load_string("<root></root>");
$count = count($xml->bla->posts); var_dump(isset($xml->bla->posts));
var_dump($count); $xml->bla->posts[0]->name = "FooBar";
$xml->bla->posts[$count]->name = "FooBar";
echo $xml->asXML(); echo $xml->asXML();
$xml = simplexml_load_string("<root></root>"); $xml = simplexml_load_string("<root></root>");
$xml->bla->posts[]->name = "FooBar"; $xml->bla->posts[]->name = "FooBar";
@ -22,7 +21,7 @@ echo $xml->asXML();
--EXPECTF-- --EXPECTF--
<?xml version="1.0"?> <?xml version="1.0"?>
<root><bla><posts><name>FooBar</name></posts></bla></root> <root><bla><posts><name>FooBar</name></posts></bla></root>
int(0) bool(false)
<?xml version="1.0"?> <?xml version="1.0"?>
<root><bla><posts><name>FooBar</name></posts></bla></root> <root><bla><posts><name>FooBar</name></posts></bla></root>
<?xml version="1.0"?> <?xml version="1.0"?>