Skip to content

Commit dc33687

Browse files
kocsismatekocsismate
committed
Make array offset error message consistent with property access error messages
1 parent 8fccfb3 commit dc33687

18 files changed

+60
-60
lines changed

‎Zend/tests/024.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ var_dump($a->$b->{$c[1]});
1717
--EXPECTF--
1818
Warning: Undefined variable $a in %s on line %d
1919

20-
Warning: Trying to access array offset on value of type null in %s on line %d
20+
Warning: Trying to access array offset on null in %s on line %d
2121
NULL
2222

2323
Warning: Undefined variable $a in %s on line %d
2424

2525
Warning: Undefined variable $c in %s on line %d
2626

27-
Warning: Trying to access array offset on value of type null in %s on line %d
27+
Warning: Trying to access array offset on null in %s on line %d
2828
NULL
2929

3030
Warning: Undefined variable $a in %s on line %d
@@ -49,7 +49,7 @@ NULL
4949

5050
Warning: Undefined variable $c in %s on line %d
5151

52-
Warning: Trying to access array offset on value of type null in %s on line %d
52+
Warning: Trying to access array offset on null in %s on line %d
5353

5454
Warning: Attempt to read property "1" on int in %s on line %d
5555

‎Zend/tests/033.phpt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,39 @@ try {
2727
--EXPECTF--
2828
Warning: Undefined variable $arr in %s on line %d
2929

30-
Warning: Trying to access array offset on value of type null in %s on line %d
30+
Warning: Trying to access array offset on null in %s on line %d
3131

32-
Warning: Trying to access array offset on value of type null in %s on line %d
32+
Warning: Trying to access array offset on null in %s on line %d
3333

34-
Warning: Trying to access array offset on value of type null in %s on line %d
34+
Warning: Trying to access array offset on null in %s on line %d
3535

36-
Warning: Trying to access array offset on value of type null in %s on line %d
36+
Warning: Trying to access array offset on null in %s on line %d
3737

38-
Warning: Trying to access array offset on value of type null in %s on line %d
38+
Warning: Trying to access array offset on null in %s on line %d
3939

4040
Warning: Undefined variable $arr in %s on line %d
4141

42-
Warning: Trying to access array offset on value of type null in %s on line %d
42+
Warning: Trying to access array offset on null in %s on line %d
4343

44-
Warning: Trying to access array offset on value of type null in %s on line %d
44+
Warning: Trying to access array offset on null in %s on line %d
4545

46-
Warning: Trying to access array offset on value of type null in %s on line %d
46+
Warning: Trying to access array offset on null in %s on line %d
4747

48-
Warning: Trying to access array offset on value of type null in %s on line %d
48+
Warning: Trying to access array offset on null in %s on line %d
4949

50-
Warning: Trying to access array offset on value of type null in %s on line %d
50+
Warning: Trying to access array offset on null in %s on line %d
5151

5252
Warning: Undefined variable $arr in %s on line %d
5353

54-
Warning: Trying to access array offset on value of type null in %s on line %d
54+
Warning: Trying to access array offset on null in %s on line %d
5555

56-
Warning: Trying to access array offset on value of type null in %s on line %d
56+
Warning: Trying to access array offset on null in %s on line %d
5757

58-
Warning: Trying to access array offset on value of type null in %s on line %d
58+
Warning: Trying to access array offset on null in %s on line %d
5959

60-
Warning: Trying to access array offset on value of type null in %s on line %d
60+
Warning: Trying to access array offset on null in %s on line %d
6161

62-
Warning: Trying to access array offset on value of type null in %s on line %d
62+
Warning: Trying to access array offset on null in %s on line %d
6363

6464
Warning: Attempt to read property "foo" on null in %s on line %d
6565
Attempt to assign property "foo" on null

‎Zend/tests/assign_to_var_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var_dump($var1);
1313
echo "Done\n";
1414
?>
1515
--EXPECTF--
16-
Warning: Trying to access array offset on value of type float in %s on line %d
16+
Warning: Trying to access array offset on float in %s on line %d
1717
NULL
1818
NULL
1919
Done

‎Zend/tests/call_user_func_007.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var_dump($a);
1313
--EXPECTF--
1414
Warning: Undefined array key 0 in %s on line %d
1515

16-
Warning: Trying to access array offset on value of type null in %s on line %d
16+
Warning: Trying to access array offset on null in %s on line %d
1717

1818
Warning: foo(): Argument #1 ($ref) must be passed by reference, value given in %s on line %d
1919
array(0) {

‎Zend/tests/dereference_002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ array(2) {
7070
}
7171
int(1)
7272

73-
Warning: Trying to access array offset on value of type int in %s on line %d
73+
Warning: Trying to access array offset on int in %s on line %d
7474
NULL
7575

7676
Warning: Undefined array key 4 in %s on line %d

‎Zend/tests/dereference_010.phpt

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

2222
?>
2323
--EXPECTF--
24-
Warning: Trying to access array offset on value of type int in %s on line %d
24+
Warning: Trying to access array offset on int in %s on line %d
2525
NULL
2626

27-
Warning: Trying to access array offset on value of type int in %s on line %d
27+
Warning: Trying to access array offset on int in %s on line %d
2828
NULL
2929

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

‎Zend/tests/dereference_014.phpt

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

2828
?>
2929
--EXPECTF--
30-
Warning: Trying to access array offset on value of type null in %s on line %d
30+
Warning: Trying to access array offset on null in %s on line %d
3131

3232
Warning: Attempt to read property "a" on null in %s on line %d
3333
NULL
3434

35-
Warning: Trying to access array offset on value of type null in %s on line %d
35+
Warning: Trying to access array offset on null in %s on line %d
3636

3737
Warning: Attempt to read property "b" on null in %s on line %d
3838
NULL

‎Zend/tests/isset_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Warning: Undefined variable $c in %s on line %d
3333

3434
Warning: Undefined variable $d in %s on line %d
3535

36-
Warning: Trying to access array offset on value of type null in %s on line %d
36+
Warning: Trying to access array offset on null in %s on line %d
3737

3838
Warning: Attempt to read property "" on string in %s on line %d
3939
bool(false)

‎Zend/tests/offset_bool.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ var_dump($bool[$arr]);
2525
echo "Done\n";
2626
?>
2727
--EXPECTF--
28-
Warning: Trying to access array offset on value of type true in %s on line %d
28+
Warning: Trying to access array offset on true in %s on line %d
2929
NULL
3030

31-
Warning: Trying to access array offset on value of type true in %s on line %d
31+
Warning: Trying to access array offset on true in %s on line %d
3232
NULL
3333

34-
Warning: Trying to access array offset on value of type true in %s on line %d
34+
Warning: Trying to access array offset on true in %s on line %d
3535
NULL
3636

37-
Warning: Trying to access array offset on value of type true in %s on line %d
37+
Warning: Trying to access array offset on true in %s on line %d
3838
NULL
3939

40-
Warning: Trying to access array offset on value of type true in %s on line %d
40+
Warning: Trying to access array offset on true in %s on line %d
4141
NULL
4242

43-
Warning: Trying to access array offset on value of type true in %s on line %d
43+
Warning: Trying to access array offset on true in %s on line %d
4444
NULL
4545

46-
Warning: Trying to access array offset on value of type true in %s on line %d
46+
Warning: Trying to access array offset on true in %s on line %d
4747
NULL
4848

49-
Warning: Trying to access array offset on value of type true in %s on line %d
49+
Warning: Trying to access array offset on true in %s on line %d
5050
NULL
5151

52-
Warning: Trying to access array offset on value of type true in %s on line %d
52+
Warning: Trying to access array offset on true in %s on line %d
5353
NULL
5454
Done

‎Zend/tests/offset_long.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ var_dump($long[$arr]);
2525
echo "Done\n";
2626
?>
2727
--EXPECTF--
28-
Warning: Trying to access array offset on value of type int in %s on line %d
28+
Warning: Trying to access array offset on int in %s on line %d
2929
NULL
3030

31-
Warning: Trying to access array offset on value of type int in %s on line %d
31+
Warning: Trying to access array offset on int in %s on line %d
3232
NULL
3333

34-
Warning: Trying to access array offset on value of type int in %s on line %d
34+
Warning: Trying to access array offset on int in %s on line %d
3535
NULL
3636

37-
Warning: Trying to access array offset on value of type int in %s on line %d
37+
Warning: Trying to access array offset on int in %s on line %d
3838
NULL
3939

40-
Warning: Trying to access array offset on value of type int in %s on line %d
40+
Warning: Trying to access array offset on int in %s on line %d
4141
NULL
4242

43-
Warning: Trying to access array offset on value of type int in %s on line %d
43+
Warning: Trying to access array offset on int in %s on line %d
4444
NULL
4545

46-
Warning: Trying to access array offset on value of type int in %s on line %d
46+
Warning: Trying to access array offset on int in %s on line %d
4747
NULL
4848

49-
Warning: Trying to access array offset on value of type int in %s on line %d
49+
Warning: Trying to access array offset on int in %s on line %d
5050
NULL
5151

52-
Warning: Trying to access array offset on value of type int in %s on line %d
52+
Warning: Trying to access array offset on int in %s on line %d
5353
NULL
5454
Done

‎Zend/tests/offset_null.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ var_dump($null[$arr]);
2525
echo "Done\n";
2626
?>
2727
--EXPECTF--
28-
Warning: Trying to access array offset on value of type null in %s on line %d
28+
Warning: Trying to access array offset on null in %s on line %d
2929
NULL
3030

31-
Warning: Trying to access array offset on value of type null in %s on line %d
31+
Warning: Trying to access array offset on null in %s on line %d
3232
NULL
3333

34-
Warning: Trying to access array offset on value of type null in %s on line %d
34+
Warning: Trying to access array offset on null in %s on line %d
3535
NULL
3636

37-
Warning: Trying to access array offset on value of type null in %s on line %d
37+
Warning: Trying to access array offset on null in %s on line %d
3838
NULL
3939

40-
Warning: Trying to access array offset on value of type null in %s on line %d
40+
Warning: Trying to access array offset on null in %s on line %d
4141
NULL
4242

43-
Warning: Trying to access array offset on value of type null in %s on line %d
43+
Warning: Trying to access array offset on null in %s on line %d
4444
NULL
4545

46-
Warning: Trying to access array offset on value of type null in %s on line %d
46+
Warning: Trying to access array offset on null in %s on line %d
4747
NULL
4848

49-
Warning: Trying to access array offset on value of type null in %s on line %d
49+
Warning: Trying to access array offset on null in %s on line %d
5050
NULL
5151

52-
Warning: Trying to access array offset on value of type null in %s on line %d
52+
Warning: Trying to access array offset on null in %s on line %d
5353
NULL
5454
Done

‎Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2716,7 +2716,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
27162716
ZVAL_UNDEFINED_OP2();
27172717
}
27182718
if (!is_list && type != BP_VAR_IS) {
2719-
zend_error(E_WARNING, "Trying to access array offset on value of type %s",
2719+
zend_error(E_WARNING, "Trying to access array offset on %s",
27202720
zend_zval_type_name(container));
27212721
}
27222722
ZVAL_NULL(result);

‎ext/opcache/jit/zend_jit_helpers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2342,7 +2342,7 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
23422342

23432343
static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
23442344
{
2345-
zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container));
2345+
zend_error(E_WARNING, "Trying to access array offset on %s", zend_zval_type_name(container));
23462346
}
23472347

