From: Felipe Pena <felipe@php.net>
Date: Sun, 4 Apr 2010 17:21:27 +0000 (+0000)
Subject: - Fix tests
X-Git-Tag: php-5.4.0alpha1~191^2~1803
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3d312ce872e48a9d0af1e7352b97b662de2787c;p=php

- Fix tests
---

diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt
index 1a525c53bc..09e9f3b99e 100644
--- a/ext/standard/tests/general_functions/var_dump.phpt
+++ b/ext/standard/tests/general_functions/var_dump.phpt
@@ -573,7 +573,7 @@ array(2) {
 
 *** Testing var_dump() on object variables ***
 -- Iteration 1 --
-object(object_class)#%d (7) {
+object(object_class)#6 (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -590,14 +590,14 @@ object(object_class)#%d (7) {
   int(11)
 }
 -- Iteration 2 --
-object(no_member_class)#%d (0) {
+object(no_member_class)#7 (0) {
 }
 -- Iteration 3 --
-object(contains_object_class)#%d (7) {
+object(contains_object_class)#8 (7) {
   ["p"]=>
   int(30)
   ["class_object1"]=>
-  object(object_class)#%d (7) {
+  object(object_class)#9 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -614,7 +614,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object2"]=>
-  object(object_class)#%d (7) {
+  object(object_class)#10 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -631,7 +631,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object3":"contains_object_class":private]=>
-  object(object_class)#%d (7) {
+  object(object_class)#9 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -648,7 +648,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object4":protected]=>
-  object(object_class)#%d (7) {
+  object(object_class)#10 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -665,93 +665,17 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["no_member_class_object"]=>
-  object(no_member_class)#%d (0) {
+  object(no_member_class)#11 (0) {
   }
   ["class_object5"]=>
-  object(contains_object_class)#%d (7) {
-    ["p"]=>
-    int(30)
-    ["class_object1"]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object2"]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object3":"contains_object_class":private]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object4":protected]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["no_member_class_object"]=>
-    object(no_member_class)#%d (0) {
-    }
-    ["class_object5"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 -- Iteration 4 --
-object(contains_object_class)#%d (7) {
+object(contains_object_class)#1 (7) {
   ["p"]=>
   int(30)
   ["class_object1"]=>
-  object(object_class)#%d (7) {
+  object(object_class)#2 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -768,7 +692,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object2"]=>
-  object(object_class)#%d (7) {
+  object(object_class)#3 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -785,7 +709,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object3":"contains_object_class":private]=>
-  object(object_class)#%d (7) {
+  object(object_class)#2 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -802,7 +726,7 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["class_object4":protected]=>
-  object(object_class)#%d (7) {
+  object(object_class)#3 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -819,89 +743,13 @@ object(contains_object_class)#%d (7) {
     int(11)
   }
   ["no_member_class_object"]=>
-  object(no_member_class)#%d (0) {
+  object(no_member_class)#4 (0) {
   }
   ["class_object5"]=>
-  object(contains_object_class)#%d (7) {
-    ["p"]=>
-    int(30)
-    ["class_object1"]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object2"]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object3":"contains_object_class":private]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object4":protected]=>
-    object(object_class)#%d (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["no_member_class_object"]=>
-    object(no_member_class)#%d (0) {
-    }
-    ["class_object5"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 -- Iteration 5 --
-object(object_class)#%d (7) {
+object(object_class)#2 (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -918,7 +766,7 @@ object(object_class)#%d (7) {
   int(11)
 }
 -- Iteration 6 --
-object(object_class)#%d (7) {
+object(object_class)#3 (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -935,10 +783,10 @@ object(object_class)#%d (7) {
   int(11)
 }
 -- Iteration 7 --
-object(no_member_class)#%d (0) {
+object(no_member_class)#4 (0) {
 }
 -- Iteration 8 --
-object(object_class)#%d (7) {
+object(object_class)#5 (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -958,7 +806,7 @@ object(object_class)#%d (7) {
 NULL
 
 ** Testing var_dump() on objects having circular reference **
-object(object_class)#%d (8) {
+object(object_class)#13 (8) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -974,7 +822,7 @@ object(object_class)#%d (8) {
   ["public_var2"]=>
   int(11)
   ["obj"]=>
-  &object(object_class)#%d (8) {
+  &object(object_class)#12 (8) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -990,49 +838,15 @@ object(object_class)#%d (8) {
     ["public_var2"]=>
     int(11)
     ["obj"]=>
-    &object(object_class)#%d (8) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1":"object_class":private]=>
-      int(20)
-      ["private_var2":"object_class":private]=>
-      int(21)
-      ["protected_var1":protected]=>
-      string(8) "string_1"
-      ["protected_var2":protected]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-      ["obj"]=>
-      &object(object_class)#%d (8) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-        ["obj"]=>
-        *RECURSION*
-      }
-    }
+    *RECURSION*
   }
 }
 
 *** Testing var_dump() on resources ***
 -- Iteration 1 --
