- Fixed bug #30096 (gmmktime does not return the corrent time).

- Re-implemented mktime and gmmktime with new date time library.
- Added testcase for bug #30096, updated test cases for E_STRICT warning of
  is_dst parameter usage for mktime/gmmktime.

Author: Derick Rethans

NEWS

@@ -19,6 +19,7 @@ PHP                                                                        NEWS
 - Fixed bug #30828 (debug_backtrace() reports incorrect class in overridden
   methods). (Dmitry)
 - Fixed bug #30519 (Interface not existing says Class not found). (Dmitry)
+- Fixed bug #30096 (gmmktime does not return the corrent time). (Derick)
 - Fixed bug #30052 (Crash on shutdown after odbc_pconnect()). (Edin)
 - Fixed bug #28377 (debug_backtrace is intermittently passing args). (Dmitry)
 - Fixed bug #27268 (Bad references accentuated by clone). (Dmitry)

ext/date/php_date.c

@@ -31,6 +31,8 @@
 function_entry date_functions[] = {
 	PHP_FE(date, NULL)
 	PHP_FE(gmdate, NULL)
+	PHP_FE(mktime, NULL)
+	PHP_FE(gmmktime, NULL)
 	PHP_FE(strtotime, NULL)
 	PHP_FE(date_timezone_set, NULL)
 	PHP_FE(date_timezone_get, NULL)
@@ -400,6 +402,105 @@ PHP_FUNCTION(strtotime)
 }
 /* }}} */
 
+PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
+{
+	long hou, min, sec, mon, day, yea, dst = -1;;
+	timelib_time *now;
+	timelib_tzinfo *tzi;
+	long ts, adjust_seconds = 0;
+	int error;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lllllll", &hou, &min, &sec, &mon, &day, &yea, &dst) == FAILURE) {
+		RETURN_FALSE;
+	}
+	/* Initialize structure with current time */
+	now = timelib_time_ctor();
+	if (gmt) {
+		timelib_unixtime2gmt(now, (timelib_sll) time(NULL));
+	} else {
+		tzi = get_timezone_info(TSRMLS_C);
+		timelib_unixtime2local(now, (timelib_sll) time(NULL), tzi);
+	}
+	/* Fill in the new data */
+	switch (ZEND_NUM_ARGS()) {
+		case 7:
+			/* break intentionally missing */
+		case 6:
+			now->y = yea;
+			/* break intentionally missing again */
+		case 5:
+			now->d = day;
+			/* break missing intentionally here too */
+		case 4:
+			now->m = mon;
+			/* and here */
+		case 3:
+			now->s = sec;
+			/* yup, this break isn't here on purpose too */
+		case 2:
+			now->i = min;
+			/* last intentionally missing break */
+		case 1:
+			now->h = hou;
+			break;
+		default:
+			php_error_docref(NULL TSRMLS_CC, E_STRICT, "You should be using the time() function instead.");
+	}
+	/* Update the timestamp */
+	if (gmt) {
+		timelib_update_ts(now, NULL);
+	} else {
+		timelib_update_ts(now, tzi);
+	}
+	/* Support for the deprecated is_dst parameter */
+	if (dst != -1) {
+		php_error_docref(NULL TSRMLS_CC, E_STRICT, "The is_dst parameter is deprecated.");
+		if (gmt) {
+			/* GMT never uses DST */
+			if (dst == 1) {
+				adjust_seconds = -3600;
+			}
+		} else {
+			/* Figure out is_dst for current TS */
+			timelib_time_offset *tmp_offset;
+			tmp_offset = timelib_get_time_zone_info(now->sse, tzi);
+			if (dst == 1 && tmp_offset->is_dst == 0) {
+				adjust_seconds = -3600;
+			}
+			if (dst == 0 && tmp_offset->is_dst == 1) {
+				adjust_seconds = +3600;
+			}
+		}
+	}
+	/* Clean up and return */
+	ts = timelib_date_to_int(now, &error);
+	ts += adjust_seconds;
+
+	timelib_time_dtor(now);
+
+	if (error) {
+		RETURN_FALSE;
+	} else {
+		RETURN_LONG(ts);
+	}
+}
+
+/* {{{ proto int mktime(int hour, int min, int sec, int mon, int day, int year)
+   Get UNIX timestamp for a date */
+PHP_FUNCTION(mktime)
+{
+	php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
+}
+/* }}} */
+
+/* {{{ proto int gmmktime(int hour, int min, int sec, int mon, int day, int year)
+   Get UNIX timestamp for a GMT date */
+PHP_FUNCTION(gmmktime)
+{
+	php_mktime(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
+}
+/* }}} */
+
 PHP_FUNCTION(date_timezone_set)
 {
 	char *zone;

ext/date/php_date.h

@@ -27,6 +27,10 @@ extern zend_module_entry date_module_entry;
 PHP_FUNCTION(date);
 PHP_FUNCTION(gmdate);
 PHP_FUNCTION(strtotime);
+
+PHP_FUNCTION(mktime);
+PHP_FUNCTION(gmmktime);
+
 PHP_FUNCTION(date_timezone_set);
 PHP_FUNCTION(date_timezone_get);
 
@@ -49,5 +53,6 @@ ZEND_END_MODULE_GLOBALS(date)
 
 /* Backwards compability wrapper */
 signed long php_parse_date(char *string, signed long *now);
+PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
 
 #endif /* PHP_DATE_H */

ext/date/tests/bug30096.phpt

@@ -0,0 +1,48 @@
+--TEST--
+Bug #30096 (gmmktime does not return the corrent time)
+--INI--
+error_reporting=2047
+--FILE--
+<?php
+echo "no dst --> dst\n";
+$ts = -1;
+gm_date_check(01,00,00,03,27,2005);
+gm_date_check(02,00,00,03,27,2005);
+gm_date_check(03,00,00,03,27,2005);
+gm_date_check(04,00,00,03,27,2005);
+
+echo "\ndst --> no dst\n";
+$ts = -1;
+gm_date_check(01,00,00,10,30,2005);
+gm_date_check(02,00,00,10,30,2005);
+gm_date_check(03,00,00,10,30,2005);
+gm_date_check(04,00,00,10,30,2005);
+
+function gm_date_check($hour, $minute, $second, $month, $day, $year) {
+	global $ts, $tsold;
+
+	echo "gmmktime($hour,$minute,$second,$month,$day,$year): ";
+	
+	$tsold = $ts;
+	$ts = gmmktime($hour, $minute, $second, $month, $day, $year);
+
+	echo $ts, " | gmdate('r', $ts):", gmdate('r', $ts);
+	if ($tsold > 0) {
+		echo " | Diff: " . ($ts - $tsold);
+	}
+	echo "\n";
+}
+
+?>
+--EXPECT--
+no dst --> dst
+gmmktime(1,0,0,3,27,2005): 1111885200 | gmdate('r', 1111885200):Sun, 27 Mar 2005 01:00:00 +0000
+gmmktime(2,0,0,3,27,2005): 1111888800 | gmdate('r', 1111888800):Sun, 27 Mar 2005 02:00:00 +0000 | Diff: 3600
+gmmktime(3,0,0,3,27,2005): 1111892400 | gmdate('r', 1111892400):Sun, 27 Mar 2005 03:00:00 +0000 | Diff: 3600
+gmmktime(4,0,0,3,27,2005): 1111896000 | gmdate('r', 1111896000):Sun, 27 Mar 2005 04:00:00 +0000 | Diff: 3600
+
+dst --> no dst
+gmmktime(1,0,0,10,30,2005): 1130634000 | gmdate('r', 1130634000):Sun, 30 Oct 2005 01:00:00 +0000
+gmmktime(2,0,0,10,30,2005): 1130637600 | gmdate('r', 1130637600):Sun, 30 Oct 2005 02:00:00 +0000 | Diff: 3600
+gmmktime(3,0,0,10,30,2005): 1130641200 | gmdate('r', 1130641200):Sun, 30 Oct 2005 03:00:00 +0000 | Diff: 3600
+gmmktime(4,0,0,10,30,2005): 1130644800 | gmdate('r', 1130644800):Sun, 30 Oct 2005 04:00:00 +0000 | Diff: 3600

ext/standard/basic_functions.c

@@ -169,8 +169,6 @@ function_entry basic_functions[] = {
 	PHP_FE(time_sleep_until,														NULL)
 #endif
 	PHP_FE(time,															NULL)
-	PHP_FE(mktime,															NULL)
-	PHP_FE(gmmktime,														NULL)
 #if HAVE_STRPTIME
 	PHP_FE(strptime,														NULL)
 #endif