Review the usage of apostrophes in error messages

Closes GH-5590

61 files changed, 71 insertions, 71 deletions

diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index ae2669b670..87da97ac20 100644
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -134,11 +134,11 @@ ObjectOne::offsetGet(4th)
 int(4)
 ObjectOne::offsetGet(5th)
 
-Notice: Undefined index: 5th in %sarray_access_001.php on line %d
+Notice: Undefined array key "5th" in %s on line %d
 NULL
 ObjectOne::offsetGet(6)
 
-Notice: Undefined offset: 6 in %sarray_access_001.php on line %d
+Notice: Undefined array key 6 in %s on line %d
 NULL
 ===offsetSet===
 WRITE 1
diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index 79f4a52853..0f12811b49 100644
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -134,11 +134,11 @@ ObjectOne::offsetGet(4th)
 int(4)
 ObjectOne::offsetGet(5th)
 
-Notice: Undefined index: 5th in %sarray_access_002.php on line %d
+Notice: Undefined array key "5th" in %s on line %d
 NULL
 ObjectOne::offsetGet(6)
 
-Notice: Undefined offset: 6 in %sarray_access_002.php on line %d
+Notice: Undefined array key 6 in %s on line %d
 NULL
 ===offsetSet===
 WRITE 1
diff --git a/tests/classes/autoload_010.phpt b/tests/classes/autoload_010.phpt
index b8aa660730..8b00c9c835 100644
--- a/tests/classes/autoload_010.phpt
+++ b/tests/classes/autoload_010.phpt
@@ -14,7 +14,7 @@ class C implements UndefI
 --EXPECTF--
 In autoload: string(6) "UndefI"
 
-Fatal error: Uncaught Error: Interface 'UndefI' not found in %s:%d
+Fatal error: Uncaught Error: Interface "UndefI" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/autoload_011.phpt b/tests/classes/autoload_011.phpt
index d255a0d23b..727c13c827 100644
--- a/tests/classes/autoload_011.phpt
+++ b/tests/classes/autoload_011.phpt
@@ -14,7 +14,7 @@ class C extends UndefBase
 --EXPECTF--
 In autoload: string(9) "UndefBase"
 
