Fix exception types

Author: kocsismate

ext/date/php_date.c

@@ -4131,7 +4131,7 @@ PHP_METHOD(DatePeriod, __construct)
 	dpobj->current = NULL;
 
 	if (isostr) {
-		zend_replace_error_handling(EH_THROW, NULL, &error_handling);
+		zend_replace_error_handling(EH_THROW, zend_ce_value_error, &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_throw_error(NULL, "%s(): Argument #1 must contain a start date, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_value_error("%s(): Argument #1 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_throw_error(NULL, "%s(): Argument #1 must contain an interval, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_value_error("%s(): Argument #1 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_throw_error(NULL, "%s(): Argument #1 must contain an end date or a recurrence count, \"%s\" given", ZSTR_VAL(func), isostr);
+			zend_value_error("%s(): Argument #1 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_throw_error(NULL, "%s(): Recurrence count must be greater than 0", ZSTR_VAL(func));
+		zend_value_error("%s(): Recurrence count must be greater than 0", ZSTR_VAL(func));
 		zend_string_release(func);
 		RETURN_THROWS();
 	}

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 (Exception $exception) {
+} catch (ValueError $exception) {
     echo $exception->getMessage(), "\n";
 }
 
 try {
     new DatePeriod(new DateTime('yesterday'), new DateInterval('P1D'), -1);
-} catch (Exception $exception) {
+} catch (ValueError $exception) {
     echo $exception->getMessage(), "\n";
 }
 

ext/date/tests/bug44562.phpt

@@ -4,12 +4,9 @@ Bug #44562 (Creating instance of DatePeriod crashes)
 <?php
 date_default_timezone_set('Europe/Oslo');
 
-try
-{
+try {
     $dp = new DatePeriod('2D');
-}
-catch ( Exception $e )
-{
+} catch (ValueError $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 (Exception $e) {
+} catch (ValueError $e) {
     var_dump($e->getMessage());
 }
 

ext/date/tests/date_interval_bad_format_leak.phpt

@@ -5,19 +5,19 @@ DateInterval with bad format should not leak period
 
 try {
     $interval = new DateInterval('P3"D');
-} catch (Exception $e) {
+} catch (ValueError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     $perid = new DatePeriod('P3"D');
-} catch (Exception $e) {
+} catch (ValueError $e) {
     echo $e->getMessage(), "\n";
 }
 
 try {
     new DatePeriod('2008-03-01T12:00:00Z1');
-} catch (Exception $e) {
+} catch (ValueError $e) {
     echo $e->getMessage(), "\n";
 }