Review the usage of apostrophes in error messages

Closes GH-5590

9 files changed, 11 insertions, 11 deletions

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)