Review the usage of apostrophes in error messages

Closes GH-5590

25 files changed, 38 insertions, 38 deletions

diff --git a/ext/standard/tests/array/array_diff_ukey_variation10.phpt b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
index bd5823e698..b8dfb73873 100644
--- a/ext/standard/tests/array/array_diff_ukey_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_variation10.phpt
@@ -25,5 +25,5 @@ try {
 ?>
 --EXPECT--
 *** Testing array_diff_ukey() : usage variation ***
-array_diff_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name
-array_diff_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name
+array_diff_ukey(): Argument #3 must be a valid callback, function "unknown_function" not found or invalid function name
+array_diff_ukey(): Argument #3 must be a valid callback, function "unknown_function" not found or invalid function name
diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt
index e5118a01e0..f5158e337c 100644
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -64,6 +64,6 @@ array(7) {
   [6]=>
   NULL
 }
-array_filter(): Argument #2 ($callback) must be a valid callback, function 'echo' not found or invalid function name
-array_filter(): Argument #2 ($callback) must be a valid callback, function 'exit' not found or invalid function name
+array_filter(): Argument #2 ($callback) must be a valid callback, function "echo" not found or invalid function name
+array_filter(): Argument #2 ($callback) must be a valid callback, function "exit" not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
index 734564e0e3..71126a1edd 100644
--- a/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_variation8.phpt
@@ -25,5 +25,5 @@ try {
 ?>
 --EXPECT--
 *** Testing array_intersect_ukey() : usage variation ***
-array_intersect_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name
-array_intersect_ukey(): Argument #3 must be a valid callback, function 'unknown_function' not found or invalid function name
+array_intersect_ukey(): Argument #3 must be a valid callback, function "unknown_function" not found or invalid function name
+array_intersect_ukey(): Argument #3 must be a valid callback, function "unknown_function" not found or invalid function name
diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt
index 4e97270b64..53524fc819 100644
--- a/ext/standard/tests/array/array_map_object2.phpt
+++ b/ext/standard/tests/array/array_map_object2.phpt
@@ -39,7 +39,7 @@ echo "Done";
 --EXPECT--
 *** Testing array_map() :  with non-existent class and method ***
 -- with non-existent class --
-array_map(): Argument #1 ($callback) must be a valid callback, class 'non-existent' not found
+array_map(): Argument #1 ($callback) must be a valid callback, class "non-existent" not found
 -- with existent class and non-existent method --
-array_map(): Argument #1 ($callback) must be a valid callback, class 'SimpleClass' does not have a method 'non-existent'
+array_map(): Argument #1 ($callback) must be a valid callback, class SimpleClass does not have a method "non-existent"
 Done
diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt
index 11b56a6723..b5528c9e7c 100644
--- a/ext/standard/tests/array/array_map_object3.phpt
+++ b/ext/standard/tests/array/array_map_object3.phpt
@@ -76,7 +76,7 @@ array(3) {
   int(7)
 }
 -- accessing child method from parent class --
-array_map(): Argument #1 ($callback) must be a valid callback, class 'ParentClass' does not have a method 'staticChild'
+array_map(): Argument #1 ($callback) must be a valid callback, class ParentClass does not have a method "staticChild"
 -- accessing parent method using child class object --
 array(3) {
   [0]=>
@@ -87,5 +87,5 @@ array(3) {
   int(7)
 }
 -- accessing child method using parent class object --
-array_map(): Argument #1 ($callback) must be a valid callback, class 'ParentClass' does not have a method 'staticChild'
+array_map(): Argument #1 ($callback) must be a valid callback, class ParentClass does not have a method "staticChild"
 Done
diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
index 69eaf2e3d7..1c4f3b23a1 100644
--- a/ext/standard/tests/array/array_map_variation12.phpt
+++ b/ext/standard/tests/array/array_map_variation12.phpt
@@ -44,5 +44,5 @@ array(3) {
 -- with built-in function 'pow' and one parameter --
 pow() expects exactly 2 parameters, 1 given
 -- with language construct --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'echo' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "echo" not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index e51fb0b381..2670537b46 100644
--- a/ext/standard/tests/array/array_map_variation14.phpt
+++ b/ext/standard/tests/array/array_map_variation14.phpt
@@ -118,7 +118,7 @@ array(2) {
   int(2)
 }
 -- with empty string --
-array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name
 -- with empty array --
 array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members
 Done
diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt
index d8f5747ab4..f10be3cc32 100644
--- a/ext/standard/tests/array/array_map_variation15.phpt
+++ b/ext/standard/tests/array/array_map_variation15.phpt
@@ -23,5 +23,5 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing array_map() : non existent 'callback' function ***
-array_map(): Argument #1 ($callback) must be a valid callback, function 'non_existent' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "non_existent" not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt
index 4d13691ade..21034375b9 100644
--- a/ext/standard/tests/array/array_map_variation16.phpt
+++ b/ext/standard/tests/array/array_map_variation16.phpt
@@ -38,19 +38,19 @@ echo "Done";
 --EXPECT--
 *** Testing array_map() : non-permmited built-in functions ***
 -- Iteration 1 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'echo' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "echo" not found or invalid function name
 -- Iteration 2 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'array' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "array" not found or invalid function name
 -- Iteration 3 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'empty' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "empty" not found or invalid function name
 -- Iteration 4 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'eval' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "eval" not found or invalid function name
 -- Iteration 5 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'exit' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "exit" not found or invalid function name
 -- Iteration 6 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'isset' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "isset" not found or invalid function name
 -- Iteration 7 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'list' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "list" not found or invalid function name
 -- Iteration 8 --
-array_map(): Argument #1 ($callback) must be a valid callback, function 'print' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "print" not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
index 3a547d67ef..a3aeb9f22a 100644
--- a/ext/standard/tests/array/array_map_variation17.phpt
+++ b/ext/standard/tests/array/array_map_variation17.phpt
@@ -115,10 +115,10 @@ array_map(): Argument #1 ($callback) must be a valid callback, no array or strin
 array_map(): Argument #1 ($callback) must be a valid callback, no array or string given
 
 -- Iteration 14 --
-array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name
 
 -- Iteration 15 --
-array_map(): Argument #1 ($callback) must be a valid callback, function '' not found or invalid function name
+array_map(): Argument #1 ($callback) must be a valid callback, function "" not found or invalid function name
 
 -- Iteration 16 --
 array_map(): Argument #1 ($callback) must be a valid callback, array must have exactly two members
diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index f26cf1b1fd..8002957e7e 100644
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -35,5 +35,5 @@ bool(true)
 -- With 'min' built-in function --
 bool(true)
 -- With 'echo' language construct --
-array_walk_recursive(): Argument #2 ($funcname) must be a valid callback, function 'echo' not found or invalid function name
+array_walk_recursive(): Argument #2 ($funcname) must be a valid callback, function "echo" not found or invalid function name
 Done
diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt
index d855429c28..2186bb6402 100644
--- a/ext/standard/tests/array/array_walk_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_variation8.phpt
@@ -35,5 +35,5 @@ bool(true)
 -- With 'min' built-in function --
 bool(true)
 -- With 'echo' language construct --
-array_walk(): Argument #2 ($funcname) must be a valid callback, function 'echo' not found or invalid function name
+array_walk(): Argument #2 ($funcname) must be a valid callback, function "echo" not found or invalid function name
 Done
diff --git a/ext/standard/tests/filters/object_init_failure.phpt b/ext/standard/tests/filters/object_init_failure.phpt
index 6375969e03..3a88d87cca 100644
--- a/ext/standard/tests/filters/object_init_failure.phpt
+++ b/ext/standard/tests/filters/object_init_failure.phpt
@@ -16,4 +16,4 @@ try {
 Warning: file_get_contents(): Unable to create or locate filter "sample.filter" in %s on line %d
 
 Warning: file_get_contents(): Unable to create filter (sample.filter) in %s on line %d
-Undefined constant 'FOO'
+Undefined constant "FOO"
diff --git a/ext/standard/tests/filters/object_init_failure_2.phpt b/ext/standard/tests/filters/object_init_failure_2.phpt
index 251ebf519c..32473bc831 100644
--- a/ext/standard/tests/filters/object_init_failure_2.phpt
+++ b/ext/standard/tests/filters/object_init_failure_2.phpt
@@ -16,4 +16,4 @@ try {
 Warning: main(): Unable to create or locate filter "sample.filter" in %s on line %d
 
 Warning: main(): Unable to create filter (sample.filter) in %s on line %d
-Undefined constant 'FOO'
+Undefined constant "FOO"
diff --git a/ext/standard/tests/general_functions/bug72920.phpt b/ext/standard/tests/general_functions/bug72920.phpt
index 24a8724904..cee43561de 100644
--- a/ext/standard/tests/general_functions/bug72920.phpt
+++ b/ext/standard/tests/general_functions/bug72920.phpt
@@ -13,4 +13,4 @@ try {
 }
 ?>
 --EXPECT--
-Cannot access private const Foo::C1
+Cannot access private constant Foo::C1
diff --git a/ext/standard/tests/general_functions/callbacks_001.phpt b/ext/standard/tests/general_functions/callbacks_001.phpt
index 67afab6345..a1c5b4cdec 100644
--- a/ext/standard/tests/general_functions/callbacks_001.phpt
+++ b/ext/standard/tests/general_functions/callbacks_001.phpt
@@ -106,4 +106,4 @@ O
 $this|O::who
 O
 $this|B::who
-call_user_func(): Argument #1 ($function) must be a valid callback, class 'P' is not a subclass of 'B'
+call_user_func(): Argument #1 ($function) must be a valid callback, class P is not a subclass of B
diff --git a/ext/standard/tests/general_functions/callbacks_002.phpt b/ext/standard/tests/general_functions/callbacks_002.phpt
index f69a886ad3..220896df67 100644
--- a/ext/standard/tests/general_functions/callbacks_002.phpt
+++ b/ext/standard/tests/general_functions/callbacks_002.phpt
@@ -21,6 +21,6 @@ try {
 
 ?>
 --EXPECT--
-call_user_func(): Argument #1 ($function) must be a valid callback, class 'Foo' not found
+call_user_func(): Argument #1 ($function) must be a valid callback, class "Foo" not found
 call_user_func(): Argument #1 ($function) must be a valid callback, first array member is not a valid class name or object
 call_user_func(): Argument #1 ($function) must be a valid callback, second array member is not a valid method
diff --git a/ext/standard/tests/general_functions/register_tick_function_error.phpt b/ext/standard/tests/general_functions/register_tick_function_error.phpt
index c44dbe0872..82564a83b4 100644
--- a/ext/standard/tests/general_functions/register_tick_function_error.phpt
+++ b/ext/standard/tests/general_functions/register_tick_function_error.phpt
@@ -11,4 +11,4 @@ try {
 }
 ?>
 --EXPECT--
-register_tick_function(): Argument #1 ($function) must be a valid tick callback, 'a' given
+register_tick_function(): Argument #1 ($function) must be a valid tick callback, "a" given
diff --git a/ext/standard/tests/serialize/max_depth.phpt b/ext/standard/tests/serialize/max_depth.phpt
index 79ab13e9f1..312f22226c 100644
--- a/ext/standard/tests/serialize/max_depth.phpt
+++ b/ext/standard/tests/serialize/max_depth.phpt
@@ -104,8 +104,8 @@ var_dump(is_array(unserialize(
 ?>
 --EXPECTF--
 Invalid max_depth:
-unserialize(): 'max_depth' option must be of type int, string given
-unserialize(): 'max_depth' option must be greater than or equal to 0
+unserialize(): "max_depth" option must be of type int, string given
+unserialize(): "max_depth" option must be greater than or equal to 0
 Array:
 bool(true)
 
diff --git a/ext/standard/tests/serialize/serialization_objects_002.phpt b/ext/standard/tests/serialize/serialization_objects_002.phpt
index ab77ece334..ce9ad53f7a 100644
--- a/ext/standard/tests/serialize/serialization_objects_002.phpt
+++ b/ext/standard/tests/serialize/serialization_objects_002.phpt
diff --git a/ext/standard/tests/streams/bug77664.phpt b/ext/standard/tests/streams/bug77664.phpt
index 01722033b5..4d9a2e0cb2 100644
--- a/ext/standard/tests/streams/bug77664.phpt
+++ b/ext/standard/tests/streams/bug77664.phpt
@@ -10,7 +10,7 @@ stream_wrapper_register('error',ErrorWrapper::class);
 file_get_contents('error://test');
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Undefined class constant 'self::INVALID' in %sbug77664.php:%d
+Fatal error: Uncaught Error: Undefined constant self::INVALID in %s:%d
 Stack trace:
 #0 %sbug77664.php(%d): file_get_contents('error://test')
 #1 {main}
diff --git a/ext/standard/tests/strings/printf.phpt b/ext/standard/tests/strings/printf.phpt
index 9d0b88e121..d77dd71c36 100644
--- a/ext/standard/tests/strings/printf.phpt
+++ b/ext/standard/tests/strings/printf.phpt
@@ -683,7 +683,7 @@ Notice: printf(): Requested precision of 988 digits was truncated to PHP maximum
 12345678900.00000000000000000000000000000000000000000000000000000
 
 *** Output for invalid width(-15) specifier ***
-Unknown format specifier '-'
+Unknown format specifier "-"
 
 *** Output for '%F' as the format parameter ***
 12345678900.000000
diff --git a/ext/standard/tests/strings/printf_64bit.phpt b/ext/standard/tests/strings/printf_64bit.phpt
index 2990bd8570..b0e364b9c9 100644
--- a/ext/standard/tests/strings/printf_64bit.phpt
+++ b/ext/standard/tests/strings/printf_64bit.phpt
@@ -683,7 +683,7 @@ Notice: printf(): Requested precision of 988 digits was truncated to PHP maximum
 12345678900.0000000000%d
 
 *** Output for invalid width(-15) specifier ***
-Unknown format specifier '-'
+Unknown format specifier "-"
 
 *** Output for '%F' as the format parameter ***
 12345678900.000000
diff --git a/ext/standard/tests/strings/sprintf_variation52.phpt b/ext/standard/tests/strings/sprintf_variation52.phpt
index f41d7a182c..e7e022a6fa 100644
--- a/ext/standard/tests/strings/sprintf_variation52.phpt
+++ b/ext/standard/tests/strings/sprintf_variation52.phpt
@@ -50,7 +50,7 @@ Notice: sprintf(): Requested precision of 988 digits was truncated to PHP maximu
 string(65) "12345678900.00000000000000000000000000000000000000000000000000000"
 
 -- Testing for invalid width(-15) specifier --
-Unknown format specifier '-'
+Unknown format specifier "-"
 
 -- Testing for '%X' as the format parameter --
 string(1) "C"
diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt
index 0f29541689..703bc73ad8 100644
--- a/ext/standard/tests/strings/vfprintf_error3.phpt
+++ b/ext/standard/tests/strings/vfprintf_error3.phpt
@@ -49,5 +49,5 @@ unlink( $file );
 -- Testing vfprintf() function with wrong variable types as argument --
 vfprintf(): Argument #2 ($format) must be of type string, array given
 vfprintf(): Argument #3 ($args) must be of type array, string given
-Unknown format specifier 'y'
+Unknown format specifier "y"
 string(0) ""