felipe                                   Sun, 04 Apr 2010 17:39:26 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297463

Log:
- Fixed test

Changed paths:
    U   
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt

Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt	2010-04-04 17:37:02 UTC (rev 297462)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt	2010-04-04 17:39:26 UTC (rev 297463)
@@ -574,7 +574,7 @@

 *** Testing var_dump() on object variables ***
 -- Iteration 1 --
-object(object_class)#6 (7) {
+object(object_class)#%d (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -591,14 +591,14 @@
   int(11)
 }
 -- Iteration 2 --
-object(no_member_class)#7 (0) {
+object(no_member_class)#%d (0) {
 }
 -- Iteration 3 --
-object(contains_object_class)#8 (7) {
+object(contains_object_class)#%d (7) {
   ["p"]=>
   int(30)
   ["class_object1"]=>
-  object(object_class)#9 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -615,7 +615,7 @@
     int(11)
   }
   ["class_object2"]=>
-  object(object_class)#10 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -632,7 +632,7 @@
     int(11)
   }
   ["class_object3:private"]=>
-  object(object_class)#9 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -649,7 +649,7 @@
     int(11)
   }
   ["class_object4:protected"]=>
-  object(object_class)#10 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -666,93 +666,17 @@
     int(11)
   }
   ["no_member_class_object"]=>
-  object(no_member_class)#11 (0) {
+  object(no_member_class)#%d (0) {
   }
   ["class_object5"]=>
-  object(contains_object_class)#8 (7) {
-    ["p"]=>
-    int(30)
-    ["class_object1"]=>
-    object(object_class)#9 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#10 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2:private"]=>
-      int(21)
-      ["protected_var1:protected"]=>
-      string(8) "string_1"
-      ["protected_var2:protected"]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object3:private"]=>
-    object(object_class)#9 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#10 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#11 (0) {
-    }
-    ["class_object5"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 -- Iteration 4 --
-object(contains_object_class)#1 (7) {
+object(contains_object_class)#%d (7) {
   ["p"]=>
   int(30)
   ["class_object1"]=>
-  object(object_class)#2 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -769,7 +693,7 @@
     int(11)
   }
   ["class_object2"]=>
-  object(object_class)#3 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -786,7 +710,7 @@
     int(11)
   }
   ["class_object3:private"]=>
-  object(object_class)#2 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -803,7 +727,7 @@
     int(11)
   }
   ["class_object4:protected"]=>
-  object(object_class)#3 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -820,89 +744,13 @@
     int(11)
   }
   ["no_member_class_object"]=>
-  object(no_member_class)#4 (0) {
+  object(no_member_class)#%d (0) {
   }
   ["class_object5"]=>
-  object(contains_object_class)#1 (7) {
-    ["p"]=>
-    int(30)
-    ["class_object1"]=>
-    object(object_class)#2 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#3 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2:private"]=>
-      int(21)
-      ["protected_var1:protected"]=>
-      string(8) "string_1"
-      ["protected_var2:protected"]=>
-      string(8) "string_2"
-      ["public_var2"]=>
-      int(11)
-    }
-    ["class_object3:private"]=>
-    object(object_class)#2 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#3 (7) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#4 (0) {
-    }
-    ["class_object5"]=>
-    *RECURSION*
-  }
+  *RECURSION*
 }
 -- Iteration 5 --
-object(object_class)#2 (7) {
+object(object_class)#%d (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -919,7 +767,7 @@
   int(11)
 }
 -- Iteration 6 --
-object(object_class)#3 (7) {
+object(object_class)#%d (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -936,10 +784,10 @@
   int(11)
 }
 -- Iteration 7 --
-object(no_member_class)#4 (0) {
+object(no_member_class)#%d (0) {
 }
 -- Iteration 8 --
-object(object_class)#5 (7) {
+object(object_class)#%d (7) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -959,7 +807,7 @@
 NULL

 ** Testing var_dump() on objects having circular reference **
-object(object_class)#13 (8) {
+object(object_class)#%d (8) {
   ["value"]=>
   int(50)
   ["public_var1"]=>
@@ -975,7 +823,7 @@
   ["public_var2"]=>
   int(11)
   ["obj"]=>
-  &object(object_class)#12 (8) {
+  &object(object_class)#%d (8) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -991,49 +839,15 @@
     ["public_var2"]=>
     int(11)
     ["obj"]=>
