Fixed tests that var_dump/print_r DOM objects.

12 files changed, 59 insertions, 75 deletions

diff --git a/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt b/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
index 6021bac0bb..63de77148d 100644
--- a/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
+++ b/ext/dom/tests/DOMDocumentFragment_construct_basic_001.phpt
@@ -8,8 +8,7 @@ Eric Lee Stewart <ericleestewart@gmail.com>
 --FILE--
 <?php
 $fragment = new DOMDocumentFragment();
-var_dump($fragment);
+var_dump(get_class($fragment));
 ?>
---EXPECTF--
-object(DOMDocumentFragment)#%d (%d) {
-}
+--EXPECT--
+string(19) "DOMDocumentFragment"
diff --git a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
index 8e38d935e7..8e804bea92 100644
--- a/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
+++ b/ext/dom/tests/DOMElement_hasAttributes_basic.phpt
@@ -19,7 +19,7 @@ if(!$dom) {
 $element = $dom->documentElement;
 
 echo "Verify that we have a DOMElement object:\n";
-var_dump($element);
+echo get_class($element), "\n";
 
 echo "\nElement should have attributes:\n";
 var_dump($element->hasAttributes()); 
@@ -28,24 +28,22 @@ $nodelist=$dom->getElementsByTagName('tbody') ;
 $element = $nodelist->item(0);
 
 echo "\nVerify that we have a DOMElement object:\n";
-var_dump($element);
+echo get_class($element), "\n";
 
 echo "\nElement should have no attributes:\n"; 
-var_dump($element->hasAttributes()) 
+var_dump($element->hasAttributes());
 
 
 ?>
 --EXPECTF--
 Verify that we have a DOMElement object:
-object(DOMElement)#%d (0) {
-}
+DOMElement
 
 Element should have attributes:
 bool(true)
 
 Verify that we have a DOMElement object:
-object(DOMElement)#%d (0) {
-}
+DOMElement
 
 Element should have no attributes:
 bool(false)
diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
index 16b8533f71..cba3c17a2c 100644
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -29,7 +29,7 @@ EOXML;
 
 function dumpcourse($current) {
 	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; 
-	echo "Course: $title:";var_dump($current);
+	echo "Course: $title:";echo(get_class($current)), "\n";
 	echo "~";var_dump($current->textContent);
 }
 
@@ -75,8 +75,7 @@ for ($index = 0; $index < $children->length; $index++) {
 --EXPECTF--
 Start cloneNode test
 node 0
-Course: new title3:object(DOMElement)#6 (0) {
-}
+Course: new title3:DOMElement
 ~string(24) "
 		
 			c1n1
@@ -84,8 +83,7 @@ Course: new title3:object(DOMElement)#6 (0) {
 		
 	"
 node 1
-Course: two:object(DOMElement)#3 (0) {
-}
+Course: two:DOMElement
 ~string(24) "
 		
 			c2n1
@@ -93,12 +91,10 @@ Course: two:object(DOMElement)#3 (0) {
 		
 	"
 node 2
-Course: new title default:object(DOMElement)#4 (0) {
-}
+Course: new title default:DOMElement
 ~string(0) ""
 node 3
-Course: new title true:object(DOMElement)#7 (0) {
-}
+Course: new title true:DOMElement
 ~string(24) "
 		
 			c1n1
@@ -106,6 +102,5 @@ Course: new title true:object(DOMElement)#7 (0) {
 		
 	"
 node 4
-Course: new title false:object(DOMElement)#8 (0) {
-}
-~string(0) ""
\ No newline at end of file
+Course: new title false:DOMElement
+~string(0) ""
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index 8609e58be5..384eb47b5e 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -29,7 +29,7 @@ EOXML;
 
 function dumpcourse($current) {
 	$title = ($current->nodeType != XML_TEXT_NODE && $current->hasAttribute('title')) ? $current->getAttribute('title'):"no title"; 
-	echo "Course: $title:";var_dump($current);
+	echo "Course: $title:";echo get_class($current), "\n";
 	echo "~";var_dump($current->textContent);
 }
 
@@ -60,13 +60,11 @@ for ($index = 0; $index < $children->length; $index++) {
 --EXPECTF--
 orignal has 5 nodes
 node 4
-Course: no title:object(DOMText)#4 (0) {
-}
+Course: no title:DOMText
 ~string(1) "
 "
 node 3
-Course: two:object(DOMElement)#5 (0) {
-}
+Course: two:DOMElement
 ~string(24) "
 		
 			c2n1
@@ -74,13 +72,11 @@ Course: two:object(DOMElement)#5 (0) {
 		
 	"
 node 2
