Skip to content

Commit 4dc26dd

Browse files
kocsismatekocsismate
committed
Handle offset and index related error messages
1 parent 8724bdd commit 4dc26dd

File tree

81 files changed

+193
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+193
-192
lines changed

‎Zend/tests/028.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bool(true)
1818
bool(true)
1919
bool(true)
2020

21-
Notice: Undefined offset: 2 in %s on line %d
21+
Notice: Undefined array offset 2 in %s on line %d
2222

2323
Fatal error: Uncaught Error: Value of type null is not callable in %s:%d
2424
Stack trace:

‎Zend/tests/array_offset.phpt

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ Ensure "undefined offset" notice formats message correctly when undefined key is
1111
echo "Done\n";
1212
?>
1313
--EXPECTF--
14-
Notice: Undefined offset: -1 in %s on line 3
14+
Notice: Undefined array offset -1 in %s on line %d
1515

16-
Notice: Undefined offset: -1 in %s on line 4
16+
Notice: Undefined array offset -1 in %s on line %d
1717

18-
Notice: Undefined offset: -1 in %s on line 5
18+
Notice: Undefined array offset -1 in %s on line 5
1919

20-
Notice: Undefined offset: -1 in %s on line 6
20+
Notice: Undefined array offset -1 in %s on line 6
2121
Done

‎Zend/tests/bug29883.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bool(false)
1515
bool(true)
1616
bool(true)
1717

18-
Warning: Uninitialized string offset: -10 in %s on line %d
18+
Warning: Uninitialized string offset -10 in %s on line %d
1919
string(0) ""
2020
string(1) "u"
2121
string(1) "u"

‎Zend/tests/bug31098.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ ok
4747
Warning: Attempt to read property "wrong" on string in %s on line %d
4848
ok
4949

50-
Warning: Illegal string offset 'wrong' in %s on line %d
50+
Warning: Illegal string offset "wrong" in %s on line %d
5151
ok
5252
ok
5353

54-
Warning: Illegal string offset 'wrong' in %s on line %d
54+
Warning: Illegal string offset "wrong" in %s on line %d
5555
ok

‎Zend/tests/bug37667.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var_dump($obj);
2929
--EXPECTF--
3030
string(3) "bar"
3131

32-
Notice: Undefined offset: 2 in %sbug37667.php on line 16
32+
Notice: Undefined array offset 2 in %s on line %d
3333
NULL
3434
object(Test)#%d (1) {
3535
["property":protected]=>

‎Zend/tests/bug39018.phpt

+13-13
Original file line numberDiff line numberDiff line change
@@ -64,39 +64,39 @@ print "\nDone\n";
6464
--EXPECTF--
6565
Warning: String offset cast occurred in %s on line %d
6666

67-
Warning: Uninitialized string offset: %s in %s on line %d
67+
Warning: Uninitialized string offset 430646668853805056 in %s on line %d
6868

69-
Warning: Uninitialized string offset: 0 in %s on line %d
69+
Warning: Uninitialized string offset 0 in %s on line %d
7070

71-
Warning: Uninitialized string offset: 0 in %s on line %d
71+
Warning: Uninitialized string offset 0 in %s on line %d
7272

7373
Warning: String offset cast occurred in %s on line %d
7474

75-
Warning: Uninitialized string offset: %i in %s on line %d
75+
Warning: Uninitialized string offset -6171178737961271296 in %s on line %d
7676

7777
Warning: String offset cast occurred in %s on line %d
7878

79-
Warning: Uninitialized string offset: %i in %s on line %d
79+
Warning: Uninitialized string offset -6171178737961271296 in %s on line %d
8080

81-
Warning: Uninitialized string offset: 0 in %s on line %d
81+
Warning: Uninitialized string offset 0 in %s on line %d
8282

83-
Warning: Uninitialized string offset: 4 in %s on line %d
83+
Warning: Uninitialized string offset 4 in %s on line %d
8484

85-
Warning: Uninitialized string offset: 4 in %s on line %d
85+
Warning: Uninitialized string offset 4 in %s on line %d
8686

