Skip to content

Consider bounds when checking if a period is before another. #139

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

Merged
nyamsprod merged 1 commit into from
Oct 17, 2025
Merged

Consider bounds when checking if a period is before another. #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Period.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ public function durationLessThan(Period|Duration|DateInterval|string $duration):
public function isBefore(Period|DatePoint|DateTimeInterface|string $timeSlot): bool
{
if ($timeSlot instanceof self) {
return $this->endDate <= $timeSlot->startDate;
return $this->endDate <= $timeSlot->startDate && !$this->meetsOnStart($timeSlot);
}

$datePoint = self::filterDatePoint($timeSlot);
Expand Down
8 changes: 4 additions & 4 deletions src/PeriodRelationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ public static function isBeforeProvider(): array
'exclude start date is before interval' => [
'interval' => Period::after('2012-01-01', '1 MONTH', Bounds::ExcludeStartIncludeEnd),
'input' => Period::fromMonth(2012, 2),
'expected' => true,
'expected' => false,
],
'exclude start date is not before interval' => [
'interval' => Period::after('2012-01-01', '1 MONTH', Bounds::ExcludeStartIncludeEnd),
'input' => Period::fromMonth(2012, 2),
'input' => Period::fromMonth(2012, 3),
'expected' => true,
],
'exclude start date abuts interval start date' => [
Expand Down Expand Up @@ -155,10 +155,10 @@ public static function isAfterProvider(): array
'exclude start date is before interval' => [
'interval' => Period::fromMonth(2012, 2),
'input' => Period::after('2012-01-01', '1 MONTH', Bounds::ExcludeStartIncludeEnd),
'expected' => true,
'expected' => false,
],
'exclude start date is not before interval' => [
'interval' => Period::fromMonth(2012, 2),
'interval' => Period::fromMonth(2012, 3),
'input' => Period::after('2012-01-01', '1 MONTH', Bounds::ExcludeStartIncludeEnd),
'expected' => true,
],
Expand Down
Loading