Skip to content

Commit 36935e4

Browse files
kocsismatekocsismate
committed
Improve undefined variable error messages
Closes GH-5312
1 parent 6bf483a commit 36935e4

File tree

126 files changed

+400
-400
lines changed

Some content is hidden

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

126 files changed

+400
-400
lines changed

‎Zend/tests/019.phpt

Lines changed: 108 additions & 108 deletions
Large diffs are not rendered by default.

‎Zend/tests/024.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@ var_dump($a->$b->{$c[1]});
1515

1616
?>
1717
--EXPECTF--
18-
Warning: Undefined variable: a in %s on line %d
18+
Warning: Undefined variable $a in %s on line %d
1919

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

23-
Warning: Undefined variable: a in %s on line %d
23+
Warning: Undefined variable $a in %s on line %d
2424

25-
Warning: Undefined variable: c in %s on line %d
25+
Warning: Undefined variable $c in %s on line %d
2626

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

30-
Warning: Undefined variable: a in %s on line %d
30+
Warning: Undefined variable $a in %s on line %d
3131
int(1)
3232

33-
Warning: Undefined variable: a in %s on line %d
33+
Warning: Undefined variable $a in %s on line %d
3434

35-
Warning: Undefined variable: b in %s on line %d
35+
Warning: Undefined variable $b in %s on line %d
3636
int(0)
3737

38-
Warning: Undefined variable: a in %s on line %d
38+
Warning: Undefined variable $a in %s on line %d
3939
NULL
4040

41-
Warning: Undefined variable: b in %s on line %d
41+
Warning: Undefined variable $b in %s on line %d
4242
int(1)
4343

4444
Warning: Trying to get property '1' of non-object in %s on line %d
@@ -47,7 +47,7 @@ NULL
4747
Warning: Trying to get property '1' of non-object in %s on line %d
4848
NULL
4949

50-
Warning: Undefined variable: c in %s on line %d
50+
Warning: Undefined variable $c in %s on line %d
5151

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

