archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Bugfix #35028 XML object fails FALSE test

Browse source
This commit is contained in:
Marcus Boerger 2005-10-30 20:37:22 +00:00
parent 2eed561d10
commit a415bcc5d9
2 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/simplexml/simplexml.c
View file

@ -1205,6 +1205,13 @@ static int sxe_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
sxe = php_sxe_fetch_object(readobj TSRMLS_CC);
if (type == IS_BOOL) {
node = php_sxe_get_first_node(sxe, NULL TSRMLS_CC);
INIT_PZVAL(writeobj);
ZVAL_BOOL(writeobj, node != NULL || zend_hash_num_elements(sxe_properties_get(readobj TSRMLS_CC)) > 0);
return SUCCESS;
}
if (sxe->iter.type != SXE_ITER_NONE) {
node = php_sxe_get_first_node(sxe, NULL TSRMLS_CC);
if (node) {

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

@ -12,6 +12,7 @@ function test($what)
global $sxe;
echo "===$what\n";
eval("var_dump(isset(\$$what));");
eval("var_dump((bool)\$$what);");
eval("var_dump(\$$what);");
}
@ -20,7 +21,7 @@ test('sxe->elem1');
test('sxe->elem1[0]');
test('sxe->elem1[0]->elem2');
test('sxe->elem1[0]->elem2->bla');
test('sxe->elem1[0]["attr1"]');
if (!ini_get("unicode_semantics")) test('sxe->elem1[0]["attr1"]');
test('sxe->elem1[0]->attr1');
test('sxe->elem1[1]');
test('sxe->elem1[2]');
@ -38,6 +39,7 @@ test('sxe->elem22["attr22"]');
--EXPECTF--
===sxe
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
["@attributes"]=>
array(1) {
@ -71,6 +73,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
["@attributes"]=>
array(2) {
@ -104,6 +107,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1[0]
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
["@attributes"]=>
array(2) {
@ -137,6 +141,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1[0]->elem2
bool(true)
bool(true)
object(SimpleXMLElement)#%d (2) {
["@attributes"]=>
array(2) {
@ -157,20 +162,24 @@ object(SimpleXMLElement)#%d (2) {
}
===sxe->elem1[0]->elem2->bla
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem1[0]["attr1"]
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
[0]=>
string(5) "first"
}
===sxe->elem1[0]->attr1
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem1[1]
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
["@attributes"]=>
array(2) {
@ -182,9 +191,11 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem1[2]
bool(false)
bool(false)
NULL
===sxe->elem11
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
["elem111"]=>
object(SimpleXMLElement)#%d (1) {
@ -195,6 +206,7 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem11->elem111
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
["elem1111"]=>
object(SimpleXMLElement)#%d (0) {
@ -202,25 +214,31 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem11->elem111->elem1111
bool(true)
bool(true)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem22
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem22->elem222
bool(false)
bool(false)
NULL
===sxe->elem22->attr22
bool(false)
bool(false)
NULL
===sxe->elem22["attr22"]
bool(false)
bool(false)
NULL
===DONE===
--UEXPECTF--
===sxe
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
[u"@attributes"]=>
array(1) {
@ -254,6 +272,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
[u"@attributes"]=>
array(2) {
@ -287,6 +306,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1[0]
bool(true)
bool(true)
object(SimpleXMLElement)#%d (3) {
[u"@attributes"]=>
array(2) {
@ -320,6 +340,7 @@ object(SimpleXMLElement)#%d (3) {
}
===sxe->elem1[0]->elem2
bool(true)
bool(true)
object(SimpleXMLElement)#%d (2) {
[u"@attributes"]=>
array(2) {
@ -340,20 +361,17 @@ object(SimpleXMLElement)#%d (2) {
}
===sxe->elem1[0]->elem2->bla
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem1[0]["attr1"]
bool(false)
object(SimpleXMLElement)#%d (1) {
[0]=>
unicode(5) "first"
}
===sxe->elem1[0]->attr1
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem1[1]
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
[u"@attributes"]=>
array(2) {
@ -365,9 +383,11 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem1[2]
bool(false)
bool(false)
NULL
===sxe->elem11
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
[u"elem111"]=>
object(SimpleXMLElement)#%d (1) {
@ -378,6 +398,7 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem11->elem111
bool(true)
bool(true)
object(SimpleXMLElement)#%d (1) {
[u"elem1111"]=>
object(SimpleXMLElement)#%d (0) {
@ -385,19 +406,24 @@ object(SimpleXMLElement)#%d (1) {
}
===sxe->elem11->elem111->elem1111
bool(true)
bool(true)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem22
bool(false)
bool(false)
object(SimpleXMLElement)#%d (0) {
}
===sxe->elem22->elem222
bool(false)
bool(false)
NULL
===sxe->elem22->attr22
bool(false)
bool(false)
NULL
===sxe->elem22["attr22"]
bool(false)
bool(false)
NULL
===DONE===