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, 63 insertions, 21 deletions

diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index 6b9845a913..4940b19b40 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -17,21 +17,69 @@ echo "error: $errno, $errstr\n";
 }
 set_error_handler('eh');
 
-var_dump(intlcal_get($c));
-var_dump(intlcal_get_actual_maximum($c));
-var_dump(intlcal_get_actual_minimum($c));
+try {
+	var_dump(intlcal_get($c));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_maximum($c));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_minimum($c));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
 
-var_dump(intlcal_get($c, -1));
-var_dump(intlcal_get_actual_maximum($c, -1));
-var_dump(intlcal_get_actual_minimum($c, -1));
+try {
+	var_dump(intlcal_get($c, -1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_maximum($c, -1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_minimum($c, -1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
 
-var_dump(intlcal_get($c, "s"));
-var_dump(intlcal_get_actual_maximum($c, "s"));
-var_dump(intlcal_get_actual_minimum($c, "s"));
+try {
+	var_dump(intlcal_get($c, "s"));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_maximum($c, "s"));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_minimum($c, "s"));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
 
-var_dump(intlcal_get(1));
-var_dump(intlcal_get_actual_maximum(1));
-var_dump(intlcal_get_actual_minimum(1));
+try {
+	var_dump(intlcal_get(1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_maximum(1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
+try {
+	var_dump(intlcal_get_actual_minimum(1));
+} catch (EngineException $ex) {
+	echo "error: " . $ex->getCode() . ", " . $ex->getMessage() . "\n\n";
+}
 --EXPECT--
 error: 2, intlcal_get() expects exactly 2 parameters, 1 given
 error: 2, intlcal_get(): intlcal_get: bad arguments
@@ -58,14 +106,8 @@ error: 2, intlcal_get_actual_minimum() expects parameter 2 to be integer, string
 error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
 bool(false)
 error: 4096, Argument 1 passed to intlcal_get() must be an instance of IntlCalendar, integer given
-error: 2, intlcal_get() expects exactly 2 parameters, 1 given
-error: 2, intlcal_get(): intlcal_get: bad arguments
-bool(false)
+
 error: 4096, Argument 1 passed to intlcal_get_actual_maximum() must be an instance of IntlCalendar, integer given
-error: 2, intlcal_get_actual_maximum() expects exactly 2 parameters, 1 given
-error: 2, intlcal_get_actual_maximum(): intlcal_get_actual_maximum: bad arguments
-bool(false)
+
 error: 4096, Argument 1 passed to intlcal_get_actual_minimum() must be an instance of IntlCalendar, integer given
-error: 2, intlcal_get_actual_minimum() expects exactly 2 parameters, 1 given
-error: 2, intlcal_get_actual_minimum(): intlcal_get_actual_minimum: bad arguments
-bool(false)
+