‎Zend/tests/033.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ try {
2525

2626
?>
2727
--EXPECTF--
28-
Warning: Undefined variable: arr in %s on line %d
28+
Warning: Undefined variable $arr in %s on line %d
2929

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

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

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

40-
Warning: Undefined variable: arr in %s on line %d
40+
Warning: Undefined variable $arr in %s on line %d
4141

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

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

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

52-
Warning: Undefined variable: arr in %s on line %d
52+
Warning: Undefined variable $arr in %s on line %d
5353

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

‎Zend/tests/array_unpack/undef_var.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ array unpacking with undefinded variable
66
var_dump([...$arr]);
77

88
--EXPECTF--
9-
Warning: Undefined variable: arr in %s on line %d
9+
Warning: Undefined variable $arr in %s on line %d
1010

1111
Fatal error: Uncaught Error: Only arrays and Traversables can be unpacked in %s:%d
1212
Stack trace:

‎Zend/tests/arrow_functions/002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ var_dump((fn() => $b + $c)());
99

1010
?>
1111
--EXPECTF--
12-
Warning: Undefined variable: c in %s on line %d
12+
Warning: Undefined variable $c in %s on line %d
1313
int(1)

‎Zend/tests/arrow_functions/003.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ var_dump($fn());
1414

1515
?>
1616
--EXPECTF--
17-
Warning: Undefined variable: a in %s on line %d
17+
Warning: Undefined variable $a in %s on line %d
1818
NULL
1919

20-
Warning: Undefined variable: 5 in %s on line %d
20+
Warning: Undefined variable $5 in %s on line %d
2121
NULL

‎Zend/tests/bug29896.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ function GenerateError2($A1)
2222
GenerateError2("Test2");
2323
?>
2424
--EXPECTF--
25-
#0 userErrorHandler(2, Undefined variable: b, %s, %d) called at [%s:%d]
25+
#0 userErrorHandler(2, Undefined variable $b, %s, %d) called at [%s:%d]
2626
#1 GenerateError1(Test1) called at [%sbug29896.php:16]
2727
#2 GenerateError2(Test2) called at [%sbug29896.php:19]

‎Zend/tests/bug30162.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $db = new hariCow;
4242
var_dump($db);
4343
?>
4444
--EXPECTF--
45-
Warning: Undefined variable: db in %s on line %d
45+
Warning: Undefined variable $db in %s on line %d
4646
NULL
4747
object(hariCow)#%d (2) {
4848
["x"]=>

‎Zend/tests/bug31720.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ try {
1111
}
1212
?>
1313
--EXPECTF--
14-
Warning: Undefined variable: nonesuchvar in %s on line %d
14+
Warning: Undefined variable $nonesuchvar in %s on line %d
1515
array_walk(): Argument #2 ($funcname) must be a valid callback, first array member is not a valid class name or object

‎Zend/tests/bug39036.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ var_dump($key);
1414
echo "Done\n";
1515
?>
1616
--EXPECTF--
17-
Warning: Undefined variable: key in %s on line %d
17+
Warning: Undefined variable $key in %s on line %d
1818
NULL
1919
Done

‎Zend/tests/bug41209.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var_dump(isset($cache[$id]));
3939
echo "Done\n";
4040
?>
4141
--EXPECTF--
42-
Fatal error: Uncaught ErrorException: Undefined variable: id in %s:%d
42+
Fatal error: Uncaught ErrorException: Undefined variable $id in %s:%d
4343
Stack trace:
4444
#0 %s(%d): env::errorHandler(2, 'Undefined varia...', '%s', %d)
4545
#1 {main}

‎Zend/tests/bug43201.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@ Notice: Indirect modification of overloaded property Foo::$arr has no effect in
2626

2727
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 14
2828

29-
Warning: Undefined variable: ref in %s on line %d
29+
Warning: Undefined variable $ref in %s on line %d
3030

31-
Warning: Undefined variable: undef in %s on line %d
31+
Warning: Undefined variable $undef in %s on line %d
3232

3333
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
3434

35-
Warning: Undefined variable: undef in %s on line %d
35+
Warning: Undefined variable $undef in %s on line %d
3636

3737
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
3838

39-
Warning: Undefined variable: undef in %s on line %d
39+
Warning: Undefined variable $undef in %s on line %d
4040

4141
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
4242

43-
Warning: Undefined variable: undef in %s on line %d
43+
Warning: Undefined variable $undef in %s on line %d
4444

4545
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
4646

47-
Warning: Undefined variable: undef in %s on line %d
47+
Warning: Undefined variable $undef in %s on line %d
4848

4949
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
5050

51-
Warning: Undefined variable: undef in %s on line %d
51+
Warning: Undefined variable $undef in %s on line %d
5252

5353
Notice: Indirect modification of overloaded property Foo::$arr has no effect in %sbug43201.php on line 17
5454
ok

‎Zend/tests/bug47109.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object)
55
$a->{"a"."b"};
66
?>
77
--EXPECTF--
8-
Warning: Undefined variable: a in %s on line %d
8+
Warning: Undefined variable $a in %s on line %d
99

1010
Warning: Trying to get property 'ab' of non-object in %s on line %d

‎Zend/tests/bug52001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_dump($temp1);
1111
function a($b,$c) {}
1212
?>
1313
--EXPECTF--
14-
Warning: Undefined variable: var in %s on line %d
14+
Warning: Undefined variable $var in %s on line %d
1515

16-
Warning: Undefined variable: in %s on line %d
16+
Warning: Undefined variable $ in %s on line %d
1717
int(1)

‎Zend/tests/bug52041.phpt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,47 +47,47 @@ foo()[0][0] += 2;
4747
var_dump(foo());
4848
?>
4949
--EXPECTF--
50-
Warning: Undefined variable: x in %s on line %d
50+
Warning: Undefined variable $x in %s on line %d
5151
Attempt to assign property 'a' of non-object
5252

