Skip to content

Commit d30cd7d

Browse files
committed
Review the usage of apostrophes in error messages
Closes GH-5590
1 parent 2ad75ba commit d30cd7d

File tree

421 files changed

+907
-897
lines changed

Some content is hidden

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

421 files changed

+907
-897
lines changed

Zend/tests/018.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var_dump(constant("TEST_CONST2"));
1818
echo "Done\n";
1919
?>
2020
--EXPECT--
21-
Undefined constant ''
21+
Undefined constant ""
2222
int(1)
2323
string(4) "test"
2424
Done

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: Attempt to read property '1' on int in %s on line %d
44+
Warning: Attempt to read property "1" on int in %s on line %d
4545
NULL
4646

47-
Warning: Attempt to read property '1' on int in %s on line %d
47+
Warning: Attempt to read 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: Attempt to read property '1' on int in %s on line %d
54+
Warning: Attempt to read property "1" on int in %s on line %d
5555

56-
Warning: Attempt to read property '' on null in %s on line %d
56+
Warning: Attempt to read property "" on null in %s on line %d
5757
NULL

Zend/tests/026.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ print "ok\n";
2222

2323
?>
2424
--EXPECTF--
25-
Warning: Attempt to read property 'a' on null in %s on line %d
25+
Warning: Attempt to read property "a" on null in %s on line %d
2626
ok
27-
Attempt to assign property 'a' on null
27+
Attempt to assign property "a" on null
2828
ok

Zend/tests/028.phpt

Lines changed: 1 addition & 1 deletion
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 key 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/033.phpt

Lines changed: 3 additions & 3 deletions
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: Attempt to read property 'foo' on null in %s on line %d
65-
Attempt to assign property 'foo' on null
66-
Attempt to assign property 'bar' on null
64+
Warning: Attempt to read property "foo" on null in %s on line %d
65+
Attempt to assign property "foo" on null
66+
Attempt to assign property "bar" on null

Zend/tests/037.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var_dump($x::$x);
1616
--EXPECTF--
1717
int(1)
1818

19-
Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
19+
Fatal error: Uncaught Error: Access to undeclared static property Closure::$x in %s:%d
2020
Stack trace:
2121
#0 {main}
2222
thrown in %s on line %d

Zend/tests/access_modifiers_008.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ B2::test();
1818

1919
?>
2020
--EXPECTF--
21-
Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d
21+
Fatal error: Call to protected method B1::f() from scope B2 in %s on line %d

Zend/tests/access_modifiers_009.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ B2::test();
2323
--EXPECTF--
2424
bool(false)
2525

26-
Fatal error: Call to protected method B1::f() from context 'B2' in %s on line %d
26+
Fatal error: Call to protected method B1::f() from scope B2 in %s on line %d

Zend/tests/access_modifiers_010.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ new c;
2828

2929
?>
3030
--EXPECTF--
31-
Fatal error: Uncaught Error: Call to private method d::test2() from context 'a' in %s:%d
31+
Fatal error: Uncaught Error: Call to private method d::test2() from scope a in %s:%d
3232
Stack trace:
3333
#0 %s(%d): a->test()
3434
#1 %s(%d): c->__construct()

Zend/tests/array_offset.phpt

Lines changed: 4 additions & 4 deletions
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 key -1 in %s on line %d
1515

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

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

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

0 commit comments

Comments
 (0)