com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/php _date.c ext/date/php_date.h ext/date/tests/DatePeri od_getter.phpt
| From: | Derick Rethans | Date: | Sun, 17 Mar 2019 18:38:04 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/php _date.c ext/date/php_date.h ext/date/tests/DatePeri od_getter.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105176@lists.php.net to get a copy of this message | ||
Commit: 7e7ef44fab154e972a4677c579e73cb9ec175511
Author: Derick Rethans <github@derickrethans.nl> Sun, 17 Mar 2019 14:38:04 -0400
Parents: 3a04b507ecb3d861f023172c713107198b19ce0b 1307275b431b3d15523237196a7e241709eceb95
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e7ef44fab154e972a4677c579e73cb9ec175511
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM ext/date/php_date.c
MM ext/date/php_date.h
MM ext/date/tests/DatePeriod_getter.phpt
Diff:
diff --cc ext/date/tests/DatePeriod_getter.phpt
index cd02baf,58f93b7..06fa031
--- a/ext/date/tests/DatePeriod_getter.phpt
+++ b/ext/date/tests/DatePeriod_getter.phpt
@@@ -16,8 -17,19 +17,19 @@@ var_dump($period->getEndDate()->format(
var_dump($period->getEndDate()->getTimeZone()->getName());
var_dump($period->getDateInterval()->format('%R%y-%m-%d-%h-%i-%s'));
+ var_dump($period->getRecurrences());
+
+ $periodWithRecurrences = new DatePeriod($start, $interval, $recurrences);
+
+ var_dump($periodWithRecurrences->getRecurrences());
+ var_dump($periodWithRecurrences->getEndDate());
+
+ $periodWithRecurrencesWithoutStart = new DatePeriod($start, $interval, $recurrences,
DatePeriod::EXCLUDE_START_DATE);
+
+ var_dump($periodWithRecurrences->getRecurrences());
+
?>
---EXPECTF--
+--EXPECT--
string(19) "2000-01-01 00:00:00"
string(13) "Europe/Berlin"
string(19) "2000-01-31 00:00:00"