Fixed bug #75928

php · Feb 10, 2018 · fddd7e3 · fddd7e3
1 parent 01f7998
commit fddd7e3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #75882 (a simple way for segfaults in threadsafe php just with
     configuration). (Anatol)
 
+- Date:
+  . Fixed bug #75928 (Argument 2 for `DateTimeZone::listIdentifiers()` should
+    accept `null`). (Pedro Lacerda)
+
 - PGSQL:
   . Fixed #75838 (Memory leak in pg_escape_bytea()). (ard_1 at mail dot ru)
 

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -4701,11 +4701,11 @@ PHP_FUNCTION(timezone_identifiers_list)
 	const timelib_tzdb             *tzdb;
 	const timelib_tzdb_index_entry *table;
 	int                             i, item_count;
-	zend_long                            what = PHP_DATE_TIMEZONE_GROUP_ALL;
+	zend_long                       what = PHP_DATE_TIMEZONE_GROUP_ALL;
 	char                           *option = NULL;
-	size_t                             option_len = 0;
+	size_t                          option_len = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ls", &what, &option, &option_len) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ls!", &what, &option, &option_len) == FAILURE) {
 		RETURN_FALSE;
 	}
 

diff --git a/ext/date/tests/bug75928.phpt b/ext/date/tests/bug75928.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Bug #75928: Argument 2 for `DateTimeZone::listIdentifiers()` should accept `null`
+--FILE--
+<?php
+declare(strict_types=1);
+var_dump(is_array(DateTimeZone::listIdentifiers(\DateTimeZone::ALL, null)));
+?>
+--EXPECT--
+bool(true)