Fixed bug #73239 (DateTime shows strange error message with invalid timezone)

Author: derickr

NEWS

@@ -9,6 +9,8 @@ PHP                                                                        NEWS
   . Fixed Haiku ZTS builds. (David Carlier)
 
 - Date:
+  . Fixed bug #73239 (DateTime constructor throws exceptions when it should
+    not). (Derick)
   . Fixed bug GH-8471 (Segmentation fault when converting immutable and mutable
     DateTime instances created using reflection). (Derick)
 

ext/date/php_date.c

@@ -505,7 +505,7 @@ static PHP_INI_MH(OnUpdate_date_timezone)
 	if (stage == PHP_INI_STAGE_RUNTIME) {
 		if (!timelib_timezone_id_is_valid(DATEG(default_timezone), DATE_TIMEZONEDB)) {
 			if (DATEG(default_timezone) && *DATEG(default_timezone)) {
-				php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone));
+				php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s'", DATEG(default_timezone));
 			}
 		} else {
 			DATEG(timezone_valid) = 1;
@@ -538,7 +538,7 @@ static char* guess_timezone(const timelib_tzdb *tzdb)
 		}
 
 		if (!timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
-			php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s', we selected the timezone 'UTC' for now.", DATEG(default_timezone));
+			php_error_docref(NULL, E_WARNING, "Invalid date.timezone value '%s'", DATEG(default_timezone));
 			return "UTC";
 		}
 

ext/date/tests/bug73239.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Bug #73239 (Odd warning/exception message with invalid timezones)
+--FILE--
+<?php
+ini_set('date.timezone', 'dummy');
+try {
+	$dt = new DateTime('now');
+} catch (Exception $e) {
+	echo $e->getMessage(), "\n";
+}
+?>
+--EXPECTF--
+Warning: ini_set(): Invalid date.timezone value 'dummy' in %sbug73239.php on line %d
+DateTime::__construct(): Invalid date.timezone value 'dummy', we selected the timezone 'UTC' for now.

ext/date/tests/ini_set_incorrect.phpt

@@ -7,4 +7,4 @@ ini_set("date.timezone", "Incorrect/Zone");
 
 ?>
 --EXPECTF--
-Warning: ini_set(): Invalid date.timezone value 'Incorrect/Zone', we selected the timezone 'UTC' for now. in %sini_set_incorrect.php on line %d
+Warning: ini_set(): Invalid date.timezone value 'Incorrect/Zone' in %sini_set_incorrect.php on line %d