- MFH: Rename date classes to DateTime and DateTimeZone

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 1eada6df96ddad2e4929bf64b3136c5a9d3194bc..16fb5c594f3e6995ff52d0650499640c9698dac2 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -1430,7 +1430,7 @@ static void date_register_classes(TSRMLS_D)
 {
        zend_class_entry ce_date, ce_timezone;
 
-       INIT_CLASS_ENTRY(ce_date, "date", date_funcs_date);
+       INIT_CLASS_ENTRY(ce_date, "DateTime", date_funcs_date);
        ce_date.create_object = date_object_new_date;
        date_ce_date = zend_register_internal_class_ex(&ce_date, NULL, NULL TSRMLS_CC);
        memcpy(&date_object_handlers_date, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
@@ -1452,7 +1452,7 @@ static void date_register_classes(TSRMLS_D)
        REGISTER_DATE_CLASS_CONST_STRING("W3C",     DATE_FORMAT_RFC3339);
 
 
-       INIT_CLASS_ENTRY(ce_timezone, "timezone", date_funcs_timezone);
+       INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone);
        ce_timezone.create_object = date_object_new_timezone;
        date_ce_timezone = zend_register_internal_class_ex(&ce_timezone, NULL, NULL TSRMLS_CC);
        memcpy(&date_object_handlers_timezone, zend_get_std_object_handlers(), sizeof(zend_object_handlers));

diff --git a/ext/date/tests/date_create-1.phpt b/ext/date/tests/date_create-1.phpt
index c66bb6fd30bfda472195fef92d32e0bd81b6bb04..365d54dc9469e68d48ea03b8a8ce355962e4cf88 100644 (file)
--- a/ext/date/tests/date_create-1.phpt
+++ b/ext/date/tests/date_create-1.phpt
@@ -28,7 +28,7 @@ $d[] = date_create("2005-07-14 22:30:41 Europe/Oslo", $tz1);
 $d[] = date_create("2005-07-14 22:30:41 America/Los_Angeles", $tz2);
 
 foreach($d as $date) {
-       echo $date->format(date::ISO8601), "\n";
+       echo $date->format(DateTime::ISO8601), "\n";
 }
 ?>
 --EXPECT--