23482348
static void ZEND_FASTCALL zend_jit_invalid_property_read(zval *container, const char *property_name)

‎ext/opcache/tests/jit/fetch_dim_r_008.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ test()[1];
1212
?>
1313
DONE
1414
--EXPECTF--
15-
Warning: Trying to access array offset on value of type null in %sfetch_dim_r_008.php on line 3
15+
Warning: Trying to access array offset on null in %sfetch_dim_r_008.php on line 3
1616
DONE

‎ext/spl/tests/array_026.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var_dump($test, $test3['mmmmm']);
1010
--EXPECTF--
1111
Warning: Undefined variable $test3 in %s on line %d
1212

13-
Warning: Trying to access array offset on value of type null in %s on line %d
13+
Warning: Trying to access array offset on null in %s on line %d
1414
object(ArrayObject)#1 (1) {
1515
["storage":"ArrayObject":private]=>
1616
array(1) {

‎ext/spl/tests/bug62978.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ NULL
3434

3535
Warning: Undefined variable $c in %s on line %d
3636

37-
Warning: Trying to access array offset on value of type null in %s on line %d
37+
Warning: Trying to access array offset on null in %s on line %d
3838
NULL
3939

4040
Warning: Undefined array key "epic_magic" in %s on line %d

‎tests/lang/bug25922.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ test();
2020
?>
2121
--EXPECT--
2222
Undefined variable $data
23-
Trying to access array offset on value of type null
23+
Trying to access array offset on null
2424
Undefined index here: ''

‎tests/lang/passByReference_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Passing undefined by value
2727

2828
Warning: Undefined variable $undef1 in %s on line %d
2929

30-
Warning: Trying to access array offset on value of type null in %s on line %d
30+
Warning: Trying to access array offset on null in %s on line %d
3131

3232
Inside passbyVal call:
3333
NULL

0 commit comments

Comments
 (0)