Change createFromTimestamp to setTimestamp

diff --git a/NEWS b/NEWS
index 0d51ed9f6dc64685d4804bd1e8a98a64382b47cf..2770bfd459e6776f1c435a2f91cf02285f224f7e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ PHP                                                                        NEWS
   (Etienne Kneuss)
 - Added "compact" handler for Zend MM storage. (Dmitry)
 - Added "+" and "*" specifiers to zend_parse_parameters(). (Andrei)
-- Added DateTime::createFromTimestamp() to set a unix timestamp without
+- Added DateTime::setTimestamp() to set a unix timestamp without
   invoking the date parser. (Scott)
 
 - Upgraded PCRE to version 7.4 (Nuno)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 5b7d582c68e478e78749bd7668602f03f1d77c20..85f359fa1bc7de3e12ac9761816a6691796e35d7 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -209,7 +209,7 @@ const zend_function_entry date_funcs_date[] = {
        PHP_ME_MAPPING(setTime,         date_time_set,          NULL, 0)
        PHP_ME_MAPPING(setDate,         date_date_set,          NULL, 0)
        PHP_ME_MAPPING(setISODate,      date_isodate_set,       NULL, 0)
-       PHP_ME_MAPPING(createFromTimestamp,     date_timestamp_set, NULL, 0)
+       PHP_ME_MAPPING(setTimestamp,    date_timestamp_set, NULL, 0)
        {NULL, NULL, NULL}
 };