diff options
author | Christopher Jones <sixd@php.net> | 2012-05-01 15:49:19 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2012-05-01 15:49:19 -0700 |
commit | 93192ec56df762341125f257cc61ab0c3e64ea76 (patch) | |
tree | 0d23d4102e23fbb4a873f4d760ec80589b8dc0b2 | |
parent | cac09f333384463613d1a27e79f9c7fa949f87db (diff) | |
parent | 72507d38fb6701471053ef6bee65dfbe63184ec9 (diff) | |
download | php-git-93192ec56df762341125f257cc61ab0c3e64ea76.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Make output order for dom007.phpt platform independent
-rw-r--r-- | ext/dom/tests/dom007.phpt | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt index 649d630336..5d12aa344d 100644 --- a/ext/dom/tests/dom007.phpt +++ b/ext/dom/tests/dom007.phpt @@ -63,12 +63,24 @@ echo "\n"; $ents = $dtd->entities; $length = $ents->length; echo "Length: ".$length."\n"; + +$xkeys = array(); foreach ($ents AS $key=>$node) { - echo "Key: $key Name: ".$node->nodeName."\n"; + $xkeys[] = "Key: $key Name: ".$node->nodeName."\n"; +} +sort($xkeys); // fix inconsistent output ordering (bug #61810) +foreach ($xkeys as $key => $node) { + echo $node; } echo "\n"; + +$xkeys = array(); for($x=0; $x < $length; $x++) { - echo "Index $x: ".$ents->item($x)->nodeName."\n"; + $xkeys[] = "Index: ".$ents->item($x)->nodeName."\n"; +} +sort($xkeys); // fix inconsistent output ordering (bug #61810) +foreach ($xkeys as $key => $node) { + echo $node; } echo "\n"; @@ -87,13 +99,13 @@ Index 0: GIF (image/gif) (-) NULL Length: 3 -Key: test Name: test -Key: rdf Name: rdf Key: myimage Name: myimage +Key: rdf Name: rdf +Key: test Name: test -Index 0: test -Index 1: rdf -Index 2: myimage +Index: myimage +Index: rdf +Index: test NULL NULL |