From ce9971231598f6a51a028ab8222063efdf403255 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 18 Aug 2014 18:20:34 +0200 Subject: [PATCH] Adjust serialization tests to not rely on auto-vivification order --- .../tests/serialize/serialization_arrays_002.phpt | 12 ++++++------ .../tests/serialize/serialization_objects_013.phpt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ext/standard/tests/serialize/serialization_arrays_002.phpt b/ext/standard/tests/serialize/serialization_arrays_002.phpt index f8cef7818ea..c62ff6a91c1 100644 --- a/ext/standard/tests/serialize/serialization_arrays_002.phpt +++ b/ext/standard/tests/serialize/serialization_arrays_002.phpt @@ -37,16 +37,16 @@ check($a); echo "\n\n--- 0 refs 1:\n"; $a = array(); -$a[0] = &$a[1]; $a[1] = 1; +$a[0] = &$a[1]; $a[2] = 1; check($a); echo "\n\n--- 0 refs 2:\n"; $a = array(); +$a[2] = 1; $a[0] = &$a[2]; $a[1] = 1; -$a[2] = 1; check($a); echo "\n\n--- 1 refs 0:\n"; @@ -59,8 +59,8 @@ check($a); echo "\n\n--- 1 refs 2:\n"; $a = array(); $a[0] = 1; -$a[1] = &$a[2]; $a[2] = 1; +$a[1] = &$a[2]; check($a); echo "\n\n--- 2 refs 0:\n"; @@ -79,15 +79,15 @@ check($a); echo "\n\n--- 0,1 ref 2:\n"; $a = array(); +$a[2] = 1; $a[0] = &$a[2]; $a[1] = &$a[2]; -$a[2] = 1; check($a); echo "\n\n--- 0,2 ref 1:\n"; $a = array(); -$a[0] = &$a[1]; $a[1] = 1; +$a[0] = &$a[1]; $a[2] = &$a[1]; check($a); @@ -541,4 +541,4 @@ array(3) { [2]=> &string(10) "b2.changed" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/serialize/serialization_objects_013.phpt b/ext/standard/tests/serialize/serialization_objects_013.phpt index 01b623cb0d5..403f9de08cd 100644 --- a/ext/standard/tests/serialize/serialization_objects_013.phpt +++ b/ext/standard/tests/serialize/serialization_objects_013.phpt @@ -32,16 +32,16 @@ function check(&$obj) { echo "\n\n--- a refs b:\n"; $obj = new stdClass; -$obj->a = &$obj->b; $obj->b = 1; +$obj->a = &$obj->b; $obj->c = 1; check($obj); echo "\n\n--- a refs c:\n"; $obj = new stdClass; +$obj->c = 1; $obj->a = &$obj->c; $obj->b = 1; -$obj->c = 1; check($obj); echo "\n\n--- b refs a:\n"; @@ -54,8 +54,8 @@ check($obj); echo "\n\n--- b refs c:\n"; $obj = new stdClass; $obj->a = 1; -$obj->b = &$obj->c; $obj->c = 1; +$obj->b = &$obj->c; check($obj); echo "\n\n--- c refs a:\n"; @@ -74,15 +74,15 @@ check($obj); echo "\n\n--- a,b refs c:\n"; $obj = new stdClass; +$obj->c = 1; $obj->a = &$obj->c; $obj->b = &$obj->c; -$obj->c = 1; check($obj); echo "\n\n--- a,c refs b:\n"; $obj = new stdClass; -$obj->a = &$obj->b; $obj->b = 1; +$obj->a = &$obj->b; $obj->c = &$obj->b; check($obj); @@ -491,4 +491,4 @@ object(stdClass)#%d (3) { ["c"]=> &string(14) "obj->c.changed" } -Done \ No newline at end of file +Done