8 files changed, 42 insertions, 16 deletions
diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt
index 40e00bcc4..51c4ac954 100755
--- a/ext/dom/tests/DOMAttr_value_basic_001.phpt
+++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Read empty $value. 
---CREDIT--
+--CREDITS--
 Jason Bouffard <jbouffard1@yahoo.com>
 # TestFest Atlanta 2009-05-14
 --SKIPIF--
@@ -13,4 +13,4 @@ print $attr->value."\n";
 ===DONE===
 --EXPECTF--
 ===DONE===
-	
-\ No newline at end of file
+	
diff --git a/ext/dom/tests/DOMAttr_value_basic_002.phpt b/ext/dom/tests/DOMAttr_value_basic_002.phpt
index cf71eebf3..384a9ca4a 100644
--- a/ext/dom/tests/DOMAttr_value_basic_002.phpt
+++ b/ext/dom/tests/DOMAttr_value_basic_002.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Write non-string $value property
---CREDIT--
+--CREDITS--
 Eric Berg <ehberg@gmail.com>
 # TestFest Atlanta 2009-05-14
 --SKIPIF--
@@ -12,4 +12,4 @@ $attr->value = 1;
 print $attr->value;
 ?>
 --EXPECTF--
-1
-\ No newline at end of file
+1
diff --git a/ext/dom/tests/DOMCharacterData_data_error_002.phpt b/ext/dom/tests/DOMCharacterData_data_error_002.phpt
index 9dae096e6..401e0f2f8 100755
--- a/ext/dom/tests/DOMCharacterData_data_error_002.phpt
+++ b/ext/dom/tests/DOMCharacterData_data_error_002.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Invalid State Error when getting data on DOMCharacterData out of content.
---CREDIT--
+--CREDITS--
 Eric Berg <ehberg@gmail.com>
 # TestFest Atlanta 2009-05-14
 --SKIPIF--
@@ -11,4 +11,4 @@ $character_data = new DOMCharacterData();
 print $character_data->data;
 ?>
 --EXPECTF--
-Warning: main(): Invalid State Error in %s on line %d
-\ No newline at end of file
+Warning: main(): Invalid State Error in %s on line %d
diff --git a/ext/dom/tests/DOMCharacterData_length_error_001.phpt b/ext/dom/tests/DOMCharacterData_length_error_001.phpt
index 0dda492ad..e8bf16ab9 100755
--- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Invalid State Error when getting length on DOMCharacterData out of content.
---CREDIT--
+--CREDITS--
 Jason Bouffard <jbouffard1@yahoo.com>
 # TestFest Atlanta 2009-05-14
 --SKIPIF--
@@ -14,4 +14,4 @@ print $character_data->length;
 --EXPECTF--
 Warning: main(): Invalid State Error in %s
 ===DONE===
-	
-\ No newline at end of file
+	
diff --git a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
index 403e01aa7..d0cea29c7 100644
--- a/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
+++ b/ext/dom/tests/DOMDocument_validate_on_parse_variation.phpt
@@ -12,7 +12,7 @@ require_once('skipif.inc');
 
 require_once('dom_test.inc');
 
-chdir(__DIR__ . "/../examples");
+chdir(__DIR__);
 $XMLStringGood = file_get_contents('note.xml');
 
 $dom = new DOMDocument;
diff --git a/ext/dom/tests/dom007.phpt b/ext/dom/tests/dom007.phpt
index 649d63033..5d12aa344 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
diff --git a/ext/dom/tests/note.dtd b/ext/dom/tests/note.dtd
new file mode 100644
index 000000000..c2d558eee
--- /dev/null
+++ b/ext/dom/tests/note.dtd
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!ELEMENT note (to,from,heading,body)>
+<!ELEMENT to (#PCDATA)>
+<!ELEMENT from (#PCDATA)>
+<!ELEMENT heading (#PCDATA)>
+<!ELEMENT body (#PCDATA)>
diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml
new file mode 100644
index 000000000..49614a1b5
--- /dev/null
+++ b/ext/dom/tests/note.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE note SYSTEM "note.dtd">
+<note>
+<to>PHP User Group</to>
+<from>Shane</from>
+<heading>Reminder</heading>
+<body>Don't forget the meeting tonight!</body>
+</note>