Skip to content

Commit f611bf7

Browse files
kocsismatekocsismate
committed
Add DatePeriod unset handler
1 parent ceb6a95 commit f611bf7

File tree

3 files changed

+263
-11
lines changed

3 files changed

+263
-11
lines changed

‎ext/date/php_date.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string
363363
static zval *date_period_read_property(zend_object *object, zend_string *name, int type, void **cache_slot, zval *rv);
364364
static zval *date_period_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot);
365365
static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *name, int type, void **cache_slot);
366+
static void date_period_unset_property(zend_object *object, zend_string *name, void **cache_slot);
366367
static HashTable *date_period_get_properties_for(zend_object *object, zend_prop_purpose purpose);
367368
static int date_object_compare_timezone(zval *tz1, zval *tz2);
368369

@@ -1798,6 +1799,7 @@ static void date_register_classes(void) /* {{{ */
17981799
date_object_handlers_period.read_property = date_period_read_property;
17991800
date_object_handlers_period.write_property = date_period_write_property;
18001801
date_object_handlers_period.get_properties_for = date_period_get_properties_for;
1802+
date_object_handlers_period.unset_property = date_period_unset_property;
18011803

18021804
date_ce_date_error = register_class_DateError(zend_ce_error);
18031805
date_ce_date_object_error = register_class_DateObjectError(date_ce_date_error);
@@ -5985,17 +5987,6 @@ static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *
59855987

59865988
static HashTable *date_period_get_properties_for(zend_object *object, zend_prop_purpose purpose)
59875989
{
5988-
switch (purpose) {
5989-
case ZEND_PROP_PURPOSE_DEBUG:
5990-
case ZEND_PROP_PURPOSE_SERIALIZE:
5991-
case ZEND_PROP_PURPOSE_VAR_EXPORT:
5992-
case ZEND_PROP_PURPOSE_JSON:
5993-
case ZEND_PROP_PURPOSE_ARRAY_CAST:
5994-
break;
5995-
default:
5996-
return zend_std_get_properties_for(object, purpose);
5997-
}
5998-
59995990
php_period_obj *period_obj = php_period_obj_from_obj(object);
60005991
HashTable *props = zend_array_dup(zend_std_get_properties(object));
60015992
if (!period_obj->initialized) {
@@ -6006,3 +5997,13 @@ static HashTable *date_period_get_properties_for(zend_object *object, zend_prop_
60065997

60075998
return props;
60085999
}
6000+
6001+
static void date_period_unset_property(zend_object *object, zend_string *name, void **cache_slot)
6002+
{
6003+
if (date_period_is_internal_property(name)) {
6004+
zend_throw_error(NULL, "Cannot unset %s::$%s", ZSTR_VAL(object->ce->name), ZSTR_VAL(name));
6005+
return;
6006+
}
6007+
6008+
zend_std_unset_property(object, name, cache_slot);
6009+
}

‎ext/date/tests/date_period_properties.phpt

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
--TEST--
2+
Test different usages of DatePeriod properties
3+
--FILE--
4+
<?php
5+
6+
class MyDatePeriod extends DatePeriod {
7+
public int $prop = 3;
8+
}
9+
10+
$period = DatePeriod::createFromISO8601String("R4/2012-07-01T00:00:00Z/P7D");
11+
12+
var_dump($period);
13+
var_dump(json_encode($period));
14+
var_dump(serialize($period));
15+
var_dump(get_object_vars($period));
16+
var_dump(var_export($period));
17+
var_dump((array) ($period));
18+
19+
?>
20+
--EXPECTF--
21+
object(DatePeriod)#%d (%d) {
22+
["start"]=>
23+
object(DateTimeImmutable)#%d (%d) {
24+
["date"]=>
25+
string(26) "2012-07-01 00:00:00.000000"
26+
["timezone_type"]=>
27+
int(1)
28+
["timezone"]=>
29+
string(6) "+00:00"
30+
}
31+
["current"]=>
32+
NULL
33+
["end"]=>
34+
NULL
35+
["interval"]=>
36+
object(DateInterval)#%d (%d) {
37+
["y"]=>
38+
int(0)
39+
["m"]=>
40+
int(0)
41+
["d"]=>
42+
int(7)
43+
["h"]=>
44+
int(0)
45+
["i"]=>
46+
int(0)
47+
["s"]=>
48+
int(0)
49+
["f"]=>
50+
float(0)
51+
["invert"]=>
52+
int(0)
53+
["days"]=>
54+
bool(false)
55+
["from_string"]=>
56+
bool(false)
57+
}
58+
["recurrences"]=>
59+
int(5)
60+
["include_start_date"]=>
61+
bool(true)
62+
["include_end_date"]=>
63+
bool(false)
64+
}
65+
string(%d) "{"start":{"date":"2012-07-01 00:00:00.000000","timezone_type":1,"timezone":"+00:00"},"current":null,"end":null,"interval":{"y":0,"m":0,"d":7,"h":0,"i":0,"s":0,"f":0,"invert":0,"days":false,"from_string":false},"recurrences":5,"include_start_date":true,"include_end_date":false}"
66+
string(%d) "O:10:"DatePeriod":7:{s:5:"start";O:17:"DateTimeImmutable":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":10:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:6:"invert";i:0;s:4:"days";b:0;s:11:"from_string";b:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;s:16:"include_end_date";b:0;}"
67+
array(%d) {
68+
["start"]=>
69+
object(DateTimeImmutable)#%d (%d) {
70+
["date"]=>
71+
string(26) "2012-07-01 00:00:00.000000"
72+
["timezone_type"]=>
73+
int(1)
74+
["timezone"]=>
75+
string(6) "+00:00"
76+
}
77+
["current"]=>
78+
NULL
79+
["end"]=>
80+
NULL
81+
["interval"]=>
82+
object(DateInterval)#%d (%d) {
83+
["y"]=>
84+
int(0)
85+
["m"]=>
86+
int(0)
87+
["d"]=>
88+
int(7)
89+
["h"]=>
90+
int(0)
91+
["i"]=>
92+
int(0)
93+
["s"]=>
94+
int(0)
95+
["f"]=>
96+
float(0)
97+
["invert"]=>
98+
int(0)
99+
["days"]=>
100+
bool(false)
101+
["from_string"]=>
102+
bool(false)
103+
}
104+
["recurrences"]=>
105+
int(5)
106+
["include_start_date"]=>
107+
bool(true)
108+
["include_end_date"]=>
109+
bool(false)
110+
}
111+
\DatePeriod::__set_state(array(
112+
'start' =>
113+
\DateTimeImmutable::__set_state(array(
114+
'date' => '2012-07-01 00:00:00.000000',
115+
'timezone_type' => 1,
116+
'timezone' => '+00:00',
117+
)),
118+
'current' => NULL,
119+
'end' => NULL,
120+
'interval' =>
121+
\DateInterval::__set_state(array(
122+
'y' => 0,
123+
'm' => 0,
124+
'd' => 7,
125+
'h' => 0,
126+
'i' => 0,
127+
's' => 0,
128+
'f' => 0.0,
129+
'invert' => 0,
130+
'days' => false,
131+
'from_string' => false,
132+
)),
133+
'recurrences' => 5,
134+
'include_start_date' => true,
135+
'include_end_date' => false,
136+
))NULL
137+
array(%d) {
138+
["start"]=>
139+
object(DateTimeImmutable)#%d (%d) {
140+
["date"]=>
141+
string(26) "2012-07-01 00:00:00.000000"
142+
["timezone_type"]=>
143+
int(1)
144+
["timezone"]=>
145+
string(6) "+00:00"
146+
}
147+
["current"]=>
148+
NULL
149+
["end"]=>
150+
NULL
151+
["interval"]=>
152+
object(DateInterval)#%d (%d) {
153+
["y"]=>
154+
int(0)
155+
["m"]=>
156+
int(0)
157+
["d"]=>
158+
int(7)
159+
["h"]=>
160+
int(0)
161+
["i"]=>
162+
int(0)
163+
["s"]=>
164+
int(0)
165+
["f"]=>
166+
float(0)
167+
["invert"]=>
168+
int(0)
169+
["days"]=>
170+
bool(false)
171+
["from_string"]=>
172+
bool(false)
173+
}
174+
["recurrences"]=>
175+
int(5)
176+
["include_start_date"]=>
177+
bool(true)
178+
["include_end_date"]=>
179+
bool(false)
180+
}

