From 44de5a0e8e645177a1f5839633a38d6021c6e2ff Mon Sep 17 00:00:00 2001
From: Andrey Hristov <andrey@php.net>
Date: Thu, 20 May 2004 21:13:14 +0000
Subject: [PATCH] fixing the tests so to work with the new var_dump() (dumping
 private and protected member variables)

---
 ext/dom/tests/dom003.phpt                     | 11 +++++++
 ext/standard/tests/array/007.phpt             | 32 +++++++++++++++++++
 .../tests/array/array_intersect_1.phpt        | 18 +++++++++++
 3 files changed, 61 insertions(+)

diff --git a/ext/dom/tests/dom003.phpt b/ext/dom/tests/dom003.phpt
index e3aa26e05c..e8c1db2ce9 100644
--- a/ext/dom/tests/dom003.phpt
+++ b/ext/dom/tests/dom003.phpt
@@ -22,6 +22,17 @@ $rootNode->appendChild($rootNode);
 --EXPECTF--
 --- Catch exception with try/catch
 object(DOMException)#%d (6) {
+  ["message:protected"]=>
+  string(23) "Hierarchy Request Error"
+  ["string:private"]=>
+  string(0) ""
+  ["file:protected"]=>
+  string(%d) "%s/ext/dom/tests/dom003.php"
+  ["line:protected"]=>
+  int(8)
+  ["trace:private"]=>
+  array(0) {
+  }
   ["code"]=>
   int(3)
 }
diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt
index e9940b5348..95479e18bb 100644
--- a/ext/standard/tests/array/007.phpt
+++ b/ext/standard/tests/array/007.phpt
@@ -310,16 +310,22 @@ var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
 array(3) {
   ["0.1"]=>
   object(cr)#1 (2) {
+    ["priv_member:private"]=>
+    int(9)
     ["public_member"]=>
     int(9)
   }
   ["0.5"]=>
   object(cr)#2 (2) {
+    ["priv_member:private"]=>
+    int(12)
     ["public_member"]=>
     int(12)
   }
   [0]=>
   object(cr)#3 (2) {
+    ["priv_member:private"]=>
+    int(23)
     ["public_member"]=>
     int(23)
   }
@@ -382,16 +388,22 @@ var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
 array(3) {
   ["0.1"]=>
   object(cr)#1 (2) {
+    ["priv_member:private"]=>
+    int(9)
     ["public_member"]=>
     int(9)
   }
   ["0.5"]=>
   object(cr)#2 (2) {
+    ["priv_member:private"]=>
+    int(12)
     ["public_member"]=>
     int(12)
   }
   [0]=>
   object(cr)#3 (2) {
+    ["priv_member:private"]=>
+    int(23)
     ["public_member"]=>
     int(23)
   }
@@ -454,26 +466,36 @@ var_dump(array_diff_assoc($a, $b));
 array(5) {
   ["0.1"]=>
   object(cr)#1 (2) {
+    ["priv_member:private"]=>
+    int(9)
     ["public_member"]=>
     int(9)
   }
   ["0.5"]=>
   object(cr)#2 (2) {
+    ["priv_member:private"]=>
+    int(12)
     ["public_member"]=>
     int(12)
   }
   [0]=>
   object(cr)#3 (2) {
+    ["priv_member:private"]=>
+    int(23)
     ["public_member"]=>
     int(23)
   }
   [1]=>
   object(cr)#4 (2) {
+    ["priv_member:private"]=>
+    int(4)
     ["public_member"]=>
     int(4)
   }
   [2]=>
   object(cr)#5 (2) {
+    ["priv_member:private"]=>
+    int(-15)
     ["public_member"]=>
     int(-15)
   }
@@ -536,11 +558,15 @@ var_dump(array_udiff($a, $b, "comp_func_cr"));
 array(2) {
   ["0.5"]=>
   object(cr)#2 (2) {
+    ["priv_member:private"]=>
+    int(12)
     ["public_member"]=>
     int(12)
   }
   [0]=>
   object(cr)#3 (2) {
+    ["priv_member:private"]=>
+    int(23)
     ["public_member"]=>
     int(23)
   }
@@ -603,16 +629,22 @@ var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
 array(3) {
   ["0.1"]=>
   object(cr)#1 (2) {
+    ["priv_member:private"]=>
+    int(9)
     ["public_member"]=>
     int(9)
   }
   ["0.5"]=>
   object(cr)#2 (2) {
+    ["priv_member:private"]=>
+    int(12)
     ["public_member"]=>
     int(12)
   }
   [0]=>
   object(cr)#3 (2) {
+    ["priv_member:private"]=>
+    int(23)
     ["public_member"]=>
     int(23)
   }
diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt
index 2f12b22919..1fed25dcb2 100644
--- a/ext/standard/tests/array/array_intersect_1.phpt
+++ b/ext/standard/tests/array/array_intersect_1.phpt
@@ -205,16 +205,22 @@ var_dump(array_uintersect($a, $b, "comp_func_cr"));
 array(3) {
   ["0.1"]=>
   object(cr)#1 (2) {
+    ["priv_member:private"]=>
+    int(9)
     ["public_member"]=>
     int(9)
   }
   [1]=>
   object(cr)#4 (2) {
+    ["priv_member:private"]=>
+    int(4)
     ["public_member"]=>
     int(4)
   }
   [2]=>
   object(cr)#5 (2) {
+    ["priv_member:private"]=>
+    int(-15)
     ["public_member"]=>
     int(-15)
   }
@@ -338,11 +344,15 @@ var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
 array(2) {
   [1]=>
   object(cr)#4 (2) {
+    ["priv_member:private"]=>
+    int(4)
     ["public_member"]=>
     int(4)
   }
   [2]=>
   object(cr)#5 (2) {
+    ["priv_member:private"]=>
+    int(-15)
     ["public_member"]=>
     int(-15)
   }
@@ -466,11 +476,15 @@ var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
 array(2) {
   [1]=>
   object(cr)#4 (2) {
+    ["priv_member:private"]=>
+    int(4)
     ["public_member"]=>
     int(4)
   }
   [2]=>
   object(cr)#5 (2) {
+    ["priv_member:private"]=>
+    int(-15)
     ["public_member"]=>
     int(-15)
   }
@@ -535,11 +549,15 @@ var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func
 array(2) {
   [1]=>
   object(cr)#4 (2) {
+    ["priv_member:private"]=>
+    int(4)
     ["public_member"]=>
     int(4)
   }
   [2]=>
   object(cr)#5 (2) {
+    ["priv_member:private"]=>
+    int(-15)
     ["public_member"]=>
     int(-15)
   }
-- 
2.50.1