53-
Warning: Undefined variable: x in %s on line %d
53+
Warning: Undefined variable $x in %s on line %d
5454
Attempt to modify property 'a' of non-object
5555

56-
Warning: Undefined variable: x in %s on line %d
56+
Warning: Undefined variable $x in %s on line %d
5757
Attempt to increment/decrement property 'a' of non-object
5858

59-
Warning: Undefined variable: x in %s on line %d
59+
Warning: Undefined variable $x in %s on line %d
6060
Attempt to modify property 'a' of non-object
6161

62-
Warning: Undefined variable: x in %s on line %d
62+
Warning: Undefined variable $x in %s on line %d
6363
Attempt to assign property 'a' of non-object
6464

65-
Warning: Undefined variable: x in %s on line %d
65+
Warning: Undefined variable $x in %s on line %d
6666
Attempt to modify property 'a' of non-object
6767

68-
Warning: Undefined variable: x in %s on line %d
68+
Warning: Undefined variable $x in %s on line %d
6969

70-
Warning: Undefined variable: x in %s on line %d
70+
Warning: Undefined variable $x in %s on line %d
7171

72-
Warning: Undefined variable: x in %s on line %d
72+
Warning: Undefined variable $x in %s on line %d
7373

7474
Notice: Undefined offset: 0 in %s on line %d
7575

76-
Warning: Undefined variable: x in %s on line %d
76+
Warning: Undefined variable $x in %s on line %d
7777

7878
Notice: Undefined offset: 0 in %s on line %d
7979

8080
Notice: Undefined offset: 0 in %s on line %d
8181

82-
Warning: Undefined variable: x in %s on line %d
82+
Warning: Undefined variable $x in %s on line %d
8383

8484
Notice: Undefined offset: 0 in %s on line %d
8585

86-
Warning: Undefined variable: x in %s on line %d
86+
Warning: Undefined variable $x in %s on line %d
8787

8888
Notice: Undefined offset: 0 in %s on line %d
8989

9090
Notice: Undefined offset: 0 in %s on line %d
9191

92-
Warning: Undefined variable: x in %s on line %d
92+
Warning: Undefined variable $x in %s on line %d
9393
NULL

