Skip to content

Commit e0f48c0

Browse files
committed
Review the usage of apostrophes in error messages
Additionally, fixing some capitalization problems and wordings.
1 parent 1179686 commit e0f48c0

File tree

97 files changed

+190
-190
lines changed

Some content is hidden

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

97 files changed

+190
-190
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/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 context "a" in %s:%d
3232
Stack trace:
3333
#0 %s(%d): a->test()
3434
#1 %s(%d): c->__construct()

Zend/tests/array_unpack/classes.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ array(3) {
4343
[2]=>
4444
int(3)
4545
}
46-
Exception: Cannot declare self-referencing constant 'self::B'
46+
Exception: Cannot declare self-referencing constant self::B

Zend/tests/bug29015.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object(stdClass)#1 (1) {
1515
string(10) "string('')"
1616
}
1717

18-
Fatal error: Uncaught Error: Cannot access property started with '\0' in %s:%d
18+
Fatal error: Uncaught Error: Cannot access property starting with "\0" in %s:%d
1919
Stack trace:
2020
#0 {main}
2121
thrown in %s on line %d

Zend/tests/bug37632.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ B2::doTest
132132
C2::test
133133
B4::doTest
134134

135-
Fatal error: Uncaught Error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php:%d
135+
Fatal error: Uncaught Error: Call to protected C4::__construct() from context "B4" in %s:%d
136136
Stack trace:
137137
#0 %s(%d): B4::doTest()
138138
#1 {main}

Zend/tests/bug37811.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ string(3) "Foo"
2323

2424
Warning: Constants may only evaluate to scalar values, arrays or resources in %sbug37811.php on line %d
2525

26-
Fatal error: Uncaught Error: Undefined constant 'Baz' in %s:%d
26+
Fatal error: Uncaught Error: Undefined constant Baz in %s:%d
2727
Stack trace:
2828
#0 {main}
2929
thrown in %s on line %d

Zend/tests/bug41633_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Foo {
88
echo Foo::A."\n";
99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught Error: Undefined class constant 'self::B' in %sbug41633_2.php:5
11+
Fatal error: Uncaught Error: Undefined class constant self::B in %s:%d
1212
Stack trace:
1313
#0 {main}
1414
thrown in %sbug41633_2.php on line 5

Zend/tests/bug41633_3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Foo {
99
echo Foo::A;
1010
?>
1111
--EXPECTF--
12-
Fatal error: Uncaught Error: Cannot declare self-referencing constant 'Foo::B' in %sbug41633_3.php:%d
12+
Fatal error: Uncaught Error: Cannot declare self-referencing constant Foo::B in %s:%d
1313
Stack trace:
1414
#0 {main}
1515
thrown in %sbug41633_3.php on line %d

Zend/tests/bug42819.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ Array
297297
[1] => 1
298298
)
299299

300-
Fatal error: Uncaught Error: Undefined constant 'foo\foo\unknown' in %sbug42819.php:%d
300+
Fatal error: Uncaught Error: Undefined constant foo\foo\unknown in %s:%d
301301
Stack trace:
302302
#0 %s(%d): foo\oops()
303303
#1 {main}

Zend/tests/bug43344_1.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ try {
3939

4040
?>
4141
--EXPECT--
42-
Undefined constant 'Foo\bar'
43-
Undefined constant 'Foo\bar'
44-
Undefined constant 'Foo\bar'
45-
Undefined constant 'Foo\bar'
42+
Undefined constant Foo\bar
43+
Undefined constant Foo\bar
44+
Undefined constant Foo\bar
45+
Undefined constant Foo\bar

0 commit comments

Comments
 (0)