Change the order of properties used in foreach(), var_dump(), serialize(), comparison, etc. Now properties are ordered according to their layout in zend_object structure.

6 files changed, 19 insertions, 19 deletions

diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt
index 310fd97991..c16c5c825d 100644
--- a/Zend/tests/bug27798.phpt
+++ b/Zend/tests/bug27798.phpt
@@ -57,12 +57,12 @@ array(3) {
 }
 Child::__construct
 array(3) {
-  ["Baz"]=>
-  int(4)
   ["Foo"]=>
   int(1)
   ["Bar"]=>
   int(2)
+  ["Baz"]=>
+  int(4)
 }
 array(1) {
   ["Foo"]=>
diff --git a/Zend/tests/bug60536_003.phpt b/Zend/tests/bug60536_003.phpt
index 3ba23b9288..8696591bb2 100644
--- a/Zend/tests/bug60536_003.phpt
+++ b/Zend/tests/bug60536_003.phpt
@@ -32,14 +32,14 @@ var_dump($b);
 ?>
 --EXPECTF--
 object(SubclassA)#%d (2) {
-  ["hello":"SubclassA":private]=>
-  int(0)
   ["hello":"BaseWithPropA":private]=>
   int(0)
+  ["hello":"SubclassA":private]=>
+  int(0)
 }
 object(SubclassB)#%d (2) {
-  ["hello":"SubclassB":private]=>
-  int(0)
   ["hello":"BaseWithTPropB":private]=>
   int(0)
+  ["hello":"SubclassB":private]=>
+  int(0)
 }
diff --git a/Zend/tests/bug79862.phpt b/Zend/tests/bug79862.phpt
index b923da78b4..a04dc5c9ac 100644
--- a/Zend/tests/bug79862.phpt
+++ b/Zend/tests/bug79862.phpt
@@ -45,14 +45,14 @@ NULL
 NULL
 NULL
 object(c)#1 (6) {
-  ["prop1"]=>
-  int(1)
-  ["prop2":protected]=>
-  int(2)
   ["prop3":"a":private]=>
   int(3)
   ["prop4":"a":private]=>
   int(4)
+  ["prop1"]=>
+  int(1)
+  ["prop2":protected]=>
+  int(2)
   ["prop5"]=>
   int(5)
   ["prop6"]=>
diff --git a/Zend/tests/get_mangled_object_vars.phpt b/Zend/tests/get_mangled_object_vars.phpt
index 735548579e..f9ad008a33 100644
--- a/Zend/tests/get_mangled_object_vars.phpt
+++ b/Zend/tests/get_mangled_object_vars.phpt
@@ -33,10 +33,10 @@ echo "\n";
 ?>
 --EXPECT--
 array (
-  '' . "\0" . 'B' . "\0" . 'priv' => 4,
   'pub' => 1,
   '' . "\0" . '*' . "\0" . 'prot' => 2,
   '' . "\0" . 'A' . "\0" . 'priv' => 3,
+  '' . "\0" . 'B' . "\0" . 'priv' => 4,
   'dyn' => 5,
   6 => 6,
 )
diff --git a/Zend/tests/objects_033.phpt b/Zend/tests/objects_033.phpt
index 3c19864490..edb722b040 100644
--- a/Zend/tests/objects_033.phpt
+++ b/Zend/tests/objects_033.phpt
@@ -24,5 +24,5 @@ print_r($a, true);
 var_dump($a < $b);
 ?>
 --EXPECT--
-bool(false)
-bool(false)
+bool(true)
+bool(true)
diff --git a/Zend/tests/traits/property008.phpt b/Zend/tests/traits/property008.phpt
index ff265be2a0..d4d57f379a 100644
--- a/Zend/tests/traits/property008.phpt
+++ b/Zend/tests/traits/property008.phpt
@@ -42,20 +42,20 @@ var_dump($b);
 ?>
 --EXPECT--
 object(SubclassClassicInheritance)#1 (2) {
-  ["hello":"SubclassClassicInheritance":private]=>
-  int(0)
   ["hello":"BaseWithPropA":private]=>
   int(0)
+  ["hello":"SubclassClassicInheritance":private]=>
+  int(0)
 }
 object(SubclassA)#2 (2) {
-  ["hello":"SubclassA":private]=>
-  int(0)
   ["hello":"BaseWithPropA":private]=>
   int(0)
+  ["hello":"SubclassA":private]=>
+  int(0)
 }
 object(SubclassB)#3 (2) {
-  ["hello":"SubclassB":private]=>
-  int(0)
   ["hello":"BaseWithTPropB":private]=>
   int(0)
+  ["hello":"SubclassB":private]=>
+  int(0)
 }