‎ext/date/tests/date_period_unset_property.phpt

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
--TEST--
2+
Test unsetting DatePeriod properties
3+
--FILE--
4+
<?php
5+
6+
class MyDatePeriod extends DatePeriod {
7+
public int $prop = 3;
8+
}
9+
10+
$period = new MyDatePeriod(new DateTimeImmutable("now"), DateInterval::createFromDateString("tomorrow"), 1);
11+
12+
unset($period->prop);
13+
14+
try {
15+
$period->prop;
16+
} catch (Error $e) {
17+
echo $e->getMessage(), "\n";
18+
}
19+
20+
try {
21+
unset($period->start);
22+
} catch (Error $e) {
23+
echo $e->getMessage(), "\n";
24+
}
25+
26+
try {
27+
unset($period->current);
28+
} catch (Error $e) {
29+
echo $e->getMessage(), "\n";
30+
}
31+
32+
try {
33+
unset($period->end);
34+
} catch (Error $e) {
35+
echo $e->getMessage(), "\n";
36+
}
37+
38+
try {
39+
unset($period->interval);
40+
} catch (Error $e) {
41+
echo $e->getMessage(), "\n";
42+
}
43+
44+
try {
45+
unset($period->recurrences);
46+
} catch (Error $e) {
47+
echo $e->getMessage(), "\n";
48+
}
49+
50+
try {
51+
unset($period->include_start_date);
52+
} catch (Error $e) {
53+
echo $e->getMessage(), "\n";
54+
}
55+
56+
try {
57+
unset($period->include_end_date);
58+
} catch (Error $e) {
59+
echo $e->getMessage(), "\n";
60+
}
61+
62+
?>
63+
--EXPECT--
64+
Typed property MyDatePeriod::$prop must not be accessed before initialization
65+
Cannot unset MyDatePeriod::$start
66+
Cannot unset MyDatePeriod::$current
67+
Cannot unset MyDatePeriod::$end
68+
Cannot unset MyDatePeriod::$interval
69+
Cannot unset MyDatePeriod::$recurrences
70+
Cannot unset MyDatePeriod::$include_start_date
71+
Cannot unset MyDatePeriod::$include_end_date

0 commit comments

Comments
 (0)