Fixed exception class for 'Invalid serialization data for DateTimeZone object'

Author: derickr

ext/date/php_date.c

@@ -3857,7 +3857,7 @@ PHP_METHOD(DateTimeZone, __set_state)
 	php_date_instantiate(date_ce_timezone, return_value);
 	tzobj = Z_PHPTIMEZONE_P(return_value);
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
-		zend_throw_error(date_ce_date_error, "Invalid serialization data for DateTimeZone object");
+		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
 	}
 }
 /* }}} */

ext/date/tests/DatePeriod_wrong_arguments.phpt

@@ -1,5 +1,5 @@
 --TEST--
-DatePeriod invalid serialization data
+DatePeriod arguments/wrong arguments
 --FILE--
 <?php
 $dp = new DatePeriod(new \DateTimeImmutable("2023-01-13 12:29:30"), DateInterval::createFromDateString("tomorrow"), 4);

ext/date/tests/DateTimeZone_compare_basic1.phpt

@@ -14,7 +14,11 @@ foreach ($timezones as [$timezone1, $timezone2]) {
     compare_timezones($timezone1, $timezone2);
 }
 
-var_dump(new DateTimeZone('Europe/Berlin') == new DateTimeZone('CET'));
+try {
+	var_dump(new DateTimeZone('Europe/Berlin') == new DateTimeZone('CET'));
+} catch (DateException $e) {
+	echo $e::class, ': ', $e->getMessage(), "\n";
+}
 
 function compare_timezones($timezone1, $timezone2)
 {
@@ -70,8 +74,5 @@ compare Europe/Amsterdam with Europe/Berlin
 < bool(false)
 = bool(false)
 > bool(false)
-
-Fatal error: Uncaught DateException: Cannot compare two different kinds of DateTimeZone objects in %s
-Stack trace:
-#0 {main}
-  thrown in %s
+DateException: Cannot compare two different kinds of DateTimeZone objects
+Trying to compare uninitialized DateTimeZone objects

ext/date/tests/DateTimeZone_serialize_errors.phpt

@@ -10,5 +10,5 @@ try {
 	echo $e->getMessage(), "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Invalid serialization data for DateTimeZone object

ext/date/tests/DateTime_modify_invalid_format.phpt

@@ -1,5 +1,5 @@
 --TEST--
-DateTime::modify() with invalid format
+DateTime::modify() with empty string as format
 --FILE--
 <?php
 

ext/date/tests/bug78139.phpt

@@ -21,7 +21,7 @@ foreach ($strings as $string)
 	try {
 		$tz = new \DateTimeZone($string);
 	} catch (DateInvalidTimeZoneException $e) {
-		echo $e->getMessage(), "\n";
+		echo $e::class, ': ', $e->getMessage(), "\n";
 	}
 
 	echo "\n\n";
@@ -41,33 +41,33 @@ Parsing 'x UTC':
 
 Warning: timezone_open(): Unknown or bad timezone (x UTC) in %sbug78139.php on line %d
 bool(false)
-DateTimeZone::__construct(): Unknown or bad timezone (x UTC)
+DateInvalidTimeZoneException: DateTimeZone::__construct(): Unknown or bad timezone (x UTC)
 
 
 Parsing 'xx UTC':
 
 Warning: timezone_open(): Unknown or bad timezone (xx UTC) in %sbug78139.php on line %d
 bool(false)
-DateTimeZone::__construct(): Unknown or bad timezone (xx UTC)
+DateInvalidTimeZoneException: DateTimeZone::__construct(): Unknown or bad timezone (xx UTC)
 
 
 Parsing 'xUTC':
 
 Warning: timezone_open(): Unknown or bad timezone (xUTC) in %sbug78139.php on line %d
 bool(false)
-DateTimeZone::__construct(): Unknown or bad timezone (xUTC)
+DateInvalidTimeZoneException: DateTimeZone::__construct(): Unknown or bad timezone (xUTC)
 
 
 Parsing 'UTCx':
 
 Warning: timezone_open(): Unknown or bad timezone (UTCx) in %sbug78139.php on line %d
 bool(false)
-DateTimeZone::__construct(): Unknown or bad timezone (UTCx)
+DateInvalidTimeZoneException: DateTimeZone::__construct(): Unknown or bad timezone (UTCx)
 
 
 Parsing 'UTC xx':
 
 Warning: timezone_open(): Unknown or bad timezone (UTC xx) in %sbug78139.php on line %d
 bool(false)
-DateTimeZone::__construct(): Unknown or bad timezone (UTC xx)
+DateInvalidTimeZoneException: DateTimeZone::__construct(): Unknown or bad timezone (UTC xx)
 

ext/date/tests/date_interval_create_from_date_string_nullparam.phpt

@@ -4,11 +4,7 @@ Test date_interval_create_from_date_string() function : null parameter
 Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 --FILE--
 <?php
-try {
-	$i = date_interval_create_from_date_string(null);
-} catch (DateMalformedIntervalStringException $e) {
-	echo $e->getMessage(), "\n";
-}
+$i = date_interval_create_from_date_string(null);
 var_dump($i);
 ?>
 --EXPECTF--

ext/date/tests/date_interval_non_relative_warning.phpt

@@ -17,12 +17,10 @@ foreach ($formats as $format) {
 	}
 }
 
+echo "====\n";
+
 foreach ($formats as $format) {
-	try {
-		$d = date_interval_create_from_date_string($format);
-	} catch (DateMalformedIntervalStringException $e) {
-		echo $e->getMessage(), "\n";
-	}
+	$d = date_interval_create_from_date_string($format);
 }
 
 ?>
@@ -31,6 +29,7 @@ String 'next weekday 15:30' contains non-relative elements
 String '+5 hours noon' contains non-relative elements
 String '-8 days March 23' contains non-relative elements
 String '+72 seconds UTC' contains non-relative elements
+====
 
 Warning: date_interval_create_from_date_string(): String 'next weekday 15:30' contains non-relative elements in %s on line %d