‎Zend/tests/bug61767.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ register_shutdown_function(function(){
1515
//$undefined = null; // defined variable does not cause problems
1616
$undefined->foo();
1717
--EXPECTF--
18-
Error handler called (Undefined variable: undefined)
18+
Error handler called (Undefined variable $undefined)
1919

20-
Fatal error: Uncaught ErrorException: Undefined variable: undefined in %sbug61767.php:%d
20+
Fatal error: Uncaught ErrorException: Undefined variable $undefined in %sbug61767.php:%d
2121
Stack trace:
2222
#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d)
2323
#1 {main}

‎Zend/tests/bug67314.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ echo "made it once\n";
1515
crash();
1616
echo "ok\n";
1717
--EXPECTF--
18-
Warning: Undefined variable: i in %s on line %d
18+
Warning: Undefined variable $i in %s on line %d
1919
made it once
2020

21-
Warning: Undefined variable: i in %s on line %d
21+
Warning: Undefined variable $i in %s on line %d
2222
ok

‎Zend/tests/bug70124.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ try {
3939
}
4040
?>
4141
--EXPECTF--
42-
Warning: Undefined variable: f in %s on line %d
42+
Warning: Undefined variable $f in %s on line %d
4343
string(34) "Value of type null is not callable"
4444
string(31) "Call to undefined method A::y()"
4545
string(31) "Call to undefined method A::y()"

‎Zend/tests/bug72944.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ define('e', 'e');
77
echo "OK\n";
88
?>
99
--EXPECTF--
10-
Warning: Undefined variable: A in %s on line %d
10+
Warning: Undefined variable $A in %s on line %d
1111
OK

‎Zend/tests/bug75921.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ unset($null);
4747
--EXPECTF--
4848
Attempt to assign property 'a' of non-object
4949

50-
Warning: Undefined variable: null in %s on line %d
50+
Warning: Undefined variable $null in %s on line %d
5151
NULL
5252
Attempt to modify property 'a' of non-object
5353

54-
Warning: Undefined variable: null in %s on line %d
54+
Warning: Undefined variable $null in %s on line %d
5555
NULL
5656
Attempt to modify property 'a' of non-object
5757

58-
Warning: Undefined variable: null in %s on line %d
58+
Warning: Undefined variable $null in %s on line %d
5959
NULL
6060
Attempt to modify property 'a' of non-object
6161

62-
Warning: Undefined variable: null in %s on line %d
62+
Warning: Undefined variable $null in %s on line %d
6363
NULL
6464
Attempt to modify property 'a' of non-object
6565

66-
Warning: Undefined variable: null in %s on line %d
66+
Warning: Undefined variable $null in %s on line %d
6767
NULL

‎Zend/tests/bug76667.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ $x = new T;
1919
$x->x = 1;
2020
?>
2121
--EXPECTF--
22-
Warning: Undefined variable: undefined in %s on line %d
22+
Warning: Undefined variable $undefined in %s on line %d
2323

2424
Warning: Trying to get property '1' of non-object in %s on line %d
2525

2626
Warning: Division by zero in %sbug76667.php on line %d
2727

28-
Warning: Undefined variable: undefined in %s on line %d
28+
Warning: Undefined variable $undefined in %s on line %d
2929

3030
Warning: Trying to get property 'NAN' of non-object in %s on line %d
3131

3232
Warning: Division by zero in %sbug76667.php on line %d
3333

34-
Warning: Undefined variable: undefined in %s on line %d
34+
Warning: Undefined variable $undefined in %s on line %d
3535

3636
Warning: Trying to get property 'NAN' of non-object in %s on line %d
3737

‎Zend/tests/bug78531.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ try {
2424
}
2525
?>
2626
--EXPECTF--
27-
Warning: Undefined variable: u1 in %s on line %d
27+
Warning: Undefined variable $u1 in %s on line %d
2828
Attempt to assign property 'a' of non-object
2929

30-
Warning: Undefined variable: u2 in %s on line %d
30+
Warning: Undefined variable $u2 in %s on line %d
3131
Attempt to increment/decrement property 'a' of non-object
3232

33-
Warning: Undefined variable: u3 in %s on line %d
33+
Warning: Undefined variable $u3 in %s on line %d
3434
Attempt to increment/decrement property 'a' of non-object
3535

36-
Warning: Undefined variable: u4 in %s on line %d
36+
Warning: Undefined variable $u4 in %s on line %d
3737
Attempt to modify property 'a' of non-object

‎Zend/tests/call_user_func_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ string(3) "foo"
3434
call_user_func(): Argument #1 ($function) must be a valid callback, class 'foo' not found
3535
call_user_func(): Argument #1 ($function) must be a valid callback, class '' not found
3636

37-
Warning: Undefined variable: foo in %s on line %d
37+
Warning: Undefined variable $foo in %s on line %d
3838
call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object
3939

40-
Warning: Undefined variable: foo in %s on line %d
40+
Warning: Undefined variable $foo in %s on line %d
4141
call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object

‎Zend/tests/clone_003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $a = clone $b;
77

88
?>
99
--EXPECTF--
10-
Warning: Undefined variable: b in %s on line %d
10+
Warning: Undefined variable $b in %s on line %d
1111

1212
Fatal error: Uncaught Error: __clone method called on non-object in %s:%d
1313
Stack trace:

‎Zend/tests/closure_012.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $lambda();
1616
var_dump($i);
1717
?>
1818
--EXPECTF--
19-
Warning: Undefined variable: i in %s on line %d
19+
Warning: Undefined variable $i in %s on line %d
2020

21-
Warning: Undefined variable: i in %s on line %d
21+
Warning: Undefined variable $i in %s on line %d
2222
NULL
2323
int(2)

0 commit comments

Comments
 (0)