-Course: no title:object(DOMText)#6 (0) {
-}
+Course: no title:DOMText
 ~string(2) "
 	"
 node 1
-Course: one:object(DOMElement)#4 (0) {
-}
+Course: one:DOMElement
 ~string(24) "
 		
 			c1n1
@@ -88,14 +84,12 @@ Course: one:object(DOMElement)#4 (0) {
 		
 	"
 node 0
-Course: no title:object(DOMText)#5 (0) {
-}
+Course: no title:DOMText
 ~string(2) "
 	"
 after text removed it now has 2 nodes
 node 0
-Course: one:object(DOMElement)#3 (0) {
-}
+Course: one:DOMElement
 ~string(24) "
 		
 			c1n1
@@ -103,11 +97,10 @@ Course: one:object(DOMElement)#3 (0) {
 		
 	"
 node 1
-Course: two:object(DOMElement)#4 (0) {
-}
+Course: two:DOMElement
 ~string(24) "
 		
 			c2n1
 			c2n2
 		
-	"
\ No newline at end of file
+	"
diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt
index ab018a7774..b5fc893163 100644
--- a/ext/dom/tests/bug42082.phpt
+++ b/ext/dom/tests/bug42082.phpt
@@ -7,7 +7,7 @@ Bug #42082 (NodeList length zero should be empty)
 $doc = new DOMDocument();
 $xpath = new DOMXPath($doc);
 $nodes = $xpath->query('*');
-var_dump($nodes);
+echo get_class($nodes), "\n";
 var_dump($nodes->length);
 $length = $nodes->length;
 var_dump(empty($nodes->length), empty($length));
@@ -18,8 +18,7 @@ var_dump(empty($doc->nodeType), empty($doc->firstChild->nodeType))
 ?>
 ===DONE===
 --EXPECTF--
-object(DOMNodeList)#%d (0) {
-}
+DOMNodeList
 int(0)
 bool(true)
 bool(true)
@@ -29,4 +28,4 @@ bool(true)
 bool(false)
 bool(false)
 ===DONE===
-	
\ No newline at end of file
+	
diff --git a/ext/dom/tests/bug52656.phpt b/ext/dom/tests/bug52656.phpt
index 860ef99f4f..9ec2610b2a 100644
--- a/ext/dom/tests/bug52656.phpt
+++ b/ext/dom/tests/bug52656.phpt
@@ -6,9 +6,9 @@ Bug #52656 (DOMCdataSection does not work with splitText).
 <?php
 $CData = new DOMCdataSection('splithere!');
 $CDataSplit = $CData->splitText(5);
-var_dump($CDataSplit, $CDataSplit->data);
+echo get_class($CDataSplit), "\n";
+var_dump($CDataSplit->data);
 ?>
 --EXPECT--
-object(DOMText)#2 (0) {
-}
+DOMText
 string(5) "here!"
diff --git a/ext/dom/tests/bug54601.phpt b/ext/dom/tests/bug54601.phpt
index 8a2da2dee2..012302bc3e 100644
--- a/ext/dom/tests/bug54601.phpt
+++ b/ext/dom/tests/bug54601.phpt
@@ -17,14 +17,13 @@ $doc = new DOMDocument();
 $doc->loadXML($xml, LIBXML_NOENT);
 $n = $doc->doctype;
 $doc->removeChild($n);
-var_dump($n);
+echo get_class($n), "\n";
 print $doc->saveXML();
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-object(DOMDocumentType)#%d (0) {
-}
+DOMDocumentType
 <?xml version="1.0" encoding="utf-8"?>
 <set><foo>footext</foo><bar>bartext</bar></set>
 ===DONE===
diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt
index 1fae569085..060a2c184e 100644
--- a/ext/dom/tests/dom003.phpt
+++ b/ext/dom/tests/dom003.phpt
@@ -12,7 +12,11 @@ print "--- Catch exception with try/catch\n";
 try {
     $rootNode->appendChild($rootNode);
 } catch (domexception $e) {
+	ob_start();
     var_dump($e);
+	$contents = ob_get_contents();
+	ob_end_clean();
+	echo preg_replace('/object\(DOMElement\).+\{.*?\}/s', 'DOMElement', $contents);
 }
 print "--- Don't catch exception with try/catch\n";
 $rootNode->appendChild($rootNode);
@@ -47,8 +51,7 @@ object(DOMException)#%d (%d) {
       ["args"]=>
       array(1) {
         [0]=>
-        object(DOMElement)#%d (0) {
-        }
+        DOMElement
       }
     }
   }
@@ -61,6 +64,6 @@ object(DOMException)#%d (%d) {
 
 Fatal error: Uncaught exception 'DOMException' with message 'Hierarchy Request Error' in %sdom003.php:%d
 Stack trace:
-#0 %sdom003.php(13): DOMNode->appendChild(Object(DOMElement))
+#0 %sdom003.php(%d): DOMNode->appendChild(Object(DOMElement))
 #1 {main}
   thrown in %sdom003.php on line %d
diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt
index cb029ed04a..3a6970562b 100644
--- a/ext/dom/tests/dom_comment_basic.phpt
+++ b/ext/dom/tests/dom_comment_basic.phpt
@@ -23,24 +23,21 @@ $children = $root->childNodes;
 for ($index = 0; $index < $children->length; $index++) {
 	echo "--- child $index ---\n";
 	$current = $children->item($index);
-	var_dump($current);
+	echo get_class($current), "\n";
 	var_dump($current->textContent);
 }
 
 --EXPECTF--
 bool(true)
 --- child 0 ---
-object(DOMText)#%d (0) {
-}
+DOMText
 string(2) "
 	"
 --- child 1 ---
-object(DOMComment)#%d (0) {
-}
+DOMComment
 string(14) " Hello World! "
 --- child 2 ---
-object(DOMText)#%d (0) {
-}
+DOMText
 string(1) "
 "
 
diff --git a/ext/dom/tests/dom_comment_variation.phpt b/ext/dom/tests/dom_comment_variation.phpt
index bef0ef1b10..1f30e7c7ea 100644
--- a/ext/dom/tests/dom_comment_variation.phpt
+++ b/ext/dom/tests/dom_comment_variation.phpt
@@ -20,14 +20,13 @@ $children = $root->childNodes;
 for ($index = 0; $index < $children->length; $index++) {
 	echo "--- child $index ---\n";
 	$current = $children->item($index);
-	var_dump($current);
+	echo get_class($current), "\n";
 	var_dump($current->textContent);
 }
 
 --EXPECTF--
 bool(true)
 --- child 0 ---
-object(DOMComment)#%d (0) {
-}
+DOMComment
 string(14) " Hello World! "
 
diff --git a/ext/dom/tests/dom_set_attr_node.phpt b/ext/dom/tests/dom_set_attr_node.phpt
index 05f8086e71..1916cd524a 100644
--- a/ext/dom/tests/dom_set_attr_node.phpt
+++ b/ext/dom/tests/dom_set_attr_node.phpt
@@ -2,6 +2,8 @@
 Test: setAttributeNode()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
+--INI--
+error_reporting = E_ALL & ~E_WARNING
 --FILE--
 <?php
 
@@ -24,9 +26,13 @@ $dom2 = new DOMDocument();
 $dom2->loadXML($xml2);
 $root2 = $dom2->documentElement;
 try {
-   $root2->setAttributeNode($attr);
+	$root2->setAttributeNode($attr);
 } catch (domexception $e) {
-    var_dump($e);
+ob_start();
+	var_dump($e);
+	$contents = ob_get_contents();
+	ob_end_clean();
+	echo preg_replace('/object\(DOMAttr\).+\{.*?\}/s', 'DOMAttr', $contents);
 } 
 
 ?>
@@ -57,8 +63,7 @@ object(DOMException)#%d (7) {
       ["args"]=>
       array(1) {
         [0]=>
-        object(DOMAttr)#%d (0) {
-        }
+        DOMAttr
       }
     }
   }
diff --git a/ext/dom/tests/regsiter_node_class.phpt b/ext/dom/tests/regsiter_node_class.phpt
index 5444cc4b9e..c632c613da 100644
--- a/ext/dom/tests/regsiter_node_class.phpt
+++ b/ext/dom/tests/regsiter_node_class.phpt
@@ -18,26 +18,23 @@ $doc->registerNodeClass('DOMElement', 'myElement');
 $doc->appendChild(new DOMElement('root'));
 $root = $doc->documentElement;
 $root->setAttribute('a', 'a1');
-var_dump($root);
+echo get_class($root), "\n";
 print $root->testit()."\n";
 $attr = $root->getAttributeNode('a');
-var_dump($attr);
+echo get_class($attr), "\n";
 print $attr->testit()."\n";
 unset($attr);
 $doc->registerNodeClass('DOMAttr', NULL);
 $attr = $root->getAttributeNode('a');
-var_dump($attr);
+echo get_class($attr), "\n";
 print $attr->testit()."\n";
 ?>
 --EXPECTF--
 
-object(myElement)#%d (0) {
-}
+myElement
 HELLO Element
-object(myAttribute)#%d (0) {
-}
+myAttribute
 HELLO Attribute
-object(DOMAttr)#%d (0) {
-}
+DOMAttr
 
 Fatal error: Call to undefined method DOMAttr::testit() in %s on line 25