update tests

Author: devnexen

ext/intl/tests/bug62017.phpt

@@ -5,19 +5,22 @@ intl
 --FILE--
 <?php
 ini_set('intl.error_level', E_WARNING);
-var_dump(
+try {
     datefmt_create('', IntlDateFormatter::NONE, IntlDateFormatter::NONE, "\xFF",
-        IntlDateFormatter::GREGORIAN, 'a'));
+        IntlDateFormatter::GREGORIAN, 'a');
+} catch (IntlException $e) {
+    echo PHP_EOL."Exception: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . PHP_EOL;
+}
+
 try {
-    var_dump(
         new IntlDateFormatter('', IntlDateFormatter::NONE, IntlDateFormatter::NONE, "Europe/Lisbon",
-            IntlDateFormatter::GREGORIAN, "\x80"));
+            IntlDateFormatter::GREGORIAN, "\x80");
 } catch (IntlException $e) {
     echo PHP_EOL."Exception: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . PHP_EOL;
 }
 ?>
 --EXPECTF--
-Warning: datefmt_create(): datefmt_create: Time zone identifier given is not a valid UTF-8 string in %s on line %d
-NULL
 
-Exception: IntlDateFormatter::__construct(): datefmt_create: error converting pattern to UTF-16 in %sbug62017.php 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(): datefmt_create: error converting pattern to UTF-16 in %s on line %d

ext/intl/tests/calendar_createInstance_error.phpt

@@ -10,8 +10,11 @@ class X extends IntlTimeZone {
 function __construct() {}
 }
 
-var_dump(intlcal_create_instance(new X, NULL));
+try {
+	intlcal_create_instance(new X, NULL);
+} catch (IntlException $e) {
+	echo $e->getMessage();
+}
 ?>
---EXPECTF--
-Warning: intlcal_create_instance(): intlcal_create_instance: passed IntlTimeZone is not properly constructed in %s on line %d
-NULL
+--EXPECT--
+intlcal_create_instance: passed IntlTimeZone is not properly constructed

ext/intl/tests/dateformat___construct_bad_tz_cal.phpt

@@ -29,7 +29,8 @@ try {
 }
 ?>
 --EXPECTF--
-Exception: IntlDateFormatter::__construct(): datefmt_create: No such time zone: 'bad timezone' in %s on line %d
+
+Exception: datefmt_create: No such time zone: 'bad timezone' in %s on line %d
 
 Exception: IntlDateFormatter::__construct(): datefmt_create: 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 in %s on line %d
 

ext/intl/tests/dateformat_set_timezone_id_icu72-1.phpt

@@ -37,7 +37,11 @@ function ut_main()
 
         $res_str .= "-----------";
         $res_str .= "\nTrying to set timezone_id= $timezone_id_entry";
-        if (ut_datefmt_set_timezone_id( $fmt , $timezone_id_entry ) !== $result) die("ut_datefmt_set_timezone_id failed");
+	try {
+        	if (ut_datefmt_set_timezone_id( $fmt , $timezone_id_entry ) !== $result) die("ut_datefmt_set_timezone_id failed");
+	} catch (IntlException $e) {
+		echo $e->getMessage() . PHP_EOL;
+	}
         $timezone_id = ut_datefmt_get_timezone_id( $fmt );
         $res_str .= "\nAfter call to set_timezone_id :  timezone_id= $timezone_id";
         $formatted = ut_datefmt_format( $fmt, 0);
@@ -58,9 +62,8 @@ include_once( 'ut_common.inc' );
 ut_run();
 ?>
 --EXPECTF--
-Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
-
-Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
+datefmt_set_timezone: No such time zone: 'CN'
+datefmt_set_timezone: No such time zone: 'CN'
 
 After creation of the dateformatter :  timezone_id= US/Pacific
 -----------

ext/intl/timezone/timezone_class.cpp

@@ -22,6 +22,7 @@
 #include <unicode/timezone.h>
 #include <unicode/calendar.h>
 #include "../intl_convertcpp.h"
+#include "../intl_common.h"
 
 #include "../common/common_date.h"
 
@@ -148,14 +149,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(NULL, "%s: passed IntlTimeZone is not "
+			zend_throw_error(IntlException_ce_ptr, "%s: passed IntlTimeZone is not "
 				"properly constructed", func);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		timeZone = to->utimezone->clone();
 		if (UNEXPECTED(timeZone == NULL)) {
-			zend_throw_error(NULL, "%s: could not clone TimeZone", func);
+			zend_throw_error(IntlException_ce_ptr, "%s: could not clone TimeZone", func);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
@@ -176,19 +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) {
-			zend_throw_error(NULL, "%s: Time zone identifier given is not a "
+			zend_throw_error(IntlException_ce_ptr, "%s: Time zone identifier given is not a "
 				"valid UTF-8 string", func);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		timeZone = TimeZone::createTimeZone(id);
 		if (UNEXPECTED(timeZone == NULL)) {
-			zend_throw_error(NULL, "%s: Could not create time zone", func);
+			zend_throw_error(IntlException_ce_ptr, "%s: Could not create time zone", func);
 			zval_ptr_dtor_str(&local_zv_tz);
 			return NULL;
 		}
 		if (*timeZone == TimeZone::getUnknown()) {
-			zend_throw_error(NULL, "%s: No such time zone: '%s'",
+			zend_throw_error(IntlException_ce_ptr, "%s: No such time zone: '%s'",
 				func, Z_STRVAL_P(zv_timezone));
 			zval_ptr_dtor_str(&local_zv_tz);
 			delete timeZone;