]> granicus.if.org Git - php/commit
Tweak uncaught exception message display
authorNikita Popov <nikic@php.net>
Sun, 17 May 2015 16:35:18 +0000 (18:35 +0200)
committerNikita Popov <nikic@php.net>
Sun, 17 May 2015 16:47:06 +0000 (18:47 +0200)
commit3ae995f03c8f60c4a4c9718262545cf5a6a08da3
tree09057b4ca7235be04e6ee763c11f46aba738e41b
parent0df2f470fa194b28f1eb9e5788b8cf4c3f03f5f7
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.
366 files changed:
Zend/tests/028.phpt
Zend/tests/037.phpt
Zend/tests/access_modifiers_010.phpt
Zend/tests/add_002.phpt
Zend/tests/add_003.phpt
Zend/tests/add_004.phpt
Zend/tests/add_007.phpt
Zend/tests/assert/expect_002.phpt
Zend/tests/assert/expect_007.phpt
Zend/tests/assert/expect_009.phpt
Zend/tests/assert/expect_010.phpt
Zend/tests/assert/expect_011.phpt
Zend/tests/bug24773.phpt
Zend/tests/bug29015.phpt
Zend/tests/bug29674.phpt
Zend/tests/bug31102.phpt
Zend/tests/bug32660.phpt
Zend/tests/bug33318.phpt
Zend/tests/bug34064.phpt
Zend/tests/bug36071.phpt
Zend/tests/bug36268.phpt
Zend/tests/bug37632.phpt
Zend/tests/bug38624.phpt
Zend/tests/bug40621.phpt
Zend/tests/bug41209.phpt
Zend/tests/bug41421.phpt
Zend/tests/bug41633_2.phpt
Zend/tests/bug41633_3.phpt
Zend/tests/bug41813.phpt
Zend/tests/bug41919.phpt
Zend/tests/bug42817.phpt
Zend/tests/bug42818.phpt
Zend/tests/bug42819.phpt
Zend/tests/bug42937.phpt
Zend/tests/bug43344_10.phpt
Zend/tests/bug43344_11.phpt
Zend/tests/bug43344_12.phpt
Zend/tests/bug43344_13.phpt
Zend/tests/bug43344_2.phpt
Zend/tests/bug43344_6.phpt
Zend/tests/bug43344_7.phpt
Zend/tests/bug43344_8.phpt
Zend/tests/bug43344_9.phpt
Zend/tests/bug44141.phpt
Zend/tests/bug45805.phpt
Zend/tests/bug46304.phpt
Zend/tests/bug46381.phpt
Zend/tests/bug47054.phpt
Zend/tests/bug47699.phpt
Zend/tests/bug47704.phpt
Zend/tests/bug48215_2.phpt
Zend/tests/bug48228.phpt
Zend/tests/bug48408.phpt
Zend/tests/bug48693.phpt
Zend/tests/bug49866.phpt
Zend/tests/bug49908.phpt
Zend/tests/bug50005.phpt
Zend/tests/bug50146.phpt
Zend/tests/bug51394.phpt
Zend/tests/bug52361.phpt
Zend/tests/bug52484.phpt
Zend/tests/bug52484_2.phpt
Zend/tests/bug52484_3.phpt
Zend/tests/bug53511.phpt
Zend/tests/bug60738_variation.phpt
Zend/tests/bug60909_1.phpt
Zend/tests/bug61025.phpt
Zend/tests/bug61767.phpt
Zend/tests/bug63111.phpt
Zend/tests/bug63173.phpt
Zend/tests/bug64720.phpt
Zend/tests/bug64821.1.phpt
Zend/tests/bug64821.2.phpt
Zend/tests/bug64821.3.phpt
Zend/tests/bug64960.phpt
Zend/tests/bug64966.phpt
Zend/tests/bug65784.phpt
Zend/tests/bug65911.phpt
Zend/tests/bug68652.phpt
Zend/tests/bug69599.phpt
Zend/tests/call_static_004.phpt
Zend/tests/call_static_006.phpt
Zend/tests/call_user_func_004.phpt
Zend/tests/class_alias_008.phpt
Zend/tests/class_alias_016.phpt
Zend/tests/class_alias_020.phpt
Zend/tests/class_constants_001.phpt
Zend/tests/class_name_as_scalar_error_005.phpt
Zend/tests/class_name_as_scalar_error_006.phpt
Zend/tests/class_name_as_scalar_error_007.phpt
Zend/tests/clone_001.phpt
Zend/tests/clone_003.phpt
Zend/tests/clone_004.phpt
Zend/tests/closure_005.phpt
Zend/tests/closure_019.phpt
Zend/tests/closure_020.phpt
Zend/tests/closure_022.phpt
Zend/tests/closure_033.phpt
Zend/tests/closure_038.phpt
Zend/tests/closure_039.phpt
Zend/tests/constant_expressions_invalid_offset_type_error.phpt
Zend/tests/constant_expressions_self_referencing_array.phpt
Zend/tests/debug_backtrace_with_include_and_this.phpt
Zend/tests/dereference_002.phpt
Zend/tests/dereference_010.phpt
Zend/tests/div_002.phpt
Zend/tests/dynamic_call_001.phpt
Zend/tests/dynamic_call_002.phpt
Zend/tests/dynamic_call_003.phpt
Zend/tests/dynamic_call_004.phpt
Zend/tests/errmsg_044.phpt
Zend/tests/exception_001.phpt
Zend/tests/exception_003.phpt
Zend/tests/exception_004.phpt
Zend/tests/exception_005.phpt
Zend/tests/exception_006.phpt
Zend/tests/exception_007.phpt
Zend/tests/exception_008.phpt
Zend/tests/exception_011.phpt
Zend/tests/exception_012.phpt
Zend/tests/exception_013.phpt
Zend/tests/exception_014.phpt
Zend/tests/exception_015.phpt
Zend/tests/exception_016.phpt
Zend/tests/exception_017.phpt
Zend/tests/exception_handler_002.phpt
Zend/tests/exception_with_by_ref_message.phpt
Zend/tests/gc_030.phpt
Zend/tests/generators/basic_yield_from_exception_handling.phpt
Zend/tests/generators/bug63066.phpt
Zend/tests/generators/bug65161.phpt
Zend/tests/generators/clone.phpt
Zend/tests/generators/errors/generator_instantiate_error.phpt
Zend/tests/generators/errors/non_ref_generator_iterated_by_ref_error.phpt
Zend/tests/generators/errors/resume_running_generator_error.phpt
Zend/tests/generators/errors/serialize_unserialize_error.phpt
Zend/tests/generators/errors/yield_in_force_closed_finally_error.phpt
Zend/tests/generators/finally/throw_yield.phpt
Zend/tests/generators/finally/yield_throw.phpt
Zend/tests/generators/generator_rewind.phpt
Zend/tests/generators/generator_throwing_in_foreach.phpt
Zend/tests/generators/mutli_yield_from_with_exception.phpt
Zend/tests/generators/throw_already_closed.phpt
Zend/tests/generators/throw_caught.phpt
Zend/tests/generators/throw_not_an_exception.phpt
Zend/tests/generators/throw_rethrow.phpt
Zend/tests/generators/throw_uncaught.phpt
Zend/tests/generators/yield_from_already_running.phpt
Zend/tests/generators/yield_from_multi_tree_exception.phpt
Zend/tests/indirect_call_array_001.phpt
Zend/tests/indirect_call_array_002.phpt
Zend/tests/indirect_method_call_002.phpt
Zend/tests/list_005.phpt
Zend/tests/list_007.phpt
Zend/tests/methods-on-non-objects.phpt
Zend/tests/mul_001.phpt
Zend/tests/not_002.phpt
Zend/tests/ns_004.phpt
Zend/tests/ns_026.phpt
Zend/tests/ns_038.phpt
Zend/tests/ns_057.phpt
Zend/tests/ns_058.phpt
Zend/tests/ns_076.phpt
Zend/tests/ns_077_1.phpt
Zend/tests/ns_077_2.phpt
Zend/tests/ns_077_3.phpt
Zend/tests/ns_077_4.phpt
Zend/tests/ns_077_5.phpt
Zend/tests/ns_077_6.phpt
Zend/tests/ns_077_7.phpt
Zend/tests/ns_077_8.phpt
Zend/tests/ns_092.phpt
Zend/tests/objects_017.phpt
Zend/tests/objects_025.phpt
Zend/tests/objects_026.phpt
Zend/tests/objects_029.phpt
Zend/tests/objects_030.phpt
Zend/tests/offset_assign.phpt
Zend/tests/offset_object.phpt
Zend/tests/parent_class_name_without_parent.phpt
Zend/tests/return_types/020.phpt
Zend/tests/str_offset_002.phpt
Zend/tests/sub_001.phpt
Zend/tests/throw_reference.phpt
Zend/tests/traits/bug60173.phpt
Zend/tests/traits/bugs/alias01.phpt
Zend/tests/traits/error_007.phpt
Zend/tests/traits/error_012.phpt
Zend/tests/traits/language008a.phpt
Zend/tests/traits/language008b.phpt
Zend/tests/try_finally_001.phpt
Zend/tests/try_finally_003.phpt
Zend/tests/use_const/no_global_fallback.phpt
Zend/tests/use_function/no_global_fallback.phpt
Zend/tests/use_function/no_global_fallback2.phpt
Zend/tests/varSyntax/method_call_on_string_literal.phpt
Zend/tests/varSyntax/tempDimFetchByRefError.phpt
Zend/tests/varSyntax/tempPropFetchByRefError.phpt
Zend/zend_exceptions.c
ext/curl/tests/curl_file_serialize.phpt
ext/date/tests/DatePeriod_wrong_constructor.phpt
ext/dom/tests/DOMCharacterData_deleteData_error_002.phpt
ext/dom/tests/DOMDocumentFragment_appendXML_error_002.phpt
ext/dom/tests/DOMDocument_saveHTMLFile_error2.phpt
ext/dom/tests/DOMDocument_saveHTML_error2.phpt
ext/dom/tests/DOMDocument_validate_error2.phpt
ext/dom/tests/dom003.phpt
ext/dom/tests/regsiter_node_class.phpt
ext/intl/tests/breakiter___construct.phpt
ext/intl/tests/bug62081.phpt
ext/intl/tests/dateformat_calendars.phpt
ext/intl/tests/dateformat_calendars_variant2.phpt
ext/intl/tests/timezone_getCanonicalID_error.phpt
ext/mysqli/tests/bug33491.phpt
ext/mysqli/tests/bug38003.phpt
ext/mysqli/tests/mysqli_driver_unclonable.phpt
ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
ext/mysqli/tests/mysqli_result_unclonable.phpt
ext/mysqli/tests/mysqli_stmt_unclonable.phpt
ext/mysqli/tests/mysqli_unclonable.phpt
ext/pdo/tests/bug47769.phpt
ext/pdo/tests/pdo_025.phpt
ext/pdo/tests/pdo_036.phpt
ext/pdo/tests/pdo_037.phpt
ext/pdo/tests/pdorow.phpt
ext/pdo_mysql/tests/bug_37445.phpt
ext/pdo_mysql/tests/pdo_mysql_attr_statement_class.phpt
ext/pdo_mysql/tests/pdo_mysql_prepare_native_clear_error.phpt
ext/pdo_mysql/tests/pdo_mysql_prepare_native_mixed_style.phpt
ext/pdo_mysql/tests/pdo_mysql_stmt_errorcode.phpt
ext/pdo_mysql/tests/pdo_mysql_stmt_multiquery.phpt
ext/phar/tests/bug46032.phpt
ext/phar/tests/bug69441.phpt
ext/phar/tests/bug69453.phpt
ext/phar/tests/cache_list/frontcontroller11.phpt
ext/phar/tests/cache_list/frontcontroller12.phpt
ext/phar/tests/cache_list/frontcontroller13.phpt
ext/phar/tests/cache_list/frontcontroller18.phpt
ext/phar/tests/cache_list/frontcontroller19.phpt
ext/phar/tests/cache_list/frontcontroller20.phpt
ext/phar/tests/cache_list/frontcontroller29.phpt
ext/phar/tests/frontcontroller11.phpt
ext/phar/tests/frontcontroller12.phpt
ext/phar/tests/frontcontroller13.phpt
ext/phar/tests/frontcontroller18.phpt
ext/phar/tests/frontcontroller19.phpt
ext/phar/tests/frontcontroller20.phpt
ext/phar/tests/frontcontroller29.phpt
ext/phar/tests/tar/frontcontroller11.phar.phpt
ext/phar/tests/tar/frontcontroller12.phar.phpt
ext/phar/tests/tar/frontcontroller13.phar.phpt
ext/phar/tests/tar/frontcontroller18.phar.phpt
ext/phar/tests/tar/frontcontroller19.phar.phpt
ext/phar/tests/tar/frontcontroller20.phar.phpt
ext/phar/tests/zip/frontcontroller11.phar.phpt
ext/phar/tests/zip/frontcontroller12.phar.phpt
ext/phar/tests/zip/frontcontroller13.phar.phpt
ext/phar/tests/zip/frontcontroller18.phar.phpt
ext/phar/tests/zip/frontcontroller19.phar.phpt
ext/phar/tests/zip/frontcontroller20.phar.phpt
ext/reflection/tests/ReflectionClass_CannotClone_basic.phpt
ext/reflection/tests/ReflectionClass_getName_error1.phpt
ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt
ext/reflection/tests/ReflectionClass_isCloneable_001.phpt
ext/reflection/tests/ReflectionClass_isIterateable_001.phpt
ext/reflection/tests/ReflectionClass_isSubclassOf_error1.phpt
ext/reflection/tests/ReflectionClass_newInstanceWithoutConstructor.phpt
ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt
ext/reflection/tests/ReflectionMethod_constructor_error1.phpt
ext/reflection/tests/ReflectionObject_getName_error1.phpt
ext/reflection/tests/ReflectionObject_isSubclassOf_error.phpt
ext/reflection/tests/ReflectionParameter_export_error3.phpt
ext/reflection/tests/bug64007.phpt
ext/session/tests/bug60634_error_1.phpt
ext/session/tests/bug60634_error_2.phpt
ext/session/tests/bug60634_error_3.phpt
ext/session/tests/bug60634_error_4.phpt
ext/session/tests/bug60634_error_5.phpt
ext/session/tests/session_module_name_variation3.phpt
ext/session/tests/session_set_save_handler_error3.phpt
ext/simplexml/tests/SimpleXMLElement_xpath.phpt
ext/spl/tests/DirectoryIterator_empty_constructor.phpt
ext/spl/tests/DirectoryIterator_getInode_error.phpt
ext/spl/tests/SplDoublyLinkedList_offsetGet_param_array.phpt
ext/spl/tests/SplDoublyLinkedList_offsetGet_param_string.phpt
ext/spl/tests/SplFileInfo_getGroup_error.phpt
ext/spl/tests/SplFileInfo_getInode_error.phpt
ext/spl/tests/SplFileInfo_getOwner_error.phpt
ext/spl/tests/SplFileInfo_getPerms_error.phpt
ext/spl/tests/arrayObject_setFlags_basic2.phpt
ext/spl/tests/bug48023.phpt
ext/spl/tests/bug49972.phpt
ext/spl/tests/bug52238.phpt
ext/spl/tests/bug54281.phpt
ext/spl/tests/bug54291.phpt
ext/spl/tests/iterator_035.phpt
ext/spl/tests/recursiveIteratorIterator_beginchildren_error.phpt
ext/spl/tests/recursiveIteratorIterator_callHasChildren_error.phpt
ext/spl/tests/recursiveIteratorIterator_endchildren_error.phpt
ext/spl/tests/recursiveIteratorIterator_nextelement_error.phpt
ext/spl/tests/spl_autoload_012.phpt
ext/spl/tests/spl_heap_count_basic.phpt
ext/spl/tests/spl_iterator_recursive_getiterator_error.phpt
ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
ext/sqlite3/tests/sqlite3_15_open_error.phpt
ext/sqlite3/tests/sqlite3_21_security.phpt
ext/standard/tests/array/arsort_object1.phpt
ext/standard/tests/array/arsort_object2.phpt
ext/standard/tests/array/bug35821.phpt
ext/standard/tests/file/bug38450_2.phpt
ext/standard/tests/general_functions/bug47857.phpt
ext/standard/tests/serialize/bug69152.phpt
ext/tidy/tests/035.phpt
ext/xmlreader/tests/bug51936.phpt
ext/xsl/tests/bug49634.phpt
sapi/cgi/tests/004.phpt
sapi/cli/tests/008.phpt
sapi/cli/tests/php_cli_server_015.phpt
tests/basic/timeout_variation_6.phpt
tests/classes/abstract.phpt
tests/classes/abstract_class.phpt
tests/classes/abstract_inherit.phpt
tests/classes/abstract_user_call.phpt
tests/classes/array_access_012.phpt
tests/classes/autoload_021.phpt
tests/classes/bug27504.phpt
tests/classes/class_abstract.phpt
tests/classes/constants_basic_001.phpt
tests/classes/ctor_visibility.phpt
tests/classes/destructor_visibility_001.phpt
tests/classes/factory_and_singleton_003.phpt
tests/classes/factory_and_singleton_004.phpt
tests/classes/factory_and_singleton_005.phpt
tests/classes/factory_and_singleton_006.phpt
tests/classes/factory_and_singleton_007.phpt
tests/classes/factory_and_singleton_008.phpt
tests/classes/interface_instantiate.phpt
tests/classes/private_001.phpt
tests/classes/private_002.phpt
tests/classes/private_003.phpt
tests/classes/private_003b.phpt
tests/classes/private_004.phpt
tests/classes/private_004b.phpt
tests/classes/private_005.phpt
tests/classes/private_005b.phpt
tests/classes/private_redeclare.phpt
tests/classes/property_recreate_private.phpt
tests/classes/property_recreate_protected.phpt
tests/classes/protected_001.phpt
tests/classes/protected_001b.phpt
tests/classes/protected_002.phpt
tests/classes/static_properties_003_error1.phpt
tests/classes/static_properties_003_error2.phpt
tests/classes/static_properties_003_error3.phpt
tests/classes/static_properties_003_error4.phpt
tests/classes/static_properties_undeclared_assign.phpt
tests/classes/static_properties_undeclared_assignInc.phpt
tests/classes/static_properties_undeclared_assignRef.phpt
tests/classes/static_properties_undeclared_inc.phpt
tests/classes/static_properties_undeclared_read.phpt
tests/lang/041.phpt
tests/lang/042.phpt
tests/lang/043.phpt
tests/lang/044.phpt
tests/lang/bug32828.phpt
tests/lang/foreachLoopIterator.002.phpt