Fix timezone errors

Author: Girgias

ext/intl/tests/bug62017.phpt

@@ -21,6 +21,6 @@ try {
 ?>
 --EXPECTF--
 
-Exception: datefmt_create: Time zone identifier given is not a valid UTF-8 string in %s on line %d
+Exception: datefmt_create(): Time zone identifier given is not a valid UTF-8 string in %s on line %d
 
 Exception: IntlDateFormatter::__construct(): error converting pattern to UTF-16 in %s on line %d

ext/intl/tests/calendar_createInstance_error.phpt

@@ -17,4 +17,4 @@ try {
 }
 ?>
 --EXPECT--
-intlcal_create_instance: passed IntlTimeZone is not properly constructed
+intlcal_create_instance(): passed IntlTimeZone is not properly constructed

ext/intl/tests/dateformat___construct_bad_tz_cal.phpt

@@ -29,6 +29,6 @@ try {
 }
 ?>
 --EXPECT--
-Exception: datefmt_create: No such time zone: 'bad timezone'
+Exception: IntlDateFormatter::__construct(): No such time zone: "bad timezone"
 Exception: IntlDateFormatter::__construct(): Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object
-Exception: IntlDateFormatter::__construct(): Argument #5 ($calendar) must be of type IntlCalendar|int|null, stdClass given
+Exception: IntlDateFormatter::__construct(): Argument #5 ($calendar) must be of type IntlCalendar|int|null, stdClass given

ext/intl/tests/dateformat_setTimeZone_error.phpt

@@ -24,5 +24,5 @@ try {
 ?>
 --EXPECTF--
 Warning: Array to string conversion in %s on line %d
-datefmt_set_timezone: No such time zone: 'Array'
-datefmt_set_timezone: No such time zone: 'non existing timezone'
+IntlDateFormatter::setTimeZone(): No such time zone: "Array"
+IntlDateFormatter::setTimeZone(): No such time zone: "non existing timezone"

ext/intl/tests/transliterator_transliterate_variant1.phpt

@@ -28,11 +28,11 @@ Warning: transliterator_transliterate(): String conversion of id to UTF-16 faile
 
 Warning: transliterator_transliterate(): Could not create transliterator with ID %s
 
-String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
+transliterator_transliterate(): String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 
 Warning: transliterator_transliterate(): unable to open ICU transliterator with id "inexistent id" in %s on line %d
 
-Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_create(): unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
+Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_transliterate(): unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
 
-transliterator_create(): unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
+transliterator_transliterate(): unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 Done.

ext/intl/timezone/timezone_class.cpp

@@ -117,6 +117,18 @@ U_CFUNC zval *timezone_convert_to_datetimezone(const TimeZone *timeZone,
 }
 /* }}} */
 
+static void timezone_throw_exception_with_call_location(const char *msg, const char *add_info)
+{
+	zend_string *fn = get_active_function_or_method_name();
+	zend_throw_error(IntlException_ce_ptr, "%s(): %s%s%s%s",
+		ZSTR_VAL(fn), msg,
+		add_info ? "\"" : "",
+		add_info ? add_info : "",
+		add_info ? "\"" : ""
+	);
+	zend_string_release_ex(fn, false);
+}
+
 /* {{{ timezone_process_timezone_argument
  * TimeZone argument processor. outside_error may be NULL (for static functions/constructors) */
 U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
@@ -138,14 +150,14 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
 		TimeZone_object *to = Z_INTL_TIMEZONE_P(zv_timezone);
 
 		if (to->utimezone == NULL) {
-			zend_throw_error(IntlException_ce_ptr, "passed IntlTimeZone is not "
-				"properly constructed");
+			timezone_throw_exception_with_call_location("passed IntlTimeZone is not "
+				"properly constructed", NULL);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		timeZone = to->utimezone->clone();
 		if (UNEXPECTED(timeZone == NULL)) {
-			zend_throw_error(IntlException_ce_ptr, "could not clone TimeZone");
+			timezone_throw_exception_with_call_location("could not clone TimeZone", NULL);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
@@ -165,22 +177,19 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
 		}
 		if (intl_stringFromChar(id, Z_STRVAL_P(zv_timezone), Z_STRLEN_P(zv_timezone),
 				&status) == FAILURE) {
-			// TODO: Grab current executing function/method
-			zend_throw_error(IntlException_ce_ptr, "Time zone identifier given is not a "
-				"valid UTF-8 string");
+			timezone_throw_exception_with_call_location("Time zone identifier given is not a "
+				"valid UTF-8 string", NULL);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		timeZone = TimeZone::createTimeZone(id);
 		if (UNEXPECTED(timeZone == NULL)) {
-			// TODO: Grab current executing function/method
-			zend_throw_error(IntlException_ce_ptr, "Could not create time zone");
+			timezone_throw_exception_with_call_location("Could not create time zone", NULL);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		if (*timeZone == TimeZone::getUnknown()) {
-			// TODO: Grab current executing function/method
-			zend_throw_error(IntlException_ce_ptr, "No such time zone: '%s'", Z_STRVAL_P(zv_timezone));
+			timezone_throw_exception_with_call_location("No such time zone: ", Z_STRVAL_P(zv_timezone));
 			zval_ptr_dtor_str(&local_zv_tz);
 			delete timeZone;
 			return NULL;