Change the order of properties used for var_dump(), serialize(), comparison, etc.

Now properties are ordered according to their layout in zend_object structure.

7 files changed, 90 insertions, 90 deletions

diff --git a/tests/classes/clone_003.phpt b/tests/classes/clone_003.phpt
index 30d4cc549a..83326ed5dc 100644
--- a/tests/classes/clone_003.phpt
+++ b/tests/classes/clone_003.phpt
@@ -37,20 +37,20 @@ Object
 test Object
 (
     [p1] => test:1
+    [p2] => base:2
     [p3] => test:3
     [p4] => A
     [p5] => test:5
-    [p2] => base:2
     [p6:base:private] => base:6
 )
 Clown
 test Object
 (
     [p1] => test:1
+    [p2] => base:2
     [p3] => test:3
     [p4] => A
     [p5] => clone:5
-    [p2] => base:2
     [p6:base:private] => base:6
 )
 Done
diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt
index 610a00e702..80f80e220c 100644
--- a/tests/classes/clone_004.phpt
+++ b/tests/classes/clone_004.phpt
@@ -40,13 +40,6 @@ echo "Done\n";
 --EXPECT--
 Original
 object(test)#1 (2) {
-  ["b"]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
   ["a"]=>
   array(2) {
     [0]=>
@@ -54,9 +47,6 @@ object(test)#1 (2) {
     [1]=>
     int(2)
   }
-}
-Clone
-object(test)#2 (2) {
   ["b"]=>
   array(2) {
     [0]=>
@@ -64,6 +54,9 @@ object(test)#2 (2) {
     [1]=>
     int(4)
   }
+}
+Clone
+object(test)#2 (2) {
   ["a"]=>
   array(2) {
     [0]=>
@@ -71,12 +64,19 @@ object(test)#2 (2) {
     [1]=>
     int(2)
   }
+  ["b"]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
 }
 Modify
 object(test)#2 (2) {
-  ["b"]=>
-  int(6)
   ["a"]=>
   int(5)
+  ["b"]=>
+  int(6)
 }
 Done
diff --git a/tests/classes/constants_basic_004.phpt b/tests/classes/constants_basic_004.phpt
index c3df0747a4..8cbac55dfa 100644
--- a/tests/classes/constants_basic_004.phpt
+++ b/tests/classes/constants_basic_004.phpt
@@ -80,17 +80,17 @@ object(B)#%d (1) {
   }
 }
 object(C)#%d (3) {
-  ["a_c_parent"]=>
+  ["a_b"]=>
   array(1) {
     ["key"]=>
     string(5) "value"
   }
-  ["a_c_self"]=>
+  ["a_c_parent"]=>
   array(1) {
     ["key"]=>
     string(5) "value"
   }
-  ["a_b"]=>
+  ["a_c_self"]=>
   array(1) {
     ["key"]=>
     string(5) "value"
diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt
index bd1414c8b8..5dbb174706 100644
--- a/tests/classes/ctor_dtor_inheritance.phpt
+++ b/tests/classes/ctor_dtor_inheritance.phpt
@@ -67,31 +67,31 @@ base Object
 Testing class derived
 derived Object
 (
-    [other] => other
     [name] => init
+    [other] => other
 )
 base::__construct
 derived Object
 (
-    [other] => other
     [name] => base
+    [other] => other
 )
 derived::__construct
 derived Object
 (
-    [other] => other
     [name] => derived
+    [other] => other
 )
 base::__destruct
 derived Object
 (
-    [other] => other
     [name] => derived
+    [other] => other
 )
 derived::__destruct
 derived Object
 (
-    [other] => other
     [name] => derived
+    [other] => other
 )
 Done
diff --git a/tests/classes/inheritance_006.phpt b/tests/classes/inheritance_006.phpt
index 6009c35ffc..35465cc2ac 100644
--- a/tests/classes/inheritance_006.phpt
+++ b/tests/classes/inheritance_006.phpt
@@ -17,8 +17,8 @@ var_dump(new C);
 ?>
 --EXPECTF--
 object(C)#%d (2) {
-  ["c":"B":private]=>
-  NULL
   ["c":"A":private]=>
   NULL
+  ["c":"B":private]=>
+  NULL
 }
