dualfroz
5763d58d02
Excluding the boundaries of a one or two unit long period pushes the included start past the included end. diff()->days is unsigned and the HOUR/MINUTE/SECOND branch applied abs() outright, so that backwards range was measured as a positive distance and the unconditional +1 inflated it further: a one day period reported 1, 2, 2 and 3 for EXCLUDE_NONE, START, END and ALL, while iterating the same objects yielded nothing. Return 0 up front when the included start is past the included end. This matches what the MONTH and YEAR precisions already returned through iterator_count(), and lets the now unreachable abs() go.
188 lines
9.1 KiB
PHP
188 lines
9.1 KiB
PHP
<?php
|
|
|
|
use Carbon\Carbon;
|
|
use Spatie\Period\Boundaries;
|
|
use Spatie\Period\Period;
|
|
use Spatie\Period\Precision;
|
|
|
|
dataset('overlapping_dates', function () {
|
|
/*
|
|
* A [=====]
|
|
* B [=====]
|
|
*/
|
|
yield [Period::make('2018-01-01', '2018-02-01'), Period::make('2018-01-15', '2018-02-15')];
|
|
|
|
/*
|
|
* A [=====]
|
|
* B [=============]
|
|
*/
|
|
yield [Period::make('2018-01-01', '2018-02-01'), Period::make('2017-01-01', '2019-01-01')];
|
|
|
|
/*
|
|
* A [=====]
|
|
* B [=====]
|
|
*/
|
|
yield [Period::make('2018-01-01', '2018-02-01'), Period::make('2017-12-01', '2018-01-15')];
|
|
|
|
/*
|
|
* A [=============]
|
|
* B [=====]
|
|
*/
|
|
yield [Period::make('2017-01-01', '2019-01-01'), Period::make('2018-01-01', '2018-02-01')];
|
|
|
|
/*
|
|
* A [====]
|
|
* B [====]
|
|
*/
|
|
yield [Period::make('2018-01-01', '2018-02-01'), Period::make('2018-01-01', '2018-02-01')];
|
|
});
|
|
|
|
dataset('no_overlapping_dates', function () {
|
|
/*
|
|
* A [===]
|
|
* B [===]
|
|
*/
|
|
yield [Period::make('2018-01-01', '2018-01-31'), Period::make('2018-02-01', '2018-02-28')];
|
|
|
|
/*
|
|
* A [===]
|
|
* B [===]
|
|
*/
|
|
yield [Period::make('2018-02-01', '2018-02-28'), Period::make('2018-01-01', '2018-01-31')];
|
|
});
|
|
|
|
dataset('periods_with_amounts_of_included_dates', function () {
|
|
yield [4, Period::make('2016-01-01', '2019-02-05', Precision::YEAR(), Boundaries::EXCLUDE_NONE())];
|
|
yield [3, Period::make('2016-01-01', '2019-02-05', Precision::YEAR(), Boundaries::EXCLUDE_START())];
|
|
yield [3, Period::make('2016-01-01', '2019-02-05', Precision::YEAR(), Boundaries::EXCLUDE_END())];
|
|
yield [2, Period::make('2016-01-01', '2019-02-05', Precision::YEAR(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [43, Period::make('2016-01-01', '2019-07-05', Precision::MONTH(), Boundaries::EXCLUDE_NONE())];
|
|
yield [42, Period::make('2016-01-01', '2019-07-05', Precision::MONTH(), Boundaries::EXCLUDE_START())];
|
|
yield [42, Period::make('2016-01-01', '2019-07-05', Precision::MONTH(), Boundaries::EXCLUDE_END())];
|
|
yield [41, Period::make('2016-01-01', '2019-07-05', Precision::MONTH(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [31, Period::make('2018-01-01', '2018-01-31', boundaries: Boundaries::EXCLUDE_NONE())];
|
|
yield [30, Period::make('2018-01-01', '2018-01-31', boundaries: Boundaries::EXCLUDE_START())];
|
|
yield [30, Period::make('2018-01-01', '2018-01-31', boundaries: Boundaries::EXCLUDE_END())];
|
|
yield [29, Period::make('2018-01-01', '2018-01-31', boundaries: Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [24, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:00', Precision::HOUR(), Boundaries::EXCLUDE_NONE())];
|
|
yield [23, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:00', Precision::HOUR(), Boundaries::EXCLUDE_START())];
|
|
yield [23, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:00', Precision::HOUR(), Boundaries::EXCLUDE_END())];
|
|
yield [22, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:00', Precision::HOUR(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [1440, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::MINUTE(), Boundaries::EXCLUDE_NONE())];
|
|
yield [1439, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::MINUTE(), Boundaries::EXCLUDE_START())];
|
|
yield [1439, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::MINUTE(), Boundaries::EXCLUDE_END())];
|
|
yield [1438, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::MINUTE(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [86363, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::SECOND(), Boundaries::EXCLUDE_NONE())];
|
|
yield [86362, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::SECOND(), Boundaries::EXCLUDE_START())];
|
|
yield [86362, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::SECOND(), Boundaries::EXCLUDE_END())];
|
|
yield [86361, Period::make('2018-01-01 00:00:00', '2018-01-01 23:59:22', Precision::SECOND(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
// Excluding a boundary of a one unit long period leaves nothing behind.
|
|
yield [1, Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_NONE())];
|
|
yield [0, Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_START())];
|
|
yield [0, Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_END())];
|
|
yield [0, Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [1, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_NONE())];
|
|
yield [0, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_START())];
|
|
yield [0, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_END())];
|
|
yield [0, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
yield [0, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::MINUTE(), Boundaries::EXCLUDE_ALL())];
|
|
yield [0, Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::SECOND(), Boundaries::EXCLUDE_ALL())];
|
|
|
|
// A two unit long period keeps exactly one unit when one of its boundaries is excluded.
|
|
yield [2, Period::make('2021-01-01', '2021-01-02', Precision::DAY(), Boundaries::EXCLUDE_NONE())];
|
|
yield [1, Period::make('2021-01-01', '2021-01-02', Precision::DAY(), Boundaries::EXCLUDE_START())];
|
|
yield [1, Period::make('2021-01-01', '2021-01-02', Precision::DAY(), Boundaries::EXCLUDE_END())];
|
|
yield [0, Period::make('2021-01-01', '2021-01-02', Precision::DAY(), Boundaries::EXCLUDE_ALL())];
|
|
});
|
|
|
|
dataset('periods_left_empty_by_excluded_boundaries', function () {
|
|
yield 'day' => [Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_START())];
|
|
yield 'day, end excluded' => [Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_END())];
|
|
yield 'day, all excluded' => [Period::make('2021-01-01', '2021-01-01', Precision::DAY(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'two days, all excluded' => [Period::make('2021-01-01', '2021-01-02', Precision::DAY(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'hour' => [Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::HOUR(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'minute' => [Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::MINUTE(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'second' => [Period::make('2021-01-01 00:00:00', '2021-01-01 00:00:00', Precision::SECOND(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'month' => [Period::make('2021-01-01', '2021-01-01', Precision::MONTH(), Boundaries::EXCLUDE_ALL())];
|
|
yield 'year' => [Period::make('2021-01-01', '2021-01-01', Precision::YEAR(), Boundaries::EXCLUDE_ALL())];
|
|
});
|
|
|
|
dataset('ceiling_dates', function () {
|
|
// Test inclusive Period's at same precision
|
|
yield [
|
|
Period::make('2018-01-01 11:30:15', '2018-01-15 11:30:15', Precision::SECOND()),
|
|
Precision::SECOND(),
|
|
Carbon::make('2018-01-15 11:30:15')->endOfSecond(),
|
|
];
|
|
|
|
yield [
|
|
Period::make('2018-01-01 11:30:15', '2018-01-15 11:30:15', Precision::MINUTE()),
|
|
Precision::MINUTE(),
|
|
Carbon::make('2018-01-15 11:30:15')->endOfMinute(),
|
|
];
|
|
|
|
yield [
|
|
Period::make('2018-01-01 11:30:15', '2018-01-15 11:30:15', Precision::HOUR()),
|
|
Precision::HOUR(),
|
|
Carbon::make('2018-01-15 11:30:15')->endOfHour(),
|
|
];
|
|
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::DAY()),
|
|
Precision::DAY(),
|
|
Carbon::make('2018-01-15')->endOfDay(),
|
|
];
|
|
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::MONTH()),
|
|
Precision::MONTH(),
|
|
Carbon::make('2018-01-15')->endOfMonth(),
|
|
];
|
|
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::YEAR()),
|
|
Precision::YEAR(),
|
|
Carbon::make('2018-01-15')->endOfYear(),
|
|
];
|
|
|
|
// Test defaults to same precision as period
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::MONTH()),
|
|
null,
|
|
Carbon::make('2018-01-15')->endOfMonth(),
|
|
];
|
|
|
|
// Test higher precision
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::DAY()),
|
|
Precision::MONTH(),
|
|
Carbon::make('2018-01-15')->endOfMonth(),
|
|
];
|
|
|
|
// Test exclusive period
|
|
yield [
|
|
Period::make('2018-01-01', '2018-01-15', Precision::DAY(), Boundaries::EXCLUDE_END()),
|
|
Precision::DAY(),
|
|
Carbon::make('2018-01-15')->subDay()->endOfDay(),
|
|
];
|
|
});
|
|
|
|
dataset('rounding_dates', function () {
|
|
return [
|
|
[Precision::YEAR(), '2018-01-01 00:00:00', '2018-01-01 00:00:00'],
|
|
[Precision::MONTH(), '2018-02-01 00:00:00', '2018-03-01 00:00:00'],
|
|
[Precision::DAY(), '2018-02-05 00:00:00', '2018-03-05 00:00:00'],
|
|
[Precision::HOUR(), '2018-02-05 11:00:00', '2018-03-05 11:00:00'],
|
|
[Precision::MINUTE(), '2018-02-05 11:11:00', '2018-03-05 11:11:00'],
|
|
[Precision::SECOND(), '2018-02-05 11:11:11', '2018-03-05 11:11:11'],
|
|
];
|
|
});
|