87-
Warning: Uninitialized string offset: 4 in %s on line %d
87+
Warning: Uninitialized string offset 4 in %s on line %d
8888

89-
Warning: Uninitialized string offset: 4 in %s on line %d
89+
Warning: Uninitialized string offset 4 in %s on line %d
9090

91-
Warning: Uninitialized string offset: 4 in %s on line %d
91+
Warning: Uninitialized string offset 4 in %s on line %d
9292

9393
Warning: String offset cast occurred in %s on line %d
9494

95-
Warning: Uninitialized string offset: 12 in %s on line %d
95+
Warning: Uninitialized string offset 12 in %s on line %d
9696

9797
Warning: String offset cast occurred in %s on line %d
9898

99-
Warning: Uninitialized string offset: 12 in %s on line %d
99+
Warning: Uninitialized string offset 12 in %s on line %d
100100

101101
Warning: String offset cast occurred in %s on line %d
102102

‎Zend/tests/bug39304.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Bug #39304 (Segmentation fault with list unpacking of string offset)
77
var_dump($a,$b);
88
?>
99
--EXPECTF--
10-
Warning: Uninitialized string offset: 0 in %s on line %d
10+
Warning: Uninitialized string offset 0 in %s on line %d
1111
NULL
1212
NULL

‎Zend/tests/bug52041.phpt

+6-6
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,23 @@ Warning: Undefined variable $x in %s on line %d
7171

7272
Warning: Undefined variable $x in %s on line %d
7373

74-
Notice: Undefined offset: 0 in %s on line %d
74+
Notice: Undefined array offset 0 in %s on line %d
7575

7676
Warning: Undefined variable $x in %s on line %d
7777

78-
Notice: Undefined offset: 0 in %s on line %d
78+
Notice: Undefined array offset 0 in %s on line %d
7979

80-
Notice: Undefined offset: 0 in %s on line %d
80+
Notice: Undefined array offset 0 in %s on line %d
8181

8282
Warning: Undefined variable $x in %s on line %d
8383

84-
Notice: Undefined offset: 0 in %s on line %d
84+
Notice: Undefined array offset 0 in %s on line %d
8585

8686
Warning: Undefined variable $x in %s on line %d
8787

88-
Notice: Undefined offset: 0 in %s on line %d
88+
Notice: Undefined array offset 0 in %s on line %d
8989

90-
Notice: Undefined offset: 0 in %s on line %d
90+
Notice: Undefined array offset 0 in %s on line %d
9191

9292
Warning: Undefined variable $x in %s on line %d
9393
NULL

‎Zend/tests/bug53432.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ string(1) "a"
5050
string(1) "a"
5151
string(6) " a"
5252

53-
Warning: Illegal string offset: -1 in %s on line %d
53+
Warning: Illegal string offset -1 in %s on line %d
5454
NULL
5555
string(0) ""
5656

57-
Warning: Illegal string offset 'foo' in %s on line %d
57+
Warning: Illegal string offset "foo" in %s on line %d
5858
string(1) "a"
5959
string(1) "a"
6060
Error: [] operator not supported for strings

‎Zend/tests/bug64578.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ $y = '1';
1010
x($y);
1111
print_r($y);
1212
--EXPECT--
13-
string(25) "Illegal string offset 'a'"
13+
string(25) "Illegal string offset "a""
1414
1

‎Zend/tests/bug72943.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ $a[0] = "t";
1212
var_dump($array[$a]);
1313
?>
1414
--EXPECTF--
15-
Notice: Undefined index: lest in %sbug72943.php on line %d
15+
Notice: Undefined array index "lest" in %s on line %d
1616
NULL
1717

18-
Notice: Undefined index: fest in %sbug72943.php on line %d
18+
Notice: Undefined array index "fest" in %s on line %d
1919
NULL
2020
int(1)

‎Zend/tests/bug73792.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ unset($value);
1212
echo 'done';
1313
?>
1414
--EXPECTF--
15-
Warning: Illegal string offset 'bbb' in %sbug73792.php on line 4
15+
Warning: Illegal string offset "bbb" in %s on line %d
1616

