Revert exception changes + add test coverage

Author: kocsismate

ext/date/php_date.c

@@ -4121,7 +4121,7 @@ PHP_METHOD(DatePeriod, __construct)
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) {
 		if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) {
 			if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "s|l", &isostr, &isostr_len, &options) == FAILURE) {
-				zend_type_error("DatePeriod::__construct() accepts either (DateTimeInterface, DateInterval, int [, int]) OR (DateTimeInterface, DateInterval, DateTime [, int]) OR (string [, int]) as arguments");
+				zend_type_error("DatePeriod::__construct() accepts (DateTimeInterface, DateInterval, int [, int]), or (DateTimeInterface, DateInterval, DateTime [, int]), or (string [, int]) as arguments");
 				RETURN_THROWS();
 			}
 		}
@@ -4131,7 +4131,7 @@ PHP_METHOD(DatePeriod, __construct)
 	dpobj->current = NULL;
 
 	if (isostr) {
-		zend_replace_error_handling(EH_THROW, zend_ce_value_error, &error_handling);
+		zend_replace_error_handling(EH_THROW, NULL, &error_handling);
 		date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), &recurrences, isostr, isostr_len);
 		zend_restore_error_handling(&error_handling);
 		if (EG(exception)) {
@@ -4140,19 +4140,19 @@ PHP_METHOD(DatePeriod, __construct)
 
 		if (dpobj->start == NULL) {
 			zend_string *func = get_active_function_or_method_name();
-			zend_value_error("%s(): Argument #1 must contain a start date, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_throw_error(zend_ce_exception, "%s(): ISO interval must contain a start date, \"%s\" given", ZSTR_VAL(func), isostr);
 			zend_string_release(func);
 			RETURN_THROWS();
 		}
 		if (dpobj->interval == NULL) {
 			zend_string *func = get_active_function_or_method_name();
-			zend_value_error("%s(): Argument #1 must contain an interval, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_throw_error(zend_ce_exception, "%s(): ISO interval must contain an interval, \"%s\" given", ZSTR_VAL(func), isostr);
 			zend_string_release(func);
 			RETURN_THROWS();
 		}
 		if (dpobj->end == NULL && recurrences == 0) {
 			zend_string *func = get_active_function_or_method_name();
-			zend_value_error("%s(): Argument #1 must contain an end date or a recurrence count, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_throw_error(zend_ce_exception, "%s(): ISO interval must contain an end date or a recurrence count, \"%s\" given", ZSTR_VAL(func), isostr);
 			zend_string_release(func);
 			RETURN_THROWS();
 		}
@@ -4194,7 +4194,7 @@ PHP_METHOD(DatePeriod, __construct)
 
 	if (dpobj->end == NULL && recurrences < 1) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_value_error("%s(): Recurrence count must be greater than 0", ZSTR_VAL(func));
+		zend_throw_error(zend_ce_exception, "%s(): Recurrence count must be greater than 0", ZSTR_VAL(func));
 		zend_string_release(func);
 		RETURN_THROWS();
 	}

ext/date/tests/DatePeriod_wrong_constructor.phpt

@@ -15,4 +15,4 @@ try {
 }
 ?>
 --EXPECT--
-DatePeriod::__construct() accepts either (DateTimeInterface, DateInterval, int [, int]) OR (DateTimeInterface, DateInterval, DateTime [, int]) OR (string [, int]) as arguments
+DatePeriod::__construct() accepts (DateTimeInterface, DateInterval, int [, int]), or (DateTimeInterface, DateInterval, DateTime [, int]), or (string [, int]) as arguments

ext/date/tests/DatePeriod_wrong_recurrence_on_constructor.phpt

@@ -4,13 +4,13 @@ DatePeriod: Test wrong recurrence parameter on __construct
 <?php
 try {
     new DatePeriod(new DateTime('yesterday'), new DateInterval('P1D'), 0);
-} catch (ValueError $exception) {
+} catch (Exception $exception) {
     echo $exception->getMessage(), "\n";
 }
 
 try {
     new DatePeriod(new DateTime('yesterday'), new DateInterval('P1D'), -1);
-} catch (ValueError $exception) {
+} catch (Exception $exception) {
     echo $exception->getMessage(), "\n";
 }
 

ext/date/tests/bug44562.phpt

@@ -6,7 +6,7 @@ date_default_timezone_set('Europe/Oslo');
 
 try {
     $dp = new DatePeriod('2D');
-} catch (ValueError $e) {
+} catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }
 

ext/date/tests/bug54283.phpt

@@ -5,7 +5,7 @@ Bug #54283 (new DatePeriod(NULL) causes crash)
 
 try {
     var_dump(new DatePeriod(NULL));
-} catch (ValueError $e) {
+} catch (Exception $e) {
     var_dump($e->getMessage());
 }
 

ext/date/tests/date_interval_bad_format_leak.phpt

@@ -11,13 +11,13 @@ try {
 
 try {
     $perid = new DatePeriod('P3"D');
-} catch (ValueError $e) {
+} catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     new DatePeriod('2008-03-01T12:00:00Z1');
-} catch (ValueError $e) {
+} catch (Exception $e) {
     echo $e->getMessage(), "\n";
 }
 

ext/date/tests/date_period_bad_iso_format.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Test bad ISO date formats passed to DatePeriod constructor
+--FILE--
+<?php
+
+try {
+    $perid = new DatePeriod("R4");
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+try {
+    $perid = new DatePeriod("R4/2012-07-01T00:00:00Z");
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+
+try {
+    $perid = new DatePeriod("2012-07-01T00:00:00Z/P7D");
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+DatePeriod::__construct(): ISO interval must contain a start date, "R4" given
+DatePeriod::__construct(): ISO interval must contain an interval, "R4/2012-07-01T00:00:00Z" given
+DatePeriod::__construct(): ISO interval must contain an end date or a recurrence count, "2012-07-01T00:00:00Z/P7D" given