-resource(%d) of type (stream)
+resource(5) of type (stream)
 -- Iteration 2 --
-resource(%d) of type (stream)
+resource(6) of type (stream)
 
 *** Testing var_dump() on different combinations of scalar 
             and non-scalar variables ***
@@ -1066,7 +880,7 @@ array(4) {
 -- Iteration 3 --
 array(4) {
   [0]=>
-  object(no_member_class)#%d (0) {
+  object(no_member_class)#14 (0) {
   }
   [1]=>
   array(0) {
@@ -1413,13 +1227,13 @@ array(4) {
 }
 array(2) {
   [0]=>
-  resource(%d) of type (stream)
+  resource(5) of type (stream)
   [1]=>
-  resource(%d) of type (stream)
+  resource(6) of type (stream)
 }
 array(9) {
   [0]=>
-  object(object_class)#%d (7) {
+  object(object_class)#6 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1436,14 +1250,14 @@ array(9) {
     int(11)
   }
   [1]=>
-  object(no_member_class)#%d (0) {
+  object(no_member_class)#7 (0) {
   }
   [2]=>
-  object(contains_object_class)#%d (7) {
+  object(contains_object_class)#8 (7) {
     ["p"]=>
     int(30)
     ["class_object1"]=>
-    object(object_class)#%d (7) {
+    object(object_class)#9 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1460,7 +1274,7 @@ array(9) {
       int(11)
     }
     ["class_object2"]=>
-    object(object_class)#%d (7) {
+    object(object_class)#10 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1477,7 +1291,7 @@ array(9) {
       int(11)
     }
     ["class_object3":"contains_object_class":private]=>
-    object(object_class)#%d (7) {
+    object(object_class)#9 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1494,7 +1308,7 @@ array(9) {
       int(11)
     }
     ["class_object4":protected]=>
-    object(object_class)#%d (7) {
+    object(object_class)#10 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1511,93 +1325,17 @@ array(9) {
       int(11)
     }
     ["no_member_class_object"]=>
-    object(no_member_class)#%d (0) {
+    object(no_member_class)#11 (0) {
     }
     ["class_object5"]=>
-    object(contains_object_class)#%d (7) {
-      ["p"]=>
-      int(30)
-      ["class_object1"]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object2"]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object3":"contains_object_class":private]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object4":protected]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["no_member_class_object"]=>
-      object(no_member_class)#%d (0) {
-      }
-      ["class_object5"]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [3]=>
-  object(contains_object_class)#%d (7) {
+  object(contains_object_class)#1 (7) {
     ["p"]=>
     int(30)
     ["class_object1"]=>
-    object(object_class)#%d (7) {
+    object(object_class)#2 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1614,7 +1352,7 @@ array(9) {
       int(11)
     }
     ["class_object2"]=>
-    object(object_class)#%d (7) {
+    object(object_class)#3 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1631,7 +1369,7 @@ array(9) {
       int(11)
     }
     ["class_object3":"contains_object_class":private]=>
-    object(object_class)#%d (7) {
+    object(object_class)#2 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1648,7 +1386,7 @@ array(9) {
       int(11)
     }
     ["class_object4":protected]=>
-    object(object_class)#%d (7) {
+    object(object_class)#3 (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1665,89 +1403,13 @@ array(9) {
       int(11)
     }
     ["no_member_class_object"]=>
-    object(no_member_class)#%d (0) {
+    object(no_member_class)#4 (0) {
     }
     ["class_object5"]=>
-    object(contains_object_class)#%d (7) {
-      ["p"]=>
-      int(30)
-      ["class_object1"]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object2"]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object3":"contains_object_class":private]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object4":protected]=>
-      object(object_class)#%d (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1":"object_class":private]=>
-        int(20)
-        ["private_var2":"object_class":private]=>
-        int(21)
-        ["protected_var1":protected]=>
-        string(8) "string_1"
-        ["protected_var2":protected]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["no_member_class_object"]=>
-      object(no_member_class)#%d (0) {
-      }
-      ["class_object5"]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [4]=>
-  object(object_class)#%d (7) {
+  object(object_class)#2 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1764,7 +1426,7 @@ array(9) {
     int(11)
   }
   [5]=>
-  object(object_class)#%d (7) {
+  object(object_class)#3 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1781,10 +1443,10 @@ array(9) {
     int(11)
   }
   [6]=>
-  object(no_member_class)#%d (0) {
+  object(no_member_class)#4 (0) {
   }
   [7]=>
-  object(object_class)#%d (7) {
+  object(object_class)#5 (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1844,7 +1506,7 @@ array(6) {
   [2]=>
   array(4) {
     [0]=>
-    object(no_member_class)#%d (0) {
+    object(no_member_class)#14 (0) {
     }
     [1]=>
     array(0) {
@@ -1907,5 +1569,6 @@ string(9) "lambda_2"
 
 *** Testing error conditions ***
 
-Warning: var_dump() expects at least %d parameter, %d given in %s on line %d
+Warning: var_dump() expects at least 1 parameter, 0 given in %s on line %d
 Done
+