- Move mktime/gmmktime related tests from ext/standard to ext/date.

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 40af3f92d9ad471c303f2ee0faad50e89b2bf3ed..673cd0417586b9274f4d5d107344c0eb6284d707 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -470,6 +470,7 @@ PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
                        if (dst == 0 && tmp_offset->is_dst == 1) {
                                adjust_seconds = +3600;
                        }
+                       timelib_time_offset_dtor(tmp_offset);
                }
        }
        /* Clean up and return */

diff --git a/ext/date/tests/bug20382.phpt b/ext/date/tests/bug20382-1.phpt
similarity index 84%
rename from ext/date/tests/bug20382.phpt
rename to ext/date/tests/bug20382-1.phpt
index 4da8c2110546ac8b223bb0125355b6ff41d4fcf0..a259d934af1d6959bbc14425e860beaa0b578748 100644 (file)
--- a/ext/date/tests/bug20382.phpt
+++ b/ext/date/tests/bug20382-1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #20382 (strtotime ("Monday", $date) produces wrong result on DST changeover)
+Bug #20382 [1] (strtotime ("Monday", $date) produces wrong result on DST changeover)
 --FILE--
 <?php
        putenv("TZ=Europe/Amsterdam");

diff --git a/ext/standard/tests/time/bug21966.phpt b/ext/date/tests/bug21966.phpt
similarity index 100%
rename from ext/standard/tests/time/bug21966.phpt
rename to ext/date/tests/bug21966.phpt

diff --git a/ext/standard/tests/time/bug27719.phpt b/ext/date/tests/bug27719.phpt
similarity index 96%
rename from ext/standard/tests/time/bug27719.phpt
rename to ext/date/tests/bug27719.phpt
index cff6fdd2fe523564ad4a8525485710f530b54a60..6f65bfb85e0a2699520ef322b6d930d32e311470 100644 (file)
--- a/ext/standard/tests/time/bug27719.phpt
+++ b/ext/date/tests/bug27719.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #27719: mktime returns incorrect timestamp for dst days
+Bug #27719 (mktime returns incorrect timestamp for dst days)
 --INI--
 error_reporting=2047
 --FILE--

diff --git a/ext/standard/tests/time/003.phpt b/ext/date/tests/mktime-1.phpt
similarity index 100%
rename from ext/standard/tests/time/003.phpt
rename to ext/date/tests/mktime-1.phpt

diff --git a/ext/standard/tests/time/mktime.phpt b/ext/date/tests/mktime-2.phpt
similarity index 100%
rename from ext/standard/tests/time/mktime.phpt
rename to ext/date/tests/mktime-2.phpt