Skip to content

Commit 8b9d23c

Browse files
derickrderickr
committed
Rename DateTimePoint to DateTimeImmutable.
1 parent 0f679b9 commit 8b9d23c

File tree

4 files changed

+89
-89
lines changed

4 files changed

+89
-89
lines changed

‎ext/date/php_date.c

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,9 @@ const zend_function_entry date_functions[] = {
385385

386386
/* Advanced Interface */
387387
PHP_FE(date_create, arginfo_date_create)
388-
PHP_FE(date_create_point, arginfo_date_create)
388+
PHP_FE(date_create_immutable, arginfo_date_create)
389389
PHP_FE(date_create_from_format, arginfo_date_create_from_format)
390-
PHP_FE(date_create_point_from_format, arginfo_date_create_from_format)
390+
PHP_FE(date_create_immutable_from_format, arginfo_date_create_from_format)
391391
PHP_FE(date_parse, arginfo_date_parse)
392392
PHP_FE(date_parse_from_format, arginfo_date_parse_from_format)
393393
PHP_FE(date_get_last_errors, arginfo_date_get_last_errors)
@@ -452,17 +452,17 @@ const zend_function_entry date_funcs_date[] = {
452452
PHP_FE_END
453453
};
454454

455-
const zend_function_entry date_funcs_point[] = {
456-
PHP_ME(DateTimePoint, __construct, arginfo_date_create, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
457-
PHP_ME(DateTimePoint, __set_state, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
458-
PHP_ME(DateTimePoint, modify, arginfo_date_method_modify, 0)
459-
PHP_ME(DateTimePoint, add, arginfo_date_method_add, 0)
460-
PHP_ME(DateTimePoint, sub, arginfo_date_method_sub, 0)
461-
PHP_ME(DateTimePoint, setTimezone, arginfo_date_method_timezone_set, 0)
462-
PHP_ME(DateTimePoint, setTime, arginfo_date_method_time_set, 0)
463-
PHP_ME(DateTimePoint, setDate, arginfo_date_method_date_set, 0)
464-
PHP_ME(DateTimePoint, setISODate, arginfo_date_method_isodate_set, 0)
465-
PHP_ME(DateTimePoint, setTimestamp, arginfo_date_method_timestamp_set, 0)
455+
const zend_function_entry date_funcs_immutable[] = {
456+
PHP_ME(DateTimeImmutable, __construct, arginfo_date_create, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
457+
PHP_ME(DateTimeImmutable, __set_state, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
458+
PHP_ME(DateTimeImmutable, modify, arginfo_date_method_modify, 0)
459+
PHP_ME(DateTimeImmutable, add, arginfo_date_method_add, 0)
460+
PHP_ME(DateTimeImmutable, sub, arginfo_date_method_sub, 0)
461+
PHP_ME(DateTimeImmutable, setTimezone, arginfo_date_method_timezone_set, 0)
462+
PHP_ME(DateTimeImmutable, setTime, arginfo_date_method_time_set, 0)
463+
PHP_ME(DateTimeImmutable, setDate, arginfo_date_method_date_set, 0)
464+
PHP_ME(DateTimeImmutable, setISODate, arginfo_date_method_isodate_set, 0)
465+
PHP_ME(DateTimeImmutable, setTimestamp, arginfo_date_method_timestamp_set, 0)
466466
PHP_FE_END
467467
};
468468

@@ -524,17 +524,17 @@ PHP_INI_END()
524524
/* }}} */
525525

526526
zend_class_entry *date_ce_date, *date_ce_timezone, *date_ce_interval, *date_ce_period;
527-
zend_class_entry *date_ce_point;
527+
zend_class_entry *date_ce_immutable;
528528

529529

530530
PHPAPI zend_class_entry *php_date_get_date_ce(void)
531531
{
532532
return date_ce_date;
533533
}
534534

535-
PHPAPI zend_class_entry *php_date_get_point_ce(void)
535+
PHPAPI zend_class_entry *php_date_get_immutable_ce(void)
536536
{
537-
return date_ce_point;
537+
return date_ce_immutable;
538538
}
539539

540540
PHPAPI zend_class_entry *php_date_get_timezone_ce(void)
@@ -543,7 +543,7 @@ PHPAPI zend_class_entry *php_date_get_timezone_ce(void)
543543
}
544544

545545
static zend_object_handlers date_object_handlers_date;
546-
static zend_object_handlers date_object_handlers_point;
546+
static zend_object_handlers date_object_handlers_immutable;
547547
static zend_object_handlers date_object_handlers_timezone;
548548
static zend_object_handlers date_object_handlers_interval;
549549
static zend_object_handlers date_object_handlers_period;
@@ -578,13 +578,13 @@ static void date_object_free_storage_interval(void *object TSRMLS_DC);
578578
static void date_object_free_storage_period(void *object TSRMLS_DC);
579579

580580
static zend_object_value date_object_new_date(zend_class_entry *class_type TSRMLS_DC);
581-
static zend_object_value date_object_new_point(zend_class_entry *class_type TSRMLS_DC);
581+
static zend_object_value date_object_new_immutable(zend_class_entry *class_type TSRMLS_DC);
582582
static zend_object_value date_object_new_timezone(zend_class_entry *class_type TSRMLS_DC);
583583
static zend_object_value date_object_new_interval(zend_class_entry *class_type TSRMLS_DC);
584584
static zend_object_value date_object_new_period(zend_class_entry *class_type TSRMLS_DC);
585585

586586
static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC);
587-
static zend_object_value date_object_clone_point(zval *this_ptr TSRMLS_DC);
587+
static zend_object_value date_object_clone_immutable(zval *this_ptr TSRMLS_DC);
588588
static zend_object_value date_object_clone_timezone(zval *this_ptr TSRMLS_DC);
589589
static zend_object_value date_object_clone_interval(zval *this_ptr TSRMLS_DC);
590590
static zend_object_value date_object_clone_period(zval *this_ptr TSRMLS_DC);
@@ -1933,7 +1933,7 @@ zend_object_iterator *date_object_period_get_iterator(zend_class_entry *ce, zval
19331933

19341934
static void date_register_classes(TSRMLS_D)
19351935
{
1936-
zend_class_entry ce_date, ce_point, ce_timezone, ce_interval, ce_period;
1936+
zend_class_entry ce_date, ce_immutable, ce_timezone, ce_interval, ce_period;
19371937

19381938
INIT_CLASS_ENTRY(ce_date, "DateTime", date_funcs_date);
19391939
ce_date.create_object = date_object_new_date;
@@ -1959,13 +1959,13 @@ static void date_register_classes(TSRMLS_D)
19591959
REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC1123);
19601960
REGISTER_DATE_CLASS_CONST_STRING("W3C", DATE_FORMAT_RFC3339);
19611961

1962-
INIT_CLASS_ENTRY(ce_point, "DateTimePoint", date_funcs_point);
1963-
ce_point.create_object = date_object_new_date;
1964-
date_ce_point = zend_register_internal_class_ex(&ce_point, date_ce_date, "DateTime" TSRMLS_CC);
1965-
memcpy(&date_object_handlers_point, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
1966-
date_object_handlers_point.clone_obj = date_object_clone_date;
1967-
date_object_handlers_point.compare_objects = date_object_compare_date;
1968-
date_object_handlers_point.get_properties = date_object_get_properties;
1962+
INIT_CLASS_ENTRY(ce_immutable, "DateTimeImmutable", date_funcs_immutable);
1963+
ce_immutable.create_object = date_object_new_date;
1964+
date_ce_immutable = zend_register_internal_class_ex(&ce_immutable, date_ce_date, "DateTime" TSRMLS_CC);
1965+
memcpy(&date_object_handlers_immutable, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
1966+
date_object_handlers_immutable.clone_obj = date_object_clone_date;
1967+
date_object_handlers_immutable.compare_objects = date_object_compare_date;
1968+
date_object_handlers_immutable.get_properties = date_object_get_properties;
19691969

19701970
INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone);
19711971
ce_timezone.create_object = date_object_new_timezone;
@@ -2066,7 +2066,7 @@ static zend_object_value date_object_clone_date(zval *this_ptr TSRMLS_DC)
20662066
return new_ov;
20672067
}
20682068

2069-
static zval* date_clone_point(zval *object)
2069+
static zval* date_clone_immutable(zval *object)
20702070
{
20712071
zval *new_object;
20722072

@@ -2515,10 +2515,10 @@ PHP_FUNCTION(date_create)
25152515
}
25162516
/* }}} */
25172517

2518-
/* {{{ proto DateTime date_create_point([string time[, DateTimeZone object]])
2518+
/* {{{ proto DateTime date_create_immutable([string time[, DateTimeZone object]])
25192519
Returns new DateTime object
25202520
*/
2521-
PHP_FUNCTION(date_create_point)
2521+
PHP_FUNCTION(date_create_immutable)
25222522
{
25232523
zval *timezone_object = NULL;
25242524
char *time_str = NULL;
@@ -2528,7 +2528,7 @@ PHP_FUNCTION(date_create_point)
25282528
RETURN_FALSE;
25292529
}
25302530

2531-
php_date_instantiate(date_ce_point, return_value TSRMLS_CC);
2531+
php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC);
25322532
if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, NULL, timezone_object, 0 TSRMLS_CC)) {
25332533
RETURN_FALSE;
25342534
}
@@ -2555,10 +2555,10 @@ PHP_FUNCTION(date_create_from_format)
25552555
}
25562556
/* }}} */
25572557

2558-
/* {{{ proto DateTime date_create_point_from_format(string format, string time[, DateTimeZone object])
2558+
/* {{{ proto DateTime date_create_immutable_from_format(string format, string time[, DateTimeZone object])
25592559
Returns new DateTime object formatted according to the specified format
25602560
*/
2561-
PHP_FUNCTION(date_create_point_from_format)
2561+
PHP_FUNCTION(date_create_immutable_from_format)
25622562
{
25632563
zval *timezone_object = NULL;
25642564
char *time_str = NULL, *format_str = NULL;
@@ -2568,7 +2568,7 @@ PHP_FUNCTION(date_create_point_from_format)
25682568
RETURN_FALSE;
25692569
}
25702570

2571-
php_date_instantiate(date_ce_point, return_value TSRMLS_CC);
2571+
php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC);
25722572
if (!php_date_initialize(zend_object_store_get_object(return_value TSRMLS_CC), time_str, time_str_len, format_str, timezone_object, 0 TSRMLS_CC)) {
25732573
RETURN_FALSE;
25742574
}
@@ -2593,10 +2593,10 @@ PHP_METHOD(DateTime, __construct)
25932593
}
25942594
/* }}} */
25952595

