Skip to content

Commit ce99712

Browse files
committed
Adjust serialization tests to not rely on auto-vivification order
1 parent ced6d30 commit ce99712

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

ext/standard/tests/serialize/serialization_arrays_002.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ check($a);
3737

3838
echo "\n\n--- 0 refs 1:\n";
3939
$a = array();
40-
$a[0] = &$a[1];
4140
$a[1] = 1;
41+
$a[0] = &$a[1];
4242
$a[2] = 1;
4343
check($a);
4444

4545
echo "\n\n--- 0 refs 2:\n";
4646
$a = array();
47+
$a[2] = 1;
4748
$a[0] = &$a[2];
4849
$a[1] = 1;
49-
$a[2] = 1;
5050
check($a);
5151

5252
echo "\n\n--- 1 refs 0:\n";
@@ -59,8 +59,8 @@ check($a);
5959
echo "\n\n--- 1 refs 2:\n";
6060
$a = array();
6161
$a[0] = 1;
62-
$a[1] = &$a[2];
6362
$a[2] = 1;
63+
$a[1] = &$a[2];
6464
check($a);
6565

6666
echo "\n\n--- 2 refs 0:\n";
@@ -79,15 +79,15 @@ check($a);
7979

8080
echo "\n\n--- 0,1 ref 2:\n";
8181
$a = array();
82+
$a[2] = 1;
8283
$a[0] = &$a[2];
8384
$a[1] = &$a[2];
84-
$a[2] = 1;
8585
check($a);
8686

8787
echo "\n\n--- 0,2 ref 1:\n";
8888
$a = array();
89-
$a[0] = &$a[1];
9089
$a[1] = 1;
90+
$a[0] = &$a[1];
9191
$a[2] = &$a[1];
9292
check($a);
9393

@@ -541,4 +541,4 @@ array(3) {
541541
[2]=>
542542
&string(10) "b2.changed"
543543
}
544-
Done
544+
Done

ext/standard/tests/serialize/serialization_objects_013.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ function check(&$obj) {
3232

3333
echo "\n\n--- a refs b:\n";
3434
$obj = new stdClass;
35-
$obj->a = &$obj->b;
3635
$obj->b = 1;
36+
$obj->a = &$obj->b;
3737
$obj->c = 1;
3838
check($obj);
3939

4040
echo "\n\n--- a refs c:\n";
4141
$obj = new stdClass;
42+
$obj->c = 1;
4243
$obj->a = &$obj->c;
4344
$obj->b = 1;
44-
$obj->c = 1;
4545
check($obj);
4646

4747
echo "\n\n--- b refs a:\n";
@@ -54,8 +54,8 @@ check($obj);
5454
echo "\n\n--- b refs c:\n";
5555
$obj = new stdClass;
5656
$obj->a = 1;
57-
$obj->b = &$obj->c;
5857
$obj->c = 1;
58+
$obj->b = &$obj->c;
5959
check($obj);
6060

6161
echo "\n\n--- c refs a:\n";
@@ -74,15 +74,15 @@ check($obj);
7474

7575
echo "\n\n--- a,b refs c:\n";
7676
$obj = new stdClass;
77+
$obj->c = 1;
7778
$obj->a = &$obj->c;
7879
$obj->b = &$obj->c;
79-
$obj->c = 1;
8080
check($obj);
8181

8282
echo "\n\n--- a,c refs b:\n";
8383
$obj = new stdClass;
84-
$obj->a = &$obj->b;
8584
$obj->b = 1;
85+
$obj->a = &$obj->b;
8686
$obj->c = &$obj->b;
8787
check($obj);
8888

@@ -491,4 +491,4 @@ object(stdClass)#%d (3) {
491491
["c"]=>
492492
&string(14) "obj->c.changed"
493493
}
494-
Done
494+
Done

0 commit comments

Comments
 (0)