Skip to content

Commit 61f399a

Browse files
committed
Improve error message for invalid property read
1 parent 9377f79 commit 61f399a

19 files changed

+48
-42
lines changed

Zend/tests/024.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ NULL
4141
Warning: Undefined variable $b in %s on line %d
4242
int(1)
4343

44-
Warning: Trying to get property '1' of non-object in %s on line %d
44+
Warning: Access to property '1' on int in %s on line %d
4545
NULL
4646

47-
Warning: Trying to get property '1' of non-object in %s on line %d
47+
Warning: Access to property '1' on int in %s on line %d
4848
NULL
4949

5050
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

54-
Warning: Trying to get property '1' of non-object in %s on line %d
54+
Warning: Access to property '1' on int in %s on line %d
5555

56-
Warning: Trying to get property '' of non-object in %s on line %d
56+
Warning: Access to property '' on null in %s on line %d
5757
NULL

Zend/tests/026.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ print "ok\n";
2222

2323
?>
2424
--EXPECTF--
25-
Warning: Trying to get property 'a' of non-object in %s on line %d
25+
Warning: Access to property 'a' on null in %s on line %d
2626
ok
2727
Attempt to assign property 'a' of non-object
2828
ok

Zend/tests/033.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ Warning: Trying to access array offset on value of type null in %s on line %d
6161

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

64-
Warning: Trying to get property 'foo' of non-object in %s on line %d
64+
Warning: Access to property 'foo' on null in %s on line %d
6565
Attempt to assign property 'foo' of non-object
6666
Attempt to assign property 'bar' of non-object

Zend/tests/bug31098.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ok
4444
ok
4545
ok
4646

47-
Warning: Trying to get property 'wrong' of non-object in %s on line %d
47+
Warning: Access to property 'wrong' on string in %s on line %d
4848
ok
4949

5050
Warning: Illegal string offset 'wrong' in %s on line %d

Zend/tests/bug44660.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var_dump($a);
4848
?>
4949
--EXPECTF--
5050
--> read access:
51-
Warning: Trying to get property 'p' of non-object in %s on line %d
51+
Warning: Access to property 'p' on bool in %s on line %d
5252

5353
--> direct assignment:
5454
Attempt to assign property 'p' of non-object

Zend/tests/bug47109.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ $a->{"a"."b"};
77
--EXPECTF--
88
Warning: Undefined variable $a in %s on line %d
99

10-
Warning: Trying to get property 'ab' of non-object in %s on line %d
10+
Warning: Access to property 'ab' on null in %s on line %d

Zend/tests/bug76667.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@ class T {
1313
{
1414
return $this->$v /= 0;
1515
}
16-
};
16+
}
1717

1818
$x = new T;
1919
$x->x = 1;
2020
?>
2121
--EXPECTF--
2222
Warning: Undefined variable $undefined in %s on line %d
2323

24-
Warning: Trying to get property '1' of non-object in %s on line %d
24+
Warning: Access to property '1' on null in %s on line %d
2525

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

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

30-
Warning: Trying to get property 'NAN' of non-object in %s on line %d
30+
Warning: Access to property 'NAN' on null in %s on line %d
3131

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

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

36-
Warning: Trying to get property 'NAN' of non-object in %s on line %d
36+
Warning: Access to property 'NAN' on null in %s on line %d
3737

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

Zend/tests/dereference_014.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ var_dump($h);
2929
--EXPECTF--
3030
Warning: Trying to access array offset on value of type null in %s on line %d
3131

32-
Warning: Trying to get property 'a' of non-object in %s on line %d
32+
Warning: Access to property 'a' on null in %s on line %d
3333
NULL
3434

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

37-
Warning: Trying to get property 'b' of non-object in %s on line %d
37+
Warning: Access to 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
@@ -35,7 +35,7 @@ Warning: Undefined variable $d in %s on line %d
3535

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

38-
Warning: Trying to get property '' of non-object in %s on line %d
38+
Warning: Access to property '' on string in %s on line %d
3939
bool(false)
4040
bool(true)
4141
bool(false)

Zend/tests/varSyntax/encapsed_string_deref.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var_dump("foo$bar"());
2222
--EXPECTF--
2323
string(1) "f"
2424

25-
Warning: Trying to get property 'prop' of non-object in %s on line %d
25+
Warning: Access to property 'prop' on string in %s on line %d
2626
NULL
2727
Call to a member function method() on string
2828
int(42)

0 commit comments

Comments
 (0)