-Fatal error: Uncaught Error: Class 'UndefBase' not found in %s:%d
+Fatal error: Uncaught Error: Class "UndefBase" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/autoload_012.phpt b/tests/classes/autoload_012.phpt
index 7a168b3275..c8dc35b6f1 100644
--- a/tests/classes/autoload_012.phpt
+++ b/tests/classes/autoload_012.phpt
@@ -14,4 +14,4 @@ try {
 ?>
 --EXPECT--
 In autoload: string(6) "UndefC"
-call_user_func(): Argument #1 ($function) must be a valid callback, class 'UndefC' not found
+call_user_func(): Argument #1 ($function) must be a valid callback, class "UndefC" not found
diff --git a/tests/classes/autoload_013.phpt b/tests/classes/autoload_013.phpt
index c85c18ec15..1b9302747e 100644
--- a/tests/classes/autoload_013.phpt
+++ b/tests/classes/autoload_013.phpt
@@ -16,4 +16,4 @@ catch (ReflectionException $e) {
 ?>
 --EXPECT--
 In autoload: string(6) "UndefC"
-Class UndefC does not exist
+Class "UndefC" does not exist
diff --git a/tests/classes/autoload_014.phpt b/tests/classes/autoload_014.phpt
index 827224aaa5..13f16f8264 100644
--- a/tests/classes/autoload_014.phpt
+++ b/tests/classes/autoload_014.phpt
@@ -16,4 +16,4 @@ catch (ReflectionException $e) {
 ?>
 --EXPECT--
 In autoload: string(6) "UndefC"
-Class UndefC does not exist
+Class "UndefC" does not exist
diff --git a/tests/classes/autoload_015.phpt b/tests/classes/autoload_015.phpt
index 9f023d5be5..9aa862a783 100644
--- a/tests/classes/autoload_015.phpt
+++ b/tests/classes/autoload_015.phpt
@@ -16,4 +16,4 @@ catch (ReflectionException $e) {
 ?>
 --EXPECT--
 In autoload: string(6) "UndefC"
-Class UndefC does not exist
+Class "UndefC" does not exist
diff --git a/tests/classes/autoload_016.phpt b/tests/classes/autoload_016.phpt
index ceb8ce6bbc..13454d018c 100644
--- a/tests/classes/autoload_016.phpt
+++ b/tests/classes/autoload_016.phpt
@@ -17,4 +17,4 @@ $rc->getProperty("UndefC::p");
 ?>
 --EXPECT--
 In autoload: string(6) "undefc"
-Class undefc does not exist
+Class "undefc" does not exist
diff --git a/tests/classes/autoload_017.phpt b/tests/classes/autoload_017.phpt
index a1485f3aeb..ef327ed376 100644
--- a/tests/classes/autoload_017.phpt
+++ b/tests/classes/autoload_017.phpt
@@ -17,4 +17,4 @@ try {
 ?>
 --EXPECT--
 In autoload: string(6) "UndefI"
-Interface UndefI does not exist
+Interface "UndefI" does not exist
diff --git a/tests/classes/autoload_021.phpt b/tests/classes/autoload_021.phpt
index 673813cb2e..859a911669 100644
--- a/tests/classes/autoload_021.phpt
+++ b/tests/classes/autoload_021.phpt
@@ -10,7 +10,7 @@ $x = new $a;
 echo "BUG\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Class '../BUG' not found in %sautoload_021.php:6
+Fatal error: Uncaught Error: Class "../BUG" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %sautoload_021.php on line 6
diff --git a/tests/classes/bug27504.phpt b/tests/classes/bug27504.phpt
index 74d14c8a40..b6df46920a 100644
--- a/tests/classes/bug27504.phpt
+++ b/tests/classes/bug27504.phpt
@@ -28,4 +28,4 @@ try {
 --EXPECT--
 Called function foo:bar(1)
 call_user_func_array(): Argument #1 ($function) must be a valid callback, cannot access private method foo::bar()
-Call to private method foo::bar() from context ''
+Call to private method foo::bar() from global scope
diff --git a/tests/classes/bug75765.phpt b/tests/classes/bug75765.phpt
index b3c8a17f6f..dc283ae5fe 100644
--- a/tests/classes/bug75765.phpt
+++ b/tests/classes/bug75765.phpt
@@ -16,7 +16,7 @@ try {
 bool(false)
 bool(false)
 
-Fatal error: Uncaught Error: Class 'B' not found in %s:%d
+Fatal error: Uncaught Error: Class "B" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt
index c052d35701..18ac2416f5 100644
--- a/tests/classes/constants_basic_001.phpt
+++ b/tests/classes/constants_basic_001.phpt
@@ -79,7 +79,7 @@ string(6) "hello2"
 
 Expecting fatal error:
 
-Fatal error: Uncaught Error: Undefined class constant 'C::c19' in %s:%d
+Fatal error: Uncaught Error: Undefined constant C::c19 in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt
index b7f668909b..3d675652ba 100644
--- a/tests/classes/constants_error_004.phpt
+++ b/tests/classes/constants_error_004.phpt
@@ -10,7 +10,7 @@ Class constant whose initial value references a non-existent class
   $a = new C();
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Class 'D' not found in %s:%d
+Fatal error: Uncaught Error: Class "D" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/constants_visibility_002.phpt b/tests/classes/constants_visibility_002.phpt
index 58c35b7a4a..38fa8d614e 100644
--- a/tests/classes/constants_visibility_002.phpt
+++ b/tests/classes/constants_visibility_002.phpt
@@ -24,4 +24,4 @@ try {
 --EXPECT--
 string(14) "protectedConst"
 string(14) "protectedConst"
-Cannot access protected const A::protectedConst
+Cannot access protected constant A::protectedConst
diff --git a/tests/classes/constants_visibility_003.phpt b/tests/classes/constants_visibility_003.phpt
index 7492af90df..7650ca80c8 100644
--- a/tests/classes/constants_visibility_003.phpt
+++ b/tests/classes/constants_visibility_003.phpt
@@ -24,4 +24,4 @@ try {
 --EXPECT--
 string(12) "privateConst"
 string(12) "privateConst"
-Cannot access private const A::privateConst
+Cannot access private constant A::privateConst
diff --git a/tests/classes/constants_visibility_004.phpt b/tests/classes/constants_visibility_004.phpt
index d35597b365..3872bc2829 100644
--- a/tests/classes/constants_visibility_004.phpt
+++ b/tests/classes/constants_visibility_004.phpt
@@ -21,7 +21,7 @@ B::checkConstants();
 int(1)
 int(2)
 
-Fatal error: Uncaught Error: Undefined class constant 'B::Z' in %s:11
+Fatal error: Uncaught Error: Undefined constant B::Z in %s:%d
 Stack trace:
 #0 %s(15): B::checkConstants()
 #1 {main}
diff --git a/tests/classes/constants_visibility_error_001.phpt b/tests/classes/constants_visibility_error_001.phpt
index 35ccf1e83d..368d828a17 100644
--- a/tests/classes/constants_visibility_error_001.phpt
+++ b/tests/classes/constants_visibility_error_001.phpt
@@ -10,7 +10,7 @@ var_dump(A::privateConst);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access private const A::privateConst in %s:6
+Fatal error: Uncaught Error: Cannot access private constant A::privateConst in %s:6
 Stack trace:
 #0 {main}
   thrown in %s on line 6
diff --git a/tests/classes/constants_visibility_error_002.phpt b/tests/classes/constants_visibility_error_002.phpt
index 2068862942..c417b947e5 100644
--- a/tests/classes/constants_visibility_error_002.phpt
+++ b/tests/classes/constants_visibility_error_002.phpt
@@ -10,7 +10,7 @@ var_dump(A::protectedConst);
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Cannot access protected const A::protectedConst in %s:6
+Fatal error: Uncaught Error: Cannot access protected constant A::protectedConst in %s:6
 Stack trace:
 #0 {main}
   thrown in %s on line 6
diff --git a/tests/classes/destructor_visibility_001.phpt b/tests/classes/destructor_visibility_001.phpt
index 41def0e525..6fee6e3be7 100644
--- a/tests/classes/destructor_visibility_001.phpt
+++ b/tests/classes/destructor_visibility_001.phpt
@@ -19,7 +19,7 @@ unset($obj);
 ?>
 ===DONE===
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private Derived::__destruct() from context '' in %sdestructor_visibility_001.php:%d
+Fatal error: Uncaught Error: Call to private Derived::__destruct() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %sdestructor_visibility_001.php on line %d
diff --git a/tests/classes/destructor_visibility_002.phpt b/tests/classes/destructor_visibility_002.phpt
index 227cc1aff0..0d4cedcf79 100644
--- a/tests/classes/destructor_visibility_002.phpt
+++ b/tests/classes/destructor_visibility_002.phpt
@@ -16,7 +16,7 @@ $obj = new Derived;
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 ===DONE===
 
-Warning: Call to private Derived::__destruct() from context '' during shutdown ignored in Unknown on line %d
+Warning: Call to private Derived::__destruct() from global scope during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt
index c4132f9d38..82c6c5c28a 100644
--- a/tests/classes/factory_and_singleton_002.phpt
+++ b/tests/classes/factory_and_singleton_002.phpt
@@ -95,4 +95,4 @@ int(1)
 int(1)
 Done
 
-Warning: Call to protected test::__destruct() from context '' during shutdown ignored in Unknown on line 0
+Warning: Call to protected test::__destruct() from global scope during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/factory_and_singleton_003.phpt b/tests/classes/factory_and_singleton_003.phpt
index cf08fdb717..1e111046bf 100644
--- a/tests/classes/factory_and_singleton_003.phpt
+++ b/tests/classes/factory_and_singleton_003.phpt
@@ -13,7 +13,7 @@ $obj = new test;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to protected test::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: Call to protected test::__construct() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_004.phpt b/tests/classes/factory_and_singleton_004.phpt
index 41e278bdb9..f813f8e604 100644
--- a/tests/classes/factory_and_singleton_004.phpt
+++ b/tests/classes/factory_and_singleton_004.phpt
@@ -13,7 +13,7 @@ $obj = new test;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private test::__construct() from invalid context in %s:%d
+Fatal error: Uncaught Error: Call to private test::__construct() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt
index 78d7e05f0b..41914bf0e0 100644
--- a/tests/classes/factory_and_singleton_005.phpt
+++ b/tests/classes/factory_and_singleton_005.phpt
@@ -14,7 +14,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to protected test::__destruct() from context '' in %sfactory_and_singleton_005.php:%d
+Fatal error: Uncaught Error: Call to protected test::__destruct() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %sfactory_and_singleton_005.php on line %d
diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt
index b11c9f05d4..596a0792cd 100644
--- a/tests/classes/factory_and_singleton_006.phpt
+++ b/tests/classes/factory_and_singleton_006.phpt
@@ -14,7 +14,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private test::__destruct() from context '' in %sfactory_and_singleton_006.php:%d
+Fatal error: Uncaught Error: Call to private test::__destruct() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %sfactory_and_singleton_006.php on line %d
diff --git a/tests/classes/factory_and_singleton_007.phpt b/tests/classes/factory_and_singleton_007.phpt
index 4c15c38383..2c35090eed 100644
--- a/tests/classes/factory_and_singleton_007.phpt
+++ b/tests/classes/factory_and_singleton_007.phpt
@@ -15,7 +15,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to protected test::__clone() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to protected test::__clone() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_008.phpt b/tests/classes/factory_and_singleton_008.phpt
index 1a87833169..2b2c0721c7 100644
--- a/tests/classes/factory_and_singleton_008.phpt
+++ b/tests/classes/factory_and_singleton_008.phpt
@@ -15,7 +15,7 @@ $obj = NULL;
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private test::__clone() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to private test::__clone() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/factory_and_singleton_009.phpt b/tests/classes/factory_and_singleton_009.phpt
index 7795ea4a79..6f2014f48c 100644
--- a/tests/classes/factory_and_singleton_009.phpt
+++ b/tests/classes/factory_and_singleton_009.phpt
@@ -16,4 +16,4 @@ $obj = new test;
 --EXPECT--
 ===DONE===
 
-Warning: Call to protected test::__destruct() from context '' during shutdown ignored in Unknown on line 0
+Warning: Call to protected test::__destruct() from global scope during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/factory_and_singleton_010.phpt b/tests/classes/factory_and_singleton_010.phpt
index a816b3f60f..82fa720b16 100644
--- a/tests/classes/factory_and_singleton_010.phpt
+++ b/tests/classes/factory_and_singleton_010.phpt
@@ -16,4 +16,4 @@ $obj = new test;
 --EXPECT--
 ===DONE===
 
-Warning: Call to private test::__destruct() from context '' during shutdown ignored in Unknown on line 0
+Warning: Call to private test::__destruct() from global scope during shutdown ignored in Unknown on line 0
diff --git a/tests/classes/private_001.phpt b/tests/classes/private_001.phpt
index 34e716e334..99ce5e38ff 100644
--- a/tests/classes/private_001.phpt
+++ b/tests/classes/private_001.phpt
@@ -21,7 +21,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/private_002.phpt b/tests/classes/private_002.phpt
index 7f85324503..ab36114be1 100644
--- a/tests/classes/private_002.phpt
+++ b/tests/classes/private_002.phpt
@@ -30,7 +30,7 @@ echo "Done\n"; // shouldn't be displayed
 Call pass::show()
 Call fail::show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail::show()
 #1 {main}
diff --git a/tests/classes/private_003.phpt b/tests/classes/private_003.phpt
index c142ad5cc7..723e777687 100644
--- a/tests/classes/private_003.phpt
+++ b/tests/classes/private_003.phpt
@@ -31,7 +31,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail::not_ok()
 #1 {main}
diff --git a/tests/classes/private_003b.phpt b/tests/classes/private_003b.phpt
index 9c5e5cbb9a..6b231c5575 100644
--- a/tests/classes/private_003b.phpt
+++ b/tests/classes/private_003b.phpt
@@ -32,7 +32,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail->not_ok()
 #1 {main}
diff --git a/tests/classes/private_004.phpt b/tests/classes/private_004.phpt
index bfecff55b9..98f6b2a2f8 100644
--- a/tests/classes/private_004.phpt
+++ b/tests/classes/private_004.phpt
@@ -27,7 +27,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail::do_show()
 #1 {main}
diff --git a/tests/classes/private_004b.phpt b/tests/classes/private_004b.phpt
index 302c617a5f..27d5ee6b14 100644
--- a/tests/classes/private_004b.phpt
+++ b/tests/classes/private_004b.phpt
@@ -30,7 +30,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail->do_show()
 #1 {main}
diff --git a/tests/classes/private_005.phpt b/tests/classes/private_005.phpt
index 1fb0e3e9fa..5b8410c3d5 100644
--- a/tests/classes/private_005.phpt
+++ b/tests/classes/private_005.phpt
@@ -27,7 +27,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call show()
 
-Fatal error: Uncaught Error: Call to private method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to private method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail::do_show()
 #1 {main}
diff --git a/tests/classes/private_redeclare.phpt b/tests/classes/private_redeclare.phpt
index cee59985c1..da3d99447b 100644
--- a/tests/classes/private_redeclare.phpt
+++ b/tests/classes/private_redeclare.phpt
@@ -35,7 +35,7 @@ test
 derived
 base
 
-Fatal error: Uncaught Error: Call to private method base::show() from context 'derived' in %s:%d
+Fatal error: Uncaught Error: Call to private method base::show() from scope derived in %s:%d
 Stack trace:
 #0 %s(%d): derived->test()
 #1 {main}
diff --git a/tests/classes/protected_001.phpt b/tests/classes/protected_001.phpt
index 026a0f424b..dd20378117 100644
--- a/tests/classes/protected_001.phpt
+++ b/tests/classes/protected_001.phpt
@@ -21,7 +21,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call fail()
 
-Fatal error: Uncaught Error: Call to protected method pass::fail() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to protected method pass::fail() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/protected_001b.phpt b/tests/classes/protected_001b.phpt
index 971436c844..a77fc2dedf 100644
--- a/tests/classes/protected_001b.phpt
+++ b/tests/classes/protected_001b.phpt
@@ -22,7 +22,7 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call fail()
 
-Fatal error: Uncaught Error: Call to protected method pass::fail() from context '' in %s:%d
+Fatal error: Uncaught Error: Call to protected method pass::fail() from global scope in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d
diff --git a/tests/classes/protected_002.phpt b/tests/classes/protected_002.phpt
index f3ddc15db9..13f01cedbb 100644
--- a/tests/classes/protected_002.phpt
+++ b/tests/classes/protected_002.phpt
@@ -30,7 +30,7 @@ echo "Done\n"; // shouldn't be displayed
 Call pass::show()
 Call fail::show()
 
-Fatal error: Uncaught Error: Call to protected method pass::show() from context 'fail' in %s:%d
+Fatal error: Uncaught Error: Call to protected method pass::show() from scope fail in %s:%d
 Stack trace:
 #0 %s(%d): fail::show()
 #1 {main}
diff --git a/tests/classes/static_properties_undeclared_assign.phpt b/tests/classes/static_properties_undeclared_assign.phpt
index e2e4835165..3494fbd917 100644
--- a/tests/classes/static_properties_undeclared_assign.phpt
+++ b/tests/classes/static_properties_undeclared_assign.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p = 1;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: Access to undeclared static property C::$p in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignInc.phpt b/tests/classes/static_properties_undeclared_assignInc.phpt
index 17577863b1..e8f9f39780 100644
--- a/tests/classes/static_properties_undeclared_assignInc.phpt
+++ b/tests/classes/static_properties_undeclared_assignInc.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p += 1;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: Access to undeclared static property C::$p in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_assignRef.phpt b/tests/classes/static_properties_undeclared_assignRef.phpt
index 680aeaf2e8..97135ceb80 100644
--- a/tests/classes/static_properties_undeclared_assignRef.phpt
+++ b/tests/classes/static_properties_undeclared_assignRef.phpt
@@ -7,7 +7,7 @@ $a = 'foo';
 C::$p =& $a;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Access to undeclared static property: C::$p in %s:4
+Fatal error: Uncaught Error: Access to undeclared static property C::$p in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 4
diff --git a/tests/classes/static_properties_undeclared_inc.phpt b/tests/classes/static_properties_undeclared_inc.phpt
index 86b0949627..ac02ee2e5d 100644
--- a/tests/classes/static_properties_undeclared_inc.phpt
+++ b/tests/classes/static_properties_undeclared_inc.phpt
@@ -6,7 +6,7 @@ Class C {}
 C::$p++;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: Access to undeclared static property C::$p in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/classes/static_properties_undeclared_read.phpt b/tests/classes/static_properties_undeclared_read.phpt
index 7028386c69..1ab2112f11 100644
--- a/tests/classes/static_properties_undeclared_read.phpt
+++ b/tests/classes/static_properties_undeclared_read.phpt
@@ -6,7 +6,7 @@ Class C {}
 echo C::$p;
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Access to undeclared static property: C::$p in %s:3
+Fatal error: Uncaught Error: Access to undeclared static property C::$p in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line 3
diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt
index 1540243cbe..ea973f1056 100644
--- a/tests/lang/041.phpt
+++ b/tests/lang/041.phpt
@@ -17,7 +17,7 @@ echo $wrongClassname::$b."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught Error: Class 'B' not found in %s041.php:%d
+Fatal error: Uncaught Error: Class "B" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s041.php on line %d
diff --git a/tests/lang/042.phpt b/tests/lang/042.phpt
index e9e95c8cc1..a06767eb18 100644
--- a/tests/lang/042.phpt
+++ b/tests/lang/042.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::B."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught Error: Class 'B' not found in %s042.php:%d
+Fatal error: Uncaught Error: Class "B" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s042.php on line %d
diff --git a/tests/lang/043.phpt b/tests/lang/043.phpt
index 80c427c8a9..0e7fedd45c 100644
--- a/tests/lang/043.phpt
+++ b/tests/lang/043.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::foo()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught Error: Class 'B' not found in %s043.php:%d
+Fatal error: Uncaught Error: Class "B" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s043.php on line %d
diff --git a/tests/lang/044.phpt b/tests/lang/044.phpt
index eef85c206f..29d8a33e4e 100644
--- a/tests/lang/044.phpt
+++ b/tests/lang/044.phpt
@@ -18,7 +18,7 @@ echo $wrongClassname::$methodname()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught Error: Class 'B' not found in %s044.php:%d
+Fatal error: Uncaught Error: Class "B" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s044.php on line %d
diff --git a/tests/lang/bug25547.phpt b/tests/lang/bug25547.phpt
index 238757592e..53b951fd45 100644
--- a/tests/lang/bug25547.phpt
+++ b/tests/lang/bug25547.phpt
@@ -22,7 +22,7 @@ print_r($output);
 echo "Done";
 ?>
 --EXPECT--
-handler(Undefined index: foo)
+handler(Undefined array key "foo")
 Array
 (
     [foo] => 1
diff --git a/tests/lang/bug29566.phpt b/tests/lang/bug29566.phpt
index 0e6d45158b..c80d1af28f 100644
--- a/tests/lang/bug29566.phpt
+++ b/tests/lang/bug29566.phpt
@@ -11,6 +11,6 @@ foreach($var['nosuchkey'] as $v) {
 }
 ?>
 --EXPECTF--
-Warning: Illegal string offset 'nosuchkey' in %sbug29566.php on line %d
+Warning: Illegal string offset "nosuchkey" in %s on line %d
 
 Warning: foreach() argument must be of type array|object, string given in %sbug29566.php on line %d
diff --git a/tests/lang/bug44827.phpt b/tests/lang/bug44827.phpt
index 9cb8c132e7..60ce81a4ce 100644
--- a/tests/lang/bug44827.phpt
+++ b/tests/lang/bug44827.phpt
@@ -16,4 +16,4 @@ try {
 --EXPECTF--
 Warning: Class constants cannot be defined or redefined in %s on line %d
 
-Fatal error: Class '' not found in %s on line %d
+Fatal error: Class "" not found in %s on line %d
diff --git a/tests/lang/engine_assignExecutionOrder_002.phpt b/tests/lang/engine_assignExecutionOrder_002.phpt
index a8ab0beb10..f9f418d12e 100644
--- a/tests/lang/engine_assignExecutionOrder_002.phpt
+++ b/tests/lang/engine_assignExecutionOrder_002.phpt
@@ -119,12 +119,12 @@ L=100 M=200 N=300
 O= and P=
 10 20 40 50 60 70 80
 
-Notice: Undefined offset: 0 in %s on line %d
+Notice: Undefined array key 0 in %s on line %d
 
-Notice: Undefined offset: 1 in %s on line %d
+Notice: Undefined array key 1 in %s on line %d
 Y=,Z=
 
-Notice: Undefined offset: 1 in %s on line %d
+Notice: Undefined array key 1 in %s on line %d
 AA=10
 CC=10 DD=30
 Array
diff --git a/tests/lang/foreachLoopIterator.001.phpt b/tests/lang/foreachLoopIterator.001.phpt
index 88254558ca..5293ef9d21 100644
--- a/tests/lang/foreachLoopIterator.001.phpt
+++ b/tests/lang/foreachLoopIterator.001.phpt
@@ -128,5 +128,5 @@ meal 0 => breakfast
      --> MealIterator::valid (3)
  --> MealIterator::next (3)
 
-Notice: Undefined offset: 3 in %s on line %d
+Notice: Undefined array key 3 in %s on line %d
  --> MealIterator::valid (4)
diff --git a/tests/output/ob_start_basic_006.phpt b/tests/output/ob_start_basic_006.phpt
index 3e5666fd6b..30b086c63d 100644
--- a/tests/output/ob_start_basic_006.phpt
+++ b/tests/output/ob_start_basic_006.phpt
@@ -81,7 +81,7 @@ Array
 (
 )
 
-Warning: ob_start(): class 'f' not found in %s on line %d
+Warning: ob_start(): class "f" not found in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line %d
 bool(false)
diff --git a/tests/output/ob_start_error_002.phpt b/tests/output/ob_start_error_002.phpt
index 7de4b77061..2366c8da34 100644
--- a/tests/output/ob_start_error_002.phpt
+++ b/tests/output/ob_start_error_002.phpt
@@ -19,22 +19,22 @@ var_dump(ob_start("no"));
 echo "done"
 ?>
 --EXPECTF--
-Warning: ob_start(): class 'nonExistent' not found in %s on line %d
+Warning: ob_start(): class "nonExistent" not found in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line %d
 bool(false)
 
-Warning: ob_start(): class 'C' does not have a method 'nonExistent' in %s on line %d
+Warning: ob_start(): class C does not have a method "nonExistent" in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line 13
 bool(false)
 
-Warning: ob_start(): class 'C' does not have a method 'no' in %s on line %d
+Warning: ob_start(): class C does not have a method "no" in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line 14
 bool(false)
 
-Warning: ob_start(): function 'no' not found or invalid function name in %s on line %d
+Warning: ob_start(): function "no" not found or invalid function name in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line 15
 bool(false)
diff --git a/tests/output/ob_start_error_004.phpt b/tests/output/ob_start_error_004.phpt
index 003c61d1fd..c549292e88 100644
--- a/tests/output/ob_start_error_004.phpt
+++ b/tests/output/ob_start_error_004.phpt
@@ -14,7 +14,7 @@ var_dump(ob_start(array($c, 'f')));
 echo "done"
 ?>
 --EXPECTF--
-Warning: ob_start(): class 'C' does not have a method 'f' in %s on line %d
+Warning: ob_start(): class C does not have a method "f" in %s on line %d
 
 Notice: ob_start(): Failed to create buffer in %s on line %d
 bool(false)
diff --git a/tests/strings/offsets_chaining_5.phpt b/tests/strings/offsets_chaining_5.phpt
index 1c9da47af3..42cb1f2721 100644
--- a/tests/strings/offsets_chaining_5.phpt
+++ b/tests/strings/offsets_chaining_5.phpt
@@ -15,11 +15,11 @@ bool(true)
 string(6) "foobar"
 bool(false)
 
-Warning: Illegal string offset 'foo' in %soffsets_chaining_5.php on line %d
+Warning: Illegal string offset "foo" in %s on line %d
 string(1) "f"
 bool(false)
 
-Warning: Illegal string offset 'foo' in %soffsets_chaining_5.php on line %d
+Warning: Illegal string offset "foo" in %s on line %d
 
-Warning: Illegal string offset 'bar' in %soffsets_chaining_5.php on line %d
+Warning: Illegal string offset "bar" in %s on line %d
 string(1) "f"
diff --git a/tests/strings/offsets_general.phpt b/tests/strings/offsets_general.phpt
index 7bbe9618d5..64d51457d7 100644
--- a/tests/strings/offsets_general.phpt
+++ b/tests/strings/offsets_general.phpt
@@ -20,6 +20,6 @@ string(1) "o"
 bool(true)
 bool(true)
 
-Warning: Illegal string offset 'foo' in %s line %d
+Warning: Illegal string offset "foo" in %s on line %d
 string(1) "f"
 bool(false)