2596-
/* {{{ proto DateTimePoint::__construct([string time[, DateTimeZone object]])
2597-
Creates new DateTimePoint object
2596+
/* {{{ proto DateTimeImmutable::__construct([string time[, DateTimeZone object]])
2597+
Creates new DateTimeImmutable object
25982598
*/
2599-
PHP_METHOD(DateTimePoint, __construct)
2599+
PHP_METHOD(DateTimeImmutable, __construct)
26002600
{
26012601
zval *timezone_object = NULL;
26022602
char *time_str = NULL;
@@ -2678,9 +2678,9 @@ PHP_METHOD(DateTime, __set_state)
26782678
}
26792679
/* }}} */
26802680

2681-
/* {{{ proto DateTimePoint::__set_state()
2681+
/* {{{ proto DateTimeImmutable::__set_state()
26822682
*/
2683-
PHP_METHOD(DateTimePoint, __set_state)
2683+
PHP_METHOD(DateTimeImmutable, __set_state)
26842684
{
26852685
php_date_obj *dateobj;
26862686
zval *array;
@@ -2692,7 +2692,7 @@ PHP_METHOD(DateTimePoint, __set_state)
26922692

26932693
myht = HASH_OF(array);
26942694

2695-
php_date_instantiate(date_ce_point, return_value TSRMLS_CC);
2695+
php_date_instantiate(date_ce_immutable, return_value TSRMLS_CC);
26962696
dateobj = (php_date_obj *) zend_object_store_get_object(return_value TSRMLS_CC);
26972697
php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC);
26982698
}
@@ -2958,9 +2958,9 @@ PHP_FUNCTION(date_modify)
29582958
}
29592959
/* }}} */
29602960

