Remove mktime() and gmmktime() $is_dst parameter

nikic · nikic · commit 9c5eaac18b65 · 2015-01-17T18:26:45.000+01:00
diff --git a/NEWS b/NEWS
@@ -41,6 +41,7 @@
 - Date:
   . Fixed day_of_week function as it could sometimes return negative values
     internally. (Derick)
+  . Removed $is_dst parameter from mktime() and gmmktime(). (Nikita)
 
 - DBA:
   . Fixed bug #62490 (dba_delete returns true on missing item (inifile)). (Mike)
diff --git a/UPGRADING b/UPGRADING
@@ -63,6 +63,9 @@ PHP X.Y UPGRADE NOTES
   . Added hybrid sorting algo zend_sort for better performance.
   . Added stable sorting algo zend_insert_sort.
 
+- Date:
+  . Removed $is_dst parameter from mktime() and gmmktime().
+
 - DBA
   . dba_delete() now returns false if the key was not found for the inifile
     handler, too.
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -1482,13 +1482,13 @@ PHP_FUNCTION(strtotime)
 /* {{{ php_mktime - (gm)mktime helper */
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 {
-	zend_long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0, dst = -1;
+	zend_long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0;
 	timelib_time *now;
 	timelib_tzinfo *tzi = NULL;
 	zend_long ts, adjust_seconds = 0;
 	int error;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lllllll", &hou, &min, &sec, &mon, &day, &yea, &dst) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|llllll", &hou, &min, &sec, &mon, &day, &yea) == FAILURE) {
 		RETURN_FALSE;
 	}
 	/* Initialize structure with current time */
@@ -1537,27 +1537,7 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 	} else {
 		timelib_update_ts(now, tzi);
 	}
-	/* Support for the deprecated is_dst parameter */
-	if (dst != -1) {
-		php_error_docref(NULL, E_DEPRECATED, "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;
-			}
-			timelib_time_offset_dtor(tmp_offset);
-		}
-	}
+
 	/* Clean up and return */
 	ts = timelib_date_to_int(now, &error);
 	ts += adjust_seconds;
diff --git a/ext/date/tests/bug27719.phpt b/ext/date/tests/bug27719.phpt
diff --git a/ext/date/tests/gmmktime_error.phpt b/ext/date/tests/gmmktime_error.phpt
@@ -18,22 +18,16 @@ $sec = 8;
 $mon = 8;
 $day = 8;
 $year = 2008;
-$extra_arg1 = 10;
-$extra_arg2 = 10;
+$extra_arg = 10;
 
-var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1) );
-
-var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg1, $extra_arg2) );
+var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year, $extra_arg) );
 ?>
 ===DONE===
 --EXPECTF--
 *** Testing gmmktime() : error conditions ***
 
 -- Testing gmmktime() function with more than expected no. of arguments --
 
-Deprecated: gmmktime(): The is_dst parameter is deprecated in %s on line %d
-int(1218182888)
-
-Warning: gmmktime() expects at most 7 parameters, 8 given in %s on line %d
+Warning: gmmktime() expects at most 6 parameters, 7 given in %s on line %d
 bool(false)
 ===DONE===
diff --git a/ext/date/tests/mktime-1.phpt b/ext/date/tests/mktime-1.phpt
@@ -1,30 +1,21 @@
 --TEST--
 Check for mktime with out-of-range parameters
 --INI--
-error_reporting=2047
+error_reporting=E_ALL
 --FILE--
 <?php 
-  date_default_timezone_set("Europe/Amsterdam");
-  # MacOS/X libc implementation doesn't treat out-of-range values
-  # the same way other unices do (Bug# 10686) so some extra code
-  # was added to datetime.c to take care of this 
-	echo date("Y-m-d", mktime( 12, 0, 0, 3,  0, 2000)) ."\n";
-	echo date("Y-m-d", mktime( 12, 0, 0, 3, -1, 2000)) ."\n";
-	echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2000)) ."\n";
-	echo date("Y-m-d", mktime( 12, 0, 0, 3,  0, 2001)) ."\n";
-	echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2001)) ."\n";
-	echo date("Y-m-d", mktime( 12, 0, 0, 0,  0, 2000)) ."\n";
 
-  putenv("TZ=Europe/London");
-  echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,-1))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,0))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,3,+90,2000,1))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,-1))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,0))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-90,2000,1))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,-1))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,0))."\n";
-  echo date("Y-m-d H:i:s", mktime(12,0,0,5,-1,2000,1))."\n";
+date_default_timezone_set("Europe/Amsterdam");
+# MacOS/X libc implementation doesn't treat out-of-range values
+# the same way other unices do (Bug# 10686) so some extra code
+# was added to datetime.c to take care of this 
+echo date("Y-m-d", mktime( 12, 0, 0, 3,  0, 2000)) ."\n";
+echo date("Y-m-d", mktime( 12, 0, 0, 3, -1, 2000)) ."\n";
+echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2000)) ."\n";
+echo date("Y-m-d", mktime( 12, 0, 0, 3,  0, 2001)) ."\n";
+echo date("Y-m-d", mktime( 12, 0, 0, 2, 29, 2001)) ."\n";
+echo date("Y-m-d", mktime( 12, 0, 0, 0,  0, 2000)) ."\n";
+
 ?>
 --EXPECT--
 2000-02-29
@@ -33,12 +24,3 @@ error_reporting=2047
 2001-02-28
 2001-03-01
 1999-11-30
-2000-05-29 12:00:00
-2000-05-29 13:00:00
-2000-05-29 12:00:00
-2000-01-31 12:00:00
-2000-01-31 12:00:00
-2000-01-31 11:00:00
-2000-04-29 12:00:00
-2000-04-29 13:00:00
-2000-04-29 12:00:00
diff --git a/ext/date/tests/mktime-2.phpt b/ext/date/tests/mktime-2.phpt
diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt
@@ -20,15 +20,13 @@ $sec = 45;
 $month = 7;
 $day = 2;
 $year = 1963;
-$is_dst = 0; 
 
 var_dump( mktime($hour) );
 var_dump( mktime($hour, $minute) );
 var_dump( mktime($hour, $minute, $sec) );
 var_dump( mktime($hour, $minute, $sec, $month) );
 var_dump( mktime($hour, $minute, $sec, $month, $day) );
 var_dump( mktime($hour, $minute, $sec, $month, $day, $year) );
-var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst) );
 
 ?>
 ===DONE===
@@ -40,8 +38,5 @@ int(%i)
 int(%i)
 int(%i)
 int(%i)
-
-Deprecated: mktime(): The is_dst parameter is deprecated in %s on line %d
-int(%i)
 ===DONE===
 
diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt
@@ -24,9 +24,8 @@ $sec = 45;
 $month = 7;
 $day = 2;
 $year = 1963;
-$is_dst = 0; 
 $extra_arg = 10;
-var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst, $extra_arg) );
+var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $extra_arg) );
 
 ?>
 ===DONE===
@@ -40,6 +39,6 @@ int(%d)
 
 -- Testing mktime() function with more than expected no. of arguments --
 
-Warning: mktime() expects at most 7 parameters, 8 given in %s on line %d
+Warning: mktime() expects at most 6 parameters, 7 given in %s on line %d
 bool(false)
 ===DONE===
diff --git a/ext/date/tests/mktime_variation7.phpt b/ext/date/tests/mktime_variation7.phpt