1717
Fatal error: Uncaught Error: Cannot iterate on string offsets by reference in %sbug73792.php:4
1818
Stack trace:

‎Zend/tests/bug74836.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ bool(true)
2424
string(2) "42"
2525
bool(true)
2626

27-
Notice: Undefined index: 010 in %s on line %d
27+
Notice: Undefined array index "010" in %s on line %d
2828
NULL
2929
bool(false)
3030

31-
Notice: Undefined index: 010 in %s on line %d
31+
Notice: Undefined array index "010" in %s on line %d
3232
NULL
3333
bool(false)

‎Zend/tests/bug76534.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $x = "foo";
1010
$y = &$x["bar"];
1111
?>
1212
--EXPECTF--
13-
Fatal error: Uncaught Exception: Illegal string offset 'bar' in %sbug76534.php:%d
13+
Fatal error: Uncaught Exception: Illegal string offset "bar" in %s:%d
1414
Stack trace:
1515
#0 %sbug76534.php(%d): {closure}(2, 'Illegal string ...', '%s', %d)
1616
#1 {main}

‎Zend/tests/bug79793.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ var_dump($ary);
1818

1919
?>
2020
--EXPECT--
21-
Undefined index: foobar
21+
Undefined array index "foobar"
2222
array(1) {
2323
["foobar"]=>
2424
int(1)
2525
}
26-
Undefined index: foobarbaz
26+
Undefined array index "foobarbaz"
2727
array(2) {
2828
["foobar"]=>
2929
int(1)

‎Zend/tests/call_user_func_007.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_dump($a);
1111

1212
?>
1313
--EXPECTF--
14-
Notice: Undefined offset: 0 in %s on line %d
14+
Notice: Undefined array offset 0 in %s on line %d
1515

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

‎Zend/tests/const_dereference_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ foreach (array(array(1, 2, 3))[0] as $var) {
1515
--EXPECTF--
1616
int(4)
1717

18-
Notice: Undefined index: foo in %sconst_dereference_001.php on line %d
18+
Notice: Undefined array index "foo" in %s on line %d
1919
NULL
2020
int(6)
2121
123

‎Zend/tests/const_dereference_002.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_dump("foobar"["foo"]["bar"]);
1111
string(1) "b"
1212
string(1) "o"
1313

14-
Warning: Illegal string offset 'foo' in %sconst_dereference_002.php on line %d
14+
Warning: Illegal string offset "foo" in %s on line %d
1515

16-
Warning: Illegal string offset 'bar' in %sconst_dereference_002.php on line %d
16+
Warning: Illegal string offset "bar" in %s on line %d
1717
string(1) "f"

‎Zend/tests/const_dereference_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ foreach (array([1, 2, 3])[0] as $var) {
1515
--EXPECTF--
1616
int(4)
1717

18-
Notice: Undefined index: foo in %sconst_dereference_003.php on line %d
18+
Notice: Undefined array index "foo" in %s on line %d
1919
NULL
2020
int(6)
2121
123

‎Zend/tests/constant_expressions_arrays.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ int(1)
3232
int(4)
3333
int(1)
3434

35-
Notice: Undefined offset: 3 in %s on line %d
35+
Notice: Undefined array offset 3 in %s on line %d
3636
array(3) {
3737
[0]=>
3838
int(1)

‎Zend/tests/dereference_001.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump(a()[1][0]); // int(5)
1212
function b() {
1313
return array();
1414
}
15-
var_dump(b()[0]); // Notice: Undefined offset: 0
15+
var_dump(b()[0]); // Notice: Undefined array offset 0
1616

1717
class foo {
1818
public $y = 1;
@@ -44,7 +44,7 @@ var_dump(e()['b']); // string(3) "bar"
4444
--EXPECTF--
4545
int(5)
4646

47-
Notice: Undefined offset: 0 in %s on line %d
47+
Notice: Undefined array offset 0 in %s on line %d
4848
NULL
4949
int(1)
5050
string(1) "b"

‎Zend/tests/dereference_002.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ int(1)
7373
Warning: Trying to access array offset on value of type int in %s on line %d
7474
NULL
7575

76-
Notice: Undefined offset: 4 in %s on line %d
76+
Notice: Undefined array offset 4 in %s on line %d
7777
NULL
7878

79-
Notice: Undefined offset: 3 in %s on line %d
79+
Notice: Undefined array offset 3 in %s on line %d
8080

8181
Fatal error: Uncaught Error: Call to a member function bar() on null in %s:%d
8282
Stack trace:

‎Zend/tests/dereference_013.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ array(1) {
3434
int(1)
3535
}
3636

37-
Notice: Undefined offset: %d in %s on line %d
37+
Notice: Undefined array offset 2 in %s on line %d
3838
NULL

‎Zend/tests/globals_001.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ string(5) "array"
2626
int(%d)
2727
string(%d) "%s"
2828

29-
Notice: Undefined index: PHP_SELF in %s on line %d
29+
Notice: Undefined array index "PHP_SELF" in %s on line %d
3030
NULL
3131

3232
Warning: Undefined variable $_SERVER in %s on line %d

‎Zend/tests/globals_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ string(5) "array"
2929
int(%d)
3030
string(%d) "%s"
3131

32-
Notice: Undefined index: PHP_SELF in %s on line %d
32+
Notice: Undefined array index "PHP_SELF" in %s on line %d
3333
NULL
3434

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

‎Zend/tests/globals_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ string(5) "array"
3535
int(%d)
3636
string(%d) "%s"
3737

38-
Notice: Undefined index: PHP_SELF in %s on line %d
38+
Notice: Undefined array index "PHP_SELF" in %s on line %d
3939
NULL
4040

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

‎Zend/tests/globals_004.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ string(5) "array"
2020
int(%d)
2121
string(%d) "%s"
2222

23-
Notice: Undefined index: PHP_SELF in %s on line %d
23+
Notice: Undefined array index "PHP_SELF" in %s on line %d
2424
NULL
2525

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

‎Zend/tests/indexing_001.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ array(1) {
7575
}
7676
}
7777

78-
Warning: Illegal string offset 'foo' in %s on line %d
78+
Warning: Illegal string offset "foo" in %s on line %d
7979

8080
Warning: Array to string conversion in %s on line %d
8181

8282
Warning: Only the first byte will be assigned to the string offset in %s on line %d
8383
string(1) "A"
8484

85-
Warning: Illegal string offset 'foo' in %s on line %d
85+
Warning: Illegal string offset "foo" in %s on line %d
8686

8787
Warning: Array to string conversion in %s on line %d
8888

‎Zend/tests/list/list_reference_006.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ object(StorageNoRef)#1 (1) {
3535
}
3636
}
3737

38-
Notice: Undefined offset: 2 in %s on line %d
38+
Notice: Undefined array offset 2 in %s on line %d
3939
object(StorageNoRef)#2 (1) {
4040
["s":"StorageNoRef":private]=>
4141
array(2) {

‎Zend/tests/list_006.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ list($a, list($b, list(list($d)))) = array();
77

88
?>
99
--EXPECTF--
10-
Notice: Undefined offset: 0 in %s on line %d
10+
Notice: Undefined array offset 0 in %s on line %d
1111

12-
Notice: Undefined offset: 1 in %s on line %d
12+
Notice: Undefined array offset 1 in %s on line %d

‎Zend/tests/list_keyed_conversions.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ int(1)
3131

3232
Warning: Resource ID#%d used as offset, casting to integer (%d) in %s on line %d
3333

34-
Notice: Undefined offset: 1 in %s on line %d
34+
Notice: Undefined array offset 1 in %s on line %d

‎Zend/tests/list_keyed_undefined.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ var_dump($five, $duke);
1414

1515
?>
1616
--EXPECTF--
17-
Notice: Undefined offset: 5 in %s on line %d
17+
Notice: Undefined array offset 5 in %s on line %d
1818

19-
Notice: Undefined index: duke in %s on line %d
19+
Notice: Undefined array index "duke" in %s on line %d
2020
NULL
2121
NULL

0 commit comments

Comments
 (0)