2961-
/* {{{ proto DateTimePoint::modify()
2961+
/* {{{ proto DateTimeImmutable::modify()
29622962
*/
2963-
PHP_METHOD(DateTimePoint, modify)
2963+
PHP_METHOD(DateTimeImmutable, modify)
29642964
{
29652965
zval *object, *new_object;
29662966
char *modify;
@@ -2970,7 +2970,7 @@ PHP_METHOD(DateTimePoint, modify)
29702970
RETURN_FALSE;
29712971
}
29722972

2973-
new_object = date_clone_point(object);
2973+
new_object = date_clone_immutable(object);
29742974
php_date_modify(new_object, modify, modify_len, return_value TSRMLS_CC);
29752975

29762976
RETURN_ZVAL(new_object, 0, 1);
@@ -3027,17 +3027,17 @@ PHP_FUNCTION(date_add)
30273027
}
30283028
/* }}} */
30293029

3030-
/* {{{ proto DateTimePoint::add()
3030+
/* {{{ proto DateTimeImmutable::add()
30313031
*/
3032-
PHP_METHOD(DateTimePoint, add)
3032+
PHP_METHOD(DateTimeImmutable, add)
30333033
{
30343034
zval *object, *interval, *new_object;
30353035

30363036
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) {
30373037
RETURN_FALSE;
30383038
}
30393039