-    &object(object_class)#13 (8) {
-      ["value"]=>
-      int(50)
-      ["public_var1"]=>
-      int(10)
-      ["private_var1:private"]=>
-      int(20)
-      ["private_var2: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)#12 (8) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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(5) of type (stream)
+resource(%d) of type (stream)
 -- Iteration 2 --
-resource(6) of type (stream)
+resource(%d) of type (stream)

 *** Testing var_dump() on different combinations of scalar
             and non-scalar variables ***
@@ -1067,7 +881,7 @@
 -- Iteration 3 --
 array(4) {
   [0]=>
-  object(no_member_class)#14 (0) {
+  object(no_member_class)#%d (0) {
   }
   [1]=>
   array(0) {
@@ -1415,13 +1229,13 @@
 }
 array(2) {
   [0]=>
-  resource(5) of type (stream)
+  resource(%d) of type (stream)
   [1]=>
-  resource(6) of type (stream)
+  resource(%d) of type (stream)
 }
 array(9) {
   [0]=>
-  object(object_class)#6 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1438,14 +1252,14 @@
     int(11)
   }
   [1]=>
-  object(no_member_class)#7 (0) {
+  object(no_member_class)#%d (0) {
   }
   [2]=>
-  object(contains_object_class)#8 (7) {
+  object(contains_object_class)#%d (7) {
     ["p"]=>
     int(30)
     ["class_object1"]=>
-    object(object_class)#9 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1462,7 +1276,7 @@
       int(11)
     }
     ["class_object2"]=>
-    object(object_class)#10 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1479,7 +1293,7 @@
       int(11)
     }
     ["class_object3:private"]=>
-    object(object_class)#9 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1496,7 +1310,7 @@
       int(11)
     }
     ["class_object4:protected"]=>
-    object(object_class)#10 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1513,93 +1327,17 @@
       int(11)
     }
     ["no_member_class_object"]=>
-    object(no_member_class)#11 (0) {
+    object(no_member_class)#%d (0) {
     }
     ["class_object5"]=>
-    object(contains_object_class)#8 (7) {
-      ["p"]=>
-      int(30)
-      ["class_object1"]=>
-      object(object_class)#9 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#10 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2:private"]=>
-        int(21)
-        ["protected_var1:protected"]=>
-        string(8) "string_1"
-        ["protected_var2:protected"]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object3:private"]=>
-      object(object_class)#9 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#10 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#11 (0) {
-      }
-      ["class_object5"]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [3]=>
-  object(contains_object_class)#1 (7) {
+  object(contains_object_class)#%d (7) {
     ["p"]=>
     int(30)
     ["class_object1"]=>
-    object(object_class)#2 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1616,7 +1354,7 @@
       int(11)
     }
     ["class_object2"]=>
-    object(object_class)#3 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1633,7 +1371,7 @@
       int(11)
     }
     ["class_object3:private"]=>
-    object(object_class)#2 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1650,7 +1388,7 @@
       int(11)
     }
     ["class_object4:protected"]=>
-    object(object_class)#3 (7) {
+    object(object_class)#%d (7) {
       ["value"]=>
       int(50)
       ["public_var1"]=>
@@ -1667,89 +1405,13 @@
       int(11)
     }
     ["no_member_class_object"]=>
-    object(no_member_class)#4 (0) {
+    object(no_member_class)#%d (0) {
     }
     ["class_object5"]=>
-    object(contains_object_class)#1 (7) {
-      ["p"]=>
-      int(30)
-      ["class_object1"]=>
-      object(object_class)#2 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#3 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2:private"]=>
-        int(21)
-        ["protected_var1:protected"]=>
-        string(8) "string_1"
-        ["protected_var2:protected"]=>
-        string(8) "string_2"
-        ["public_var2"]=>
-        int(11)
-      }
-      ["class_object3:private"]=>
-      object(object_class)#2 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#3 (7) {
-        ["value"]=>
-        int(50)
-        ["public_var1"]=>
-        int(10)
-        ["private_var1:private"]=>
-        int(20)
-        ["private_var2: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)#4 (0) {
-      }
-      ["class_object5"]=>
-      *RECURSION*
-    }
+    *RECURSION*
   }
   [4]=>
-  object(object_class)#2 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1766,7 +1428,7 @@
     int(11)
   }
   [5]=>
-  object(object_class)#3 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1783,10 +1445,10 @@
     int(11)
   }
   [6]=>
-  object(no_member_class)#4 (0) {
+  object(no_member_class)#%d (0) {
   }
   [7]=>
-  object(object_class)#5 (7) {
+  object(object_class)#%d (7) {
     ["value"]=>
     int(50)
     ["public_var1"]=>
@@ -1846,7 +1508,7 @@
   [2]=>
   array(4) {
     [0]=>
-    object(no_member_class)#14 (0) {
+    object(no_member_class)#%d (0) {
     }
     [1]=>
     array(0) {
@@ -1911,3 +1573,4 @@

 Warning: Wrong parameter count for var_dump() in %s on line %d
 Done
+
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to