Tweak uncaught exception message display

This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.

6 files changed, 6 insertions, 6 deletions

diff --git a/tests/lang/041.phpt b/tests/lang/041.phpt
index 72ab0e4a62..5e88569a32 100644
--- a/tests/lang/041.phpt
+++ b/tests/lang/041.phpt
@@ -17,7 +17,7 @@ echo $wrongClassname::$b."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s041.php:%d
+Fatal error: Uncaught EngineException: Class 'B' not found in %s041.php:%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 ad6e081222..bdf7c018fd 100644
--- a/tests/lang/042.phpt
+++ b/tests/lang/042.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::B."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s042.php:%d
+Fatal error: Uncaught EngineException: Class 'B' not found in %s042.php:%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 8425d9f3d3..58457bbce3 100644
--- a/tests/lang/043.phpt
+++ b/tests/lang/043.phpt
@@ -16,7 +16,7 @@ echo $wrongClassname::foo()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s043.php:%d
+Fatal error: Uncaught EngineException: Class 'B' not found in %s043.php:%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 bc5900a301..2e0479baee 100644
--- a/tests/lang/044.phpt
+++ b/tests/lang/044.phpt
@@ -18,7 +18,7 @@ echo $wrongClassname::$methodname()."\n";
 --EXPECTF--
 foo
 
-Fatal error: Uncaught exception 'EngineException' with message 'Class 'B' not found' in %s044.php:%d
+Fatal error: Uncaught EngineException: Class 'B' not found in %s044.php:%d
 Stack trace:
 #0 {main}
   thrown in %s044.php on line %d
diff --git a/tests/lang/bug32828.phpt b/tests/lang/bug32828.phpt
index ad59646f50..4abf21604f 100644
--- a/tests/lang/bug32828.phpt
+++ b/tests/lang/bug32828.phpt
@@ -13,7 +13,7 @@ ob_start('output_handler');
 ob_end_clean();
 ?>
 --EXPECTF--	
-Fatal error: Uncaught exception 'Exception' in %s:%d
+Fatal error: Uncaught Exception in %s:%d
 Stack trace:
 #0 [internal function]: output_handler('', %d)
 #1 %s(%d): ob_end_clean()
diff --git a/tests/lang/foreachLoopIterator.002.phpt b/tests/lang/foreachLoopIterator.002.phpt
index 713aaaa8f8..38b8fd66d7 100644
--- a/tests/lang/foreachLoopIterator.002.phpt
+++ b/tests/lang/foreachLoopIterator.002.phpt
@@ -21,7 +21,7 @@ foreach ($f as $k=>&$v) {
 --EXPECTF--
 -----( Try to iterate with &$value: )-----
 
-Fatal error: Uncaught exception 'EngineException' with message 'An iterator cannot be used with foreach by reference' in %s:13
+Fatal error: Uncaught EngineException: An iterator cannot be used with foreach by reference in %s:13
 Stack trace:
 #0 {main}
   thrown in %s on line 13