Implement engine exceptions

RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.

1 files changed, 14 insertions, 12 deletions

diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index 35a29be5db..102dfc9f8d 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -16,22 +16,24 @@ function error_handler($errno, $errstr, $errfile, $errline)
 set_error_handler("error_handler");
 
 $tz = IntlTimeZone::createTimeZone('Europe/Lisbon');
-var_dump($tz->hasSameRules('foo'));
+try {
+	var_dump($tz->hasSameRules('foo'));
+} catch (EngineException $ex) {
+	var_dump($ex->getCode(), $ex->getMessage());
+	echo "\n";
+}
 
-var_dump(intltz_has_same_rules(null, $tz));
+try {
+	var_dump(intltz_has_same_rules(null, $tz));
+} catch (EngineException $ex) {
+	var_dump($ex->getCode(), $ex->getMessage());
+	echo "\n";
+}
 
 --EXPECT--
 int(4096)
 string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given"
-int(2)
-string(81) "IntlTimeZone::hasSameRules() expects parameter 1 to be IntlTimeZone, string given"
-int(2)
-string(66) "IntlTimeZone::hasSameRules(): intltz_has_same_rules: bad arguments"
-bool(false)
+
 int(4096)
 string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given"
-int(2)
-string(74) "intltz_has_same_rules() expects parameter 1 to be IntlTimeZone, null given"
-int(2)
-string(61) "intltz_has_same_rules(): intltz_has_same_rules: bad arguments"
-bool(false)
+