diff --git a/tests/classes/private_members.phpt b/tests/classes/private_members.phpt
index 1b48722dbb..19539cf374 100644
--- a/tests/classes/private_members.phpt
+++ b/tests/classes/private_members.phpt
@@ -57,45 +57,45 @@ base::__construct(begin)
 base::test
 derived Object
 (
-    [member] => derived::member (default)
     [member:base:private] => base::member
+    [member] => derived::member (default)
 )
 derived::test
 derived Object
 (
-    [member] => derived::member (default)
     [member:base:private] => base::member
+    [member] => derived::member (default)
 )
 base::__construct(end)
 base::test
 derived Object
 (
-    [member] => derived::member (default)
     [member:base:private] => base::member
+    [member] => derived::member (default)
 )
 base::test
 derived Object
 (
-    [member] => derived::member (default)
     [member:base:private] => base::member
+    [member] => derived::member (default)
 )
 derived::test
 derived Object
 (
-    [member] => derived::member (default)
     [member:base:private] => base::member
+    [member] => derived::member (default)
 )
 derived::__construct(end)
 base::test
 derived Object
 (
-    [member] => derived::member
     [member:base:private] => base::member
+    [member] => derived::member
 )
 derived::test
 derived Object
 (
-    [member] => derived::member
     [member:base:private] => base::member
+    [member] => derived::member
 )
 Done
diff --git a/tests/lang/foreachLoopObjects.002.phpt b/tests/lang/foreachLoopObjects.002.phpt
index 46bd6f8a37..ed9ce5c94a 100644
--- a/tests/lang/foreachLoopObjects.002.phpt
+++ b/tests/lang/foreachLoopObjects.002.phpt
@@ -191,17 +191,13 @@ object(C)#%d (5) {
 
 --> Using instance of D:
 in D::doForEachOnThis
-string(10) "Original f"
-string(10) "Original g"
 string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
+string(10) "Original f"
+string(10) "Original g"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(9) "changed.f"
-  ["g":protected]=>
-  string(9) "changed.g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -212,6 +208,10 @@ object(D)#%d (7) {
   string(9) "changed.d"
   ["e":"C":private]=>
   string(10) "Original e"
+  ["f":"D":private]=>
+  string(9) "changed.f"
+  ["g":protected]=>
+  string(9) "changed.g"
 }
 
 --> Using instance of E:
@@ -220,8 +220,8 @@ string(12) "Overridden a"
 string(12) "Overridden b"
 string(12) "Overridden c"
 string(12) "Overridden d"
-string(12) "Overridden e"
 string(10) "Original g"
+string(12) "Overridden e"
 object(E)#%d (8) {
   ["a"]=>
   string(9) "changed.a"
@@ -231,14 +231,14 @@ object(E)#%d (8) {
   string(9) "changed.c"
   ["d":protected]=>
   string(9) "changed.d"
-  ["e":"E":private]=>
-  string(9) "changed.e"
+  ["e":"C":private]=>
+  string(10) "Original e"
   ["f":"D":private]=>
   string(10) "Original f"
   ["g":protected]=>
   string(9) "changed.g"
-  ["e":"C":private]=>
-  string(10) "Original e"
+  ["e":"E":private]=>
+  string(9) "changed.e"
 }
 
 
@@ -266,17 +266,13 @@ object(C)#%d (5) {
 
 --> Using instance of D:
 in C::doForEachC
-string(10) "Original g"
 string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
 string(10) "Original e"
+string(10) "Original g"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(10) "Original f"
-  ["g":protected]=>
-  string(9) "changed.g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -287,6 +283,10 @@ object(D)#%d (7) {
   string(9) "changed.d"
   ["e":"C":private]=>
   string(9) "changed.e"
+  ["f":"D":private]=>
+  string(10) "Original f"
+  ["g":protected]=>
+  string(9) "changed.g"
 }
 
 --> Using instance of E:
@@ -295,8 +295,8 @@ string(12) "Overridden a"
 string(12) "Overridden b"
 string(12) "Overridden c"
 string(12) "Overridden d"
-string(10) "Original g"
 string(10) "Original e"
+string(10) "Original g"
 object(E)#%d (8) {
   ["a"]=>
   string(9) "changed.a"
@@ -306,14 +306,14 @@ object(E)#%d (8) {
   string(9) "changed.c"
   ["d":protected]=>
   string(9) "changed.d"
-  ["e":"E":private]=>
-  string(12) "Overridden e"
+  ["e":"C":private]=>
+  string(9) "changed.e"
   ["f":"D":private]=>
   string(10) "Original f"
   ["g":protected]=>
   string(9) "changed.g"
-  ["e":"C":private]=>
-  string(9) "changed.e"
+  ["e":"E":private]=>
+  string(12) "Overridden e"
 }
 
 
@@ -375,17 +375,13 @@ object(C)#%d (5) {
 
 --> Using instance of D:
 in C::doForEach
-string(10) "Original g"
 string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
 string(10) "Original e"
+string(10) "Original g"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(10) "Original f"
-  ["g":protected]=>
-  string(9) "changed.g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -396,19 +392,19 @@ object(D)#%d (7) {
   string(9) "changed.d"
   ["e":"C":private]=>
   string(9) "changed.e"
