]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorDerick Rethans <github@derickrethans.nl>
Sun, 17 Mar 2019 18:38:04 +0000 (14:38 -0400)
committerDerick Rethans <github@derickrethans.nl>
Sun, 17 Mar 2019 18:38:04 +0000 (14:38 -0400)
1  2 
ext/date/php_date.c
ext/date/php_date.h
ext/date/tests/DatePeriod_getter.phpt

Simple merge
Simple merge
index cd02bafd558b7572bf85c768578b055526261905,58f93b7cdd12098f191ec16029d10d2d675ab63c..06fa03164009e495b27959a42e74c71cb6d6d036
@@@ -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"