3040-
new_object = date_clone_point(object);
3040+
new_object = date_clone_immutable(object);
30413041
php_date_add(new_object, interval, return_value TSRMLS_CC);
30423042

30433043
RETURN_ZVAL(new_object, 0, 1);
@@ -3097,17 +3097,17 @@ PHP_FUNCTION(date_sub)
30973097
}
30983098
/* }}} */
30993099

3100-
/* {{{ proto DateTimePoint::sub()
3100+
/* {{{ proto DateTimeImmutable::sub()
31013101
*/
3102-
PHP_METHOD(DateTimePoint, sub)
3102+
PHP_METHOD(DateTimeImmutable, sub)
31033103
{
31043104
zval *object, *interval, *new_object;
31053105

31063106
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_date, &interval, date_ce_interval) == FAILURE) {
31073107
RETURN_FALSE;
31083108
}
31093109

3110-
new_object = date_clone_point(object);
3110+
new_object = date_clone_immutable(object);
31113111
php_date_sub(new_object, interval, return_value TSRMLS_CC);
31123112

31133113
RETURN_ZVAL(new_object, 0, 1);
@@ -3186,9 +3186,9 @@ PHP_FUNCTION(date_timezone_set)
31863186
}
31873187
/* }}} */
31883188

3189-
/* {{{ proto DateTimePoint::setTimezone()
3189+
/* {{{ proto DateTimeImmutable::setTimezone()
31903190
*/
3191-
PHP_METHOD(DateTimePoint, setTimezone)
3191+
PHP_METHOD(DateTimeImmutable, setTimezone)
31923192
{
31933193
zval *object, *new_object;
31943194
zval *timezone_object;
@@ -3197,7 +3197,7 @@ PHP_METHOD(DateTimePoint, setTimezone)
31973197
RETURN_FALSE;
31983198
}
31993199

3200-
new_object = date_clone_point(object);
3200+
new_object = date_clone_immutable(object);
32013201
php_date_timezone_set(new_object, timezone_object, return_value TSRMLS_CC);
32023202

32033203
RETURN_ZVAL(new_object, 0, 1);
@@ -3269,9 +3269,9 @@ PHP_FUNCTION(date_time_set)
32693269
}
32703270
/* }}} */
32713271

3272-
/* {{{ proto DateTimePoint::setTime()
3272+
/* {{{ proto DateTimeImmutable::setTime()
32733273
*/
3274-
PHP_METHOD(DateTimePoint, setTime)
3274+
PHP_METHOD(DateTimeImmutable, setTime)
32753275
{
32763276
zval *object, *new_object;
32773277
long h, i, s = 0;
@@ -3280,7 +3280,7 @@ PHP_METHOD(DateTimePoint, setTime)
32803280
RETURN_FALSE;
32813281
}
32823282

3283-
new_object = date_clone_point(object);
3283+
new_object = date_clone_immutable(object);
32843284
php_date_time_set(new_object, h, i, s, return_value TSRMLS_CC);
32853285

32863286
RETURN_ZVAL(new_object, 0, 1);
@@ -3317,9 +3317,9 @@ PHP_FUNCTION(date_date_set)
33173317
}
33183318
/* }}} */
33193319

3320-
/* {{{ proto DateTimePoint::setDate()
3320+
/* {{{ proto DateTimeImmutable::setDate()
33213321
*/
3322-
PHP_METHOD(DateTimePoint, setDate)
3322+
PHP_METHOD(DateTimeImmutable, setDate)
33233323
{
33243324
zval *object, *new_object;
33253325
long y, m, d;
@@ -3328,7 +3328,7 @@ PHP_METHOD(DateTimePoint, setDate)
33283328
RETURN_FALSE;
33293329
}
33303330

3331-
new_object = date_clone_point(object);
3331+
new_object = date_clone_immutable(object);
33323332
php_date_date_set(new_object, y, m, d, return_value TSRMLS_CC);
33333333

33343334
RETURN_ZVAL(new_object, 0, 1);
@@ -3369,9 +3369,9 @@ PHP_FUNCTION(date_isodate_set)
33693369
}
33703370
/* }}} */
33713371

3372-
/* {{{ proto DateTimePoint::setISODate()
3372+
/* {{{ proto DateTimeImmutable::setISODate()
33733373
*/
3374-
PHP_METHOD(DateTimePoint, setISODate)
3374+
PHP_METHOD(DateTimeImmutable, setISODate)
33753375
{
33763376
zval *object, *new_object;
33773377
long y, w, d = 1;
@@ -3380,7 +3380,7 @@ PHP_METHOD(DateTimePoint, setISODate)
33803380
RETURN_FALSE;
33813381
}
33823382

3383-
new_object = date_clone_point(object);
3383+
new_object = date_clone_immutable(object);
33843384
php_date_isodate_set(new_object, y, w, d, return_value TSRMLS_CC);
33853385

33863386
RETURN_ZVAL(new_object, 0, 1);
@@ -3415,9 +3415,9 @@ PHP_FUNCTION(date_timestamp_set)
34153415
}
34163416
/* }}} */
34173417

3418-
/* {{{ proto DateTimePoint::setTimestamp()
3418+
/* {{{ proto DateTimeImmutable::setTimestamp()
34193419
*/
3420-
PHP_METHOD(DateTimePoint, setTimestamp)
3420+
PHP_METHOD(DateTimeImmutable, setTimestamp)
34213421
{
34223422
zval *object, *new_object;
34233423
long timestamp;
@@ -3426,7 +3426,7 @@ PHP_METHOD(DateTimePoint, setTimestamp)
34263426
RETURN_FALSE;
34273427
}
34283428

3429-
new_object = date_clone_point(object);
3429+
new_object = date_clone_immutable(object);
34303430
php_date_timestamp_set(new_object, timestamp, return_value TSRMLS_CC);
34313431

34323432
RETURN_ZVAL(new_object, 0, 1);

0 commit comments

Comments
 (0)