+  ["f":"D":private]=>
+  string(10) "Original f"
+  ["g":protected]=>
+  string(9) "changed.g"
 }
 in D::doForEach
-string(10) "Original f"
-string(10) "Original g"
 string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
+string(10) "Original f"
+string(10) "Original g"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(9) "changed.f"
-  ["g":protected]=>
-  string(9) "changed.g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -419,18 +415,18 @@ object(D)#%d (7) {
   string(9) "changed.d"
   ["e":"C":private]=>
   string(10) "Original e"
+  ["f":"D":private]=>
+  string(9) "changed.f"
+  ["g":protected]=>
+  string(9) "changed.g"
 }
 in E::doForEach
-string(10) "Original g"
 string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 string(10) "Original d"
+string(10) "Original g"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(10) "Original f"
-  ["g":protected]=>
-  string(9) "changed.g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -441,6 +437,10 @@ object(D)#%d (7) {
   string(9) "changed.d"
   ["e":"C":private]=>
   string(10) "Original e"
+  ["f":"D":private]=>
+  string(10) "Original f"
+  ["g":protected]=>
+  string(9) "changed.g"
 }
 
 --> Using instance of E:
@@ -449,8 +449,8 @@ string(12) "Overridden a"
 string(12) "Overridden b"
 string(12) "Overridden c"
 string(12) "Overridden d"
-string(10) "Original g"
 string(10) "Original e"
+string(10) "Original g"
 object(E)#%d (8) {
   ["a"]=>
   string(9) "changed.a"
@@ -460,14 +460,14 @@ object(E)#%d (8) {
   string(9) "changed.c"
   ["d":protected]=>
   string(9) "changed.d"
-  ["e":"E":private]=>
-  string(12) "Overridden e"
+  ["e":"C":private]=>
+  string(9) "changed.e"
   ["f":"D":private]=>
   string(10) "Original f"
   ["g":protected]=>
   string(9) "changed.g"
-  ["e":"C":private]=>
-  string(9) "changed.e"
+  ["e":"E":private]=>
+  string(12) "Overridden e"
 }
 in D::doForEach
 string(12) "Overridden a"
@@ -485,22 +485,22 @@ object(E)#%d (8) {
   string(9) "changed.c"
   ["d":protected]=>
   string(9) "changed.d"
-  ["e":"E":private]=>
-  string(12) "Overridden e"
+  ["e":"C":private]=>
+  string(10) "Original e"
   ["f":"D":private]=>
   string(9) "changed.f"
   ["g":protected]=>
   string(9) "changed.g"
-  ["e":"C":private]=>
-  string(10) "Original e"
+  ["e":"E":private]=>
+  string(12) "Overridden e"
 }
 in E::doForEach
 string(12) "Overridden a"
 string(12) "Overridden b"
 string(12) "Overridden c"
 string(12) "Overridden d"
-string(12) "Overridden e"
 string(10) "Original g"
+string(12) "Overridden e"
 object(E)#%d (8) {
   ["a"]=>
   string(9) "changed.a"
@@ -510,14 +510,14 @@ object(E)#%d (8) {
   string(9) "changed.c"
   ["d":protected]=>
   string(9) "changed.d"
-  ["e":"E":private]=>
-  string(9) "changed.e"
+  ["e":"C":private]=>
+  string(10) "Original e"
   ["f":"D":private]=>
   string(10) "Original f"
   ["g":protected]=>
   string(9) "changed.g"
-  ["e":"C":private]=>
-  string(10) "Original e"
+  ["e":"E":private]=>
+  string(9) "changed.e"
 }
 
 
@@ -545,10 +545,6 @@ string(10) "Original a"
 string(10) "Original b"
 string(10) "Original c"
 object(D)#%d (7) {
-  ["f":"D":private]=>
-  string(10) "Original f"
-  ["g":protected]=>
-  string(10) "Original g"
   ["a"]=>
   string(9) "changed.a"
   ["b"]=>
@@ -559,6 +555,10 @@ object(D)#%d (7) {
   string(10) "Original d"
   ["e":"C":private]=>
   string(10) "Original e"
+  ["f":"D":private]=>
+  string(10) "Original f"
+  ["g":protected]=>
+  string(10) "Original g"
 }
 
 --> Using instance of E:
@@ -574,12 +574,12 @@ object(E)#%d (8) {
   &string(9) "changed.c"
   ["d":protected]=>
   string(12) "Overridden d"
-  ["e":"E":private]=>
-  string(12) "Overridden e"
+  ["e":"C":private]=>
+  string(10) "Original e"
   ["f":"D":private]=>
   string(10) "Original f"
   ["g":protected]=>
   string(10) "Original g"
-  ["e":"C":private]=>
-  string(10) "Original e"
+  ["e":"E":private]=>
+  string(12) "Overridden e"
 }