dualfroz
67bae2d40e
Period::length() derived its count from diff()->days (day precision) and abs() (hour/minute/second precision), both of which discard sign information. For a period whose boundary exclusions push includedStart() past includedEnd() (e.g. a single-day period with Boundaries::EXCLUDE_ALL), the period is empty and iterating it yields zero dates, yet length() still reported a positive number, disagreeing with iterator_count(). Add an explicit emptiness check so length() returns 0 whenever includedStart() is after includedEnd(), matching the iterator's behaviour across all precisions.
106 lines
5.0 KiB
PHP
106 lines
5.0 KiB
PHP
<?php
|
|
|
|
use Spatie\Period\Boundaries;
|
|
use Spatie\Period\Period;
|
|
use Spatie\Period\Precision;
|
|
|
|
dataset('sames', function () {
|
|
return [
|
|
[
|
|
Period::make('2019-04-01', '2019-04-02'),
|
|
Period::make('2019-04-01', '2019-04-02'),
|
|
],
|
|
];
|
|
});
|
|
|
|
dataset('equals', function () {
|
|
yield '1 year' => [ // P1Y, but P365T vs P366T (2020 is a leap year)
|
|
Period::make('2019-01-01', '2019-12-31', Precision::YEAR()),
|
|
Period::make('2020-01-01', '2020-12-31', Precision::YEAR()),
|
|
];
|
|
|
|
// todo: I don't see how this one could ever have worked. TBI…
|
|
// yield '1 month' => [ // P1M , but P30D vs P28D
|
|
// Period::make('2019-04-01', '2019-04-30', Precision::MONTH()),
|
|
// Period::make('2019-02-01', '2019-02-28', Precision::MONTH()),
|
|
// ];
|
|
|
|
yield '1 day' => [ // P1D , but but different days
|
|
Period::make('2019-04-23', '2019-04-23', Precision::DAY()),
|
|
Period::make('2019-04-24', '2019-04-24', Precision::DAY()),
|
|
];
|
|
|
|
yield '12 hours' => [ // PT12H, but on different halves of the day
|
|
Period::make('2019-04-23 00:00:00', '2019-04-23 11:59:00', Precision::HOUR()),
|
|
Period::make('2019-04-23 12:00:00', '2019-04-23 23:59:00', Precision::HOUR()),
|
|
];
|
|
|
|
yield '30 minutes' => [ // PT30M, but on different halves of the hour
|
|
Period::make('2019-04-23 11:45:00', '2019-04-23 12:14:59', Precision::MINUTE()),
|
|
Period::make('2019-04-23 12:15:00', '2019-04-23 12:44:59', Precision::MINUTE()),
|
|
];
|
|
|
|
yield '30 seconds' => [ // PT30S, but on different halves of the minute
|
|
Period::make('2019-04-23 11:59:45', '2019-04-23 12:00:14', Precision::SECOND()),
|
|
Period::make('2019-04-23 12:00:15', '2019-04-23 12:00:44', Precision::SECOND()),
|
|
];
|
|
|
|
yield 'same amount of days within a month' => [ // P4D == P4D
|
|
Period::make('2019-02-01', '2019-02-28', Precision::DAY()),
|
|
Period::make('2019-04-01', '2019-04-28', Precision::DAY()),
|
|
];
|
|
|
|
yield 'same amount of days spanning two months' => [ // P4D is still P4D
|
|
Period::make('2019-02-27', '2019-03-02', Precision::DAY()),
|
|
Period::make('2019-03-30', '2019-04-02', Precision::DAY()),
|
|
];
|
|
|
|
yield 'same period, different precision' => [ // in this case P1D == P24H
|
|
Period::make('2019-04-23', '2019-04-23', Precision::DAY()),
|
|
Period::make('2019-04-23', '2019-04-23', Precision::HOUR()),
|
|
];
|
|
|
|
yield 'different boundaries, but same amount of days, ' => [ // P1D == P1D
|
|
Period::make('2019-04-23', '2019-04-23', Precision::DAY(), Boundaries::EXCLUDE_NONE()),
|
|
Period::make('2019-04-23', '2019-04-24', Precision::DAY(), Boundaries::EXCLUDE_END()),
|
|
];
|
|
});
|
|
|
|
dataset('differents', function () {
|
|
return [
|
|
'a is smaller than b' => [
|
|
Period::make('2019-04-23', '2019-04-24', Precision::DAY()),
|
|
Period::make('2019-04-23', '2019-04-25', Precision::DAY()),
|
|
],
|
|
'b is smaller than a' => [
|
|
Period::make('2019-04-23', '2019-04-25', Precision::DAY()),
|
|
Period::make('2019-04-23', '2019-04-24', Precision::DAY()),
|
|
],
|
|
];
|
|
});
|
|
|
|
dataset('expected_period_lengths', function () {
|
|
yield [1, Period::make('2018-01-01', '2018-01-01')];
|
|
yield [15, Period::make('2018-01-01', '2018-01-15')];
|
|
yield [14, Period::make('2018-01-01', '2018-01-15', boundaries: Boundaries::EXCLUDE_START())];
|
|
yield [14, Period::make('2018-01-01', '2018-01-15', boundaries: Boundaries::EXCLUDE_END())];
|
|
yield [13, Period::make('2018-01-01', '2018-01-15', boundaries: Boundaries::EXCLUDE_ALL())];
|
|
yield [24, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:59', Precision::HOUR())];
|
|
yield [24, Period::make('2018-01-01 00:00:00', '2018-01-02 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_END())];
|
|
});
|
|
|
|
// Single-unit periods left empty by their boundary exclusions. The
|
|
// iterator yields nothing for these, so length() must return 0.
|
|
dataset('empty_period_lengths', function () {
|
|
yield 'day, exclude start' => [Period::make('2018-01-01', '2018-01-01', Precision::DAY(), Boundaries::EXCLUDE_START())];
|
|
yield 'day, exclude end' => [Period::make('2018-01-01', '2018-01-01', Precision::DAY(), Boundaries::EXCLUDE_END())];
|
|
yield 'day, exclude all' => [Period::make('2018-01-01', '2018-01-01', Precision::DAY(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield 'hour, exclude all' => [Period::make('2018-01-01 10:00:00', '2018-01-01 10:00:00', Precision::HOUR(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'minute, exclude all' => [Period::make('2018-01-01 10:00:00', '2018-01-01 10:00:00', Precision::MINUTE(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'second, exclude all' => [Period::make('2018-01-01 10:00:00', '2018-01-01 10:00:00', Precision::SECOND(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield 'month, exclude all' => [Period::make('2018-01-01', '2018-01-01', Precision::MONTH(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'year, exclude all' => [Period::make('2018-01-01', '2018-01-01', Precision::YEAR(), Boundaries::EXCLUDE_ALL())];
|
|
});
|