Skip to content

Commit 106f71c

Browse files
nikicnikic
committed
Merge branch 'PHP-7.4'
2 parents db02d7a + c42b7dd commit 106f71c

18 files changed

+128
-14
lines changed

‎Zend/tests/024.phpt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,23 @@ var_dump($a->$b->{$c[1]});
1616
?>
1717
--EXPECTF--
1818
Notice: Undefined variable: a in %s on line %d
19+
20+
Notice: Trying to access array offset on value of type null in %s on line %d
1921
NULL
2022

21-
Notice: Undefined variable: %s in %s on line %d
23+
Notice: Undefined variable: a in %s on line %d
24+
25+
Notice: Undefined variable: c in %s on line %d
2226

23-
Notice: Undefined variable: %s in %s on line %d
27+
Notice: Trying to access array offset on value of type null in %s on line %d
2428
NULL
2529

2630
Notice: Undefined variable: a in %s on line %d
2731
int(1)
2832

29-
Notice: Undefined variable: %s in %s on line %d
33+
Notice: Undefined variable: a in %s on line %d
3034

31-
Notice: Undefined variable: %s in %s on line %d
35+
Notice: Undefined variable: b in %s on line %d
3236
int(0)
3337

3438
Notice: Undefined variable: a in %s on line %d
@@ -45,6 +49,8 @@ NULL
4549

4650
Notice: Undefined variable: c in %s on line %d
4751

52+
Notice: Trying to access array offset on value of type null in %s on line %d
53+
4854
Notice: Trying to get property '1' of non-object in %s on line %d
4955

5056
Notice: Trying to get property '' of non-object in %s on line %d

‎Zend/tests/033.phpt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,40 @@ $arr[][]->bar = 2;
1919
--EXPECTF--
2020
Notice: Undefined variable: arr in %s on line %d
2121

22+
Notice: Trying to access array offset on value of type null in %s on line %d
23+
24+
Notice: Trying to access array offset on value of type null in %s on line %d
25+
26+
Notice: Trying to access array offset on value of type null in %s on line %d
27+
28+
Notice: Trying to access array offset on value of type null in %s on line %d
29+
30+
Notice: Trying to access array offset on value of type null in %s on line %d
31+
2232
Notice: Undefined variable: arr in %s on line %d
2333

34+
Notice: Trying to access array offset on value of type null in %s on line %d
35+
36+
Notice: Trying to access array offset on value of type null in %s on line %d
37+
38+
Notice: Trying to access array offset on value of type null in %s on line %d
39+
40+
Notice: Trying to access array offset on value of type null in %s on line %d
41+
42+
Notice: Trying to access array offset on value of type null in %s on line %d
43+
2444
Notice: Undefined variable: arr in %s on line %d
2545

46+
Notice: Trying to access array offset on value of type null in %s on line %d
47+
48+
Notice: Trying to access array offset on value of type null in %s on line %d
49+
50+
Notice: Trying to access array offset on value of type null in %s on line %d
51+
52+
Notice: Trying to access array offset on value of type null in %s on line %d
53+
54+
Notice: Trying to access array offset on value of type null in %s on line %d
55+
2656
Notice: Trying to get property 'foo' of non-object in %s on line %d
2757

2858
Warning: Creating default object from empty value in %s on line %d

‎Zend/tests/assign_to_var_003.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ var_dump($var1);
1212

1313
echo "Done\n";
1414
?>
15-
--EXPECT--
15+
--EXPECTF--
16+
Notice: Trying to access array offset on value of type float in %s on line %d
1617
NULL
1718
NULL
1819
Done

‎Zend/tests/call_user_func_007.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ var_dump($a);
1313
--EXPECTF--
1414
Notice: Undefined offset: 0 in %s on line %d
1515

16+
Notice: Trying to access array offset on value of type null in %s on line %d
17+
1618
Warning: Parameter 1 to foo() expected to be a reference, value given in %s on line %d
1719
array(0) {
1820
}

‎Zend/tests/dereference_002.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ array(2) {
6969
int(5)
7070
}
7171
int(1)
72+
73+
Notice: Trying to access array offset on value of type int in %s on line %d
7274
NULL
7375

7476
Notice: Undefined offset: 4 in %s on line %d

‎Zend/tests/dereference_010.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ var_dump(b()[1]);
2121

2222
?>
2323
--EXPECTF--
24+
Notice: Trying to access array offset on value of type int in %s on line %d
2425
NULL
26+
27+
Notice: Trying to access array offset on value of type int in %s on line %d
2528
NULL
2629

2730
Fatal error: Uncaught Error: Cannot use object of type stdClass as array in %s:%d

‎Zend/tests/dereference_014.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ var_dump($h);
2727

2828
?>
2929
--EXPECTF--
30+
Notice: Trying to access array offset on value of type null in %s on line %d
31+
3032
Notice: Trying to get property 'a' of non-object in %s on line %d
3133
NULL
3234

35+
Notice: Trying to access array offset on value of type null in %s on line %d
36+
3337
Notice: Trying to get property 'b' of non-object in %s on line %d
3438
NULL

‎Zend/tests/isset_003.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Notice: Undefined variable: c in %s on line %d
3333

3434
Notice: Undefined variable: d in %s on line %d
3535

36+
Notice: Trying to access array offset on value of type null in %s on line %d
37+
3638
Notice: Trying to get property '' of non-object in %s on line %d
3739
bool(false)
3840
bool(true)

‎Zend/tests/offset_bool.phpt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,31 @@ var_dump($bool[$arr]);
2424

2525
echo "Done\n";
2626
?>
27-
--EXPECT--
27+
--EXPECTF--
28+
Notice: Trying to access array offset on value of type bool in %s on line %d
2829
NULL
30+
31+
Notice: Trying to access array offset on value of type bool in %s on line %d
2932
NULL
33+
34+
Notice: Trying to access array offset on value of type bool in %s on line %d
3035
NULL
36+
37+
Notice: Trying to access array offset on value of type bool in %s on line %d
3138
NULL
39+
40+
Notice: Trying to access array offset on value of type bool in %s on line %d
3241
NULL
42+
43+
Notice: Trying to access array offset on value of type bool in %s on line %d
3344
NULL
45+
46+
Notice: Trying to access array offset on value of type bool in %s on line %d
3447
NULL
48+
49+
Notice: Trying to access array offset on value of type bool in %s on line %d
3550
NULL
51+
52+
Notice: Trying to access array offset on value of type bool in %s on line %d
3653
NULL
3754
Done

‎Zend/tests/offset_long.phpt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,31 @@ var_dump($long[$arr]);
2424

2525
echo "Done\n";
2626
?>
27-
--EXPECT--
27+
--EXPECTF--
28+
Notice: Trying to access array offset on value of type int in %s on line %d
2829
NULL
30+
31+
Notice: Trying to access array offset on value of type int in %s on line %d
2932
NULL
33+
34+
Notice: Trying to access array offset on value of type int in %s on line %d
3035
NULL
36+
37+
Notice: Trying to access array offset on value of type int in %s on line %d
3138
NULL
39+
40+
Notice: Trying to access array offset on value of type int in %s on line %d
3241
NULL
42+
43+
Notice: Trying to access array offset on value of type int in %s on line %d
3344
NULL
45+
46+
Notice: Trying to access array offset on value of type int in %s on line %d
3447
NULL
48+
49+
Notice: Trying to access array offset on value of type int in %s on line %d
3550
NULL
51+
52+
Notice: Trying to access array offset on value of type int in %s on line %d
3653
NULL
3754
Done

0 commit comments

Comments
 (0)