Skip to content

Add tests for DatePeriod properties #4198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add tests for DatePeriod properties #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b982f13
Add tests for DatePeriod properties
duncan3dc May 28, 2019
1fc8e14
Add a get_property_ptr_ptr handler for DatePeriod
duncan3dc May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,7 @@ static zval *date_interval_write_property(zval *object, zval *member, zval *valu
static zval *date_interval_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot);
static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv);
static zval *date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot);
static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot);

/* {{{ Module struct */
zend_module_entry date_module_entry = {
Expand Down Expand Up @@ -2178,7 +2179,7 @@ static void date_register_classes(void) /* {{{ */
date_object_handlers_period.free_obj = date_object_free_storage_period;
date_object_handlers_period.clone_obj = date_object_clone_period;
date_object_handlers_period.get_properties = date_object_get_properties_period;
date_object_handlers_period.get_property_ptr_ptr = NULL;
date_object_handlers_period.get_property_ptr_ptr = date_period_get_property_ptr_ptr;
date_object_handlers_period.get_gc = date_object_get_gc_period;
date_object_handlers_period.read_property = date_period_read_property;
date_object_handlers_period.write_property = date_period_write_property;
Expand Down Expand Up @@ -5203,6 +5204,20 @@ static HashTable *date_object_get_properties_period(zval *object) /* {{{ */
return props;
} /* }}} */

/* {{{ date_period_get_property_ptr_ptr */
static zval *date_period_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot)
{
if (type != BP_VAR_IS && type != BP_VAR_R) {
zend_throw_error(NULL, "Retrieval of DatePeriod properties for modification is unsupported");
return &EG(uninitialized_zval);
}

Z_OBJPROP_P(object); /* build properties hash table */

return zend_std_get_property_ptr_ptr(object, member, type, cache_slot);
}
/* }}} */

static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht) /* {{{ */
{
zval *ht_entry;
Expand Down
37 changes: 37 additions & 0 deletions ext/date/tests/DatePeriod_properties1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
--TEST--
DatePeriod: Test read only properties
--INI--
date.timezone=UTC
--FILE--
<?php

$start = new DateTime;
$interval = new DateInterval('P1D');
$end = new DateTime;
$period = new DatePeriod($start, $interval, $end);

echo "recurrences: ";
var_dump($period->recurrences);

echo "include_start_date: ";
var_dump($period->include_start_date);

echo "start: ";
var_dump($period->start == $start);

echo "current: ";
var_dump($period->current);

echo "end: ";
var_dump($period->end == $end);

echo "interval: ";
var_dump($period->interval->format("%R%d"));
?>
--EXPECT--
recurrences: int(1)
include_start_date: bool(true)
start: bool(true)
current: NULL
end: bool(true)
interval: string(2) "+1"
46 changes: 46 additions & 0 deletions ext/date/tests/DatePeriod_properties2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
--TEST--
DatePeriod: Test cannot modify read only properties
--INI--
date.timezone=UTC
--FILE--
<?php

$period = new DatePeriod(new DateTime, new DateInterval('P1D'), new DateTime);

$properties = [
"recurrences",
"include_start_date",
"start",
"current",
"end",
"interval",
];

foreach ($properties as $property) {
try {
$period->$property = "new";
} catch (Error $e) {
echo $e->getMessage() . "\n";
}

try {
$period->$property[] = "extra";
} catch (Error $e) {
echo $e->getMessage() . "\n";
}
}

?>
--EXPECT--
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported
Writing to DatePeriod properties is unsupported
Retrieval of DatePeriod properties for modification is unsupported