From 3ae995f03c8f60c4a4c9718262545cf5a6a08da3 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 17 May 2015 18:35:18 +0200 Subject: 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. --- tests/classes/abstract_class.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/classes/abstract_class.phpt') diff --git a/tests/classes/abstract_class.phpt b/tests/classes/abstract_class.phpt index 097cab1324..1725d45762 100644 --- a/tests/classes/abstract_class.phpt +++ b/tests/classes/abstract_class.phpt @@ -26,7 +26,7 @@ echo "Done\n"; // shouldn't be displayed --EXPECTF-- Call to function show() -Fatal error: Uncaught exception 'EngineException' with message 'Cannot instantiate abstract class fail' in %s:%d +Fatal error: Uncaught EngineException: Cannot instantiate abstract class fail in %s:%d Stack trace: #0 {main} thrown in %s on line %d -- cgit v1.2.1