Skip to content

Commit

Permalink
Merge branch 'master' into feature/carbon-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@hughgrigg
hughgrigg authored Jun 29, 2019
2 parents 6af4272 + d517fc0 commit f0eb226
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 2 deletions.
27 changes: 26 additions & 1 deletion src/BusinessTime.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,22 @@ public function isBusinessTime(): bool
*/
public function isBusinessDay(): bool
{
return $this->startOfBusinessDay()->isSameDay($this);
// Must be a business day if it's business time right now.
if ($this->isBusinessTime()) {
return true;
}

// Iterate from the beginning of the day until we hit business time.
$time = $this->copy()->startOfDay();
$end = $this->copy()->endOfDay();
while ($time->lt($end)) {
if ($time->isBusinessTime()) {
return true;
}
$time = $time->add($this->precision());
}

return false;
}

/**
Expand Down Expand Up @@ -106,6 +121,11 @@ public function addBusinessDays(float $businessDaysToAdd): self
$next = $next->add($this->precision());
}

// Ensure we always end on a business day.
while (!$next->isBusinessDay()) {
$next = $next->addDay();
}

return $next;
}

Expand Down Expand Up @@ -161,6 +181,11 @@ public function subBusinessDays(float $businessDaysToSub): self
}
}

// Ensure we always end on a business day.
while (!$prev->isBusinessDay()) {
$prev = $prev->subDay();
}

return $prev;
}

Expand Down
24 changes: 23 additions & 1 deletion tests/Unit/BusinessTime/AddBusinessDaysTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public function addBusinessDayProvider(): array
['Friday 2018-05-18 14:00', 'Monday 2018-05-21 14:00'],
['Saturday 2018-05-19 15:00', 'Monday 2018-05-21 17:00'],
['Sunday 2018-05-20 16:00', 'Monday 2018-05-21 17:00'],
['Friday 2019-06-28 00:00', 'Monday 2019-07-01 00:00'],
];
}

Expand Down Expand Up @@ -108,8 +109,14 @@ public function addBusinessDaysProvider(): array
['Monday 2018-05-14 09:00', 1.5, 'Tuesday 2018-05-15 13:00'],
['Monday 2018-05-14 09:00', 1.75, 'Tuesday 2018-05-15 15:00'],
['Monday 2018-05-14 09:00', 2, 'Wednesday 2018-05-16 09:00'],
// From Friday evening.
// From Friday morning.
['Friday 2018-05-18 00:00', 0, 'Friday 2018-05-18 00:00'],
['Friday 2018-05-18 00:00', 0.25, 'Friday 2018-05-18 11:00'],
['Friday 2018-05-18 00:00', 0.5, 'Friday 2018-05-18 13:00'],
['Friday 2018-05-18 00:00', 0.75, 'Friday 2018-05-18 15:00'],
['Friday 2018-05-18 00:00', 1, 'Monday 2018-05-21 00:00'],
['Friday 2018-05-18 00:00', 1.25, 'Monday 2018-05-21 11:00'],
// From Friday evening.
['Friday 2018-05-18 17:00', 0, 'Friday 2018-05-18 17:00'],
['Friday 2018-05-18 17:00', 0.25, 'Monday 2018-05-21 11:00'],
['Friday 2018-05-18 17:00', 0.5, 'Monday 2018-05-21 13:00'],
Expand All @@ -133,4 +140,19 @@ public function addBusinessDaysProvider(): array
['Friday 2018-05-18 17:00', -2, 'Wednesday 2018-05-16 17:00'],
];
}

/**
* The addBusinessDay method should always return a business day.
*/
public function testAlwaysEndsOnBusinessDay()
{
// Given we have a business time for Friday;
$businessTime = new BusinessTime('Friday');

// When we add one business day to it;
$addDay = $businessTime->addBusinessDay();

// Then it should be Monday.
self::assertEquals('Monday', $addDay->format('l'));
}
}
29 changes: 29 additions & 0 deletions tests/Unit/BusinessTime/SubBusinessDaysTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public function subBusinessDayProvider(): array
['Monday 2018-05-21 13:00', 'Friday 2018-05-18 13:00'],
['Sunday 2018-05-20 11:00', 'Friday 2018-05-18 09:00'],
['Saturday 2018-05-19 10:00', 'Friday 2018-05-18 09:00'],
['Monday 2018-05-21 17:00', 'Friday 2018-05-18 17:00'],
];
}

Expand Down Expand Up @@ -114,6 +115,19 @@ public function subBusinessDaysProvider(): array
['Monday 2018-05-21 09:00', 1.5, 'Thursday 2018-05-17 13:00'],
['Monday 2018-05-21 09:00', 1.75, 'Thursday 2018-05-17 11:00'],
['Monday 2018-05-21 09:00', 2, 'Thursday 2018-05-17 09:00'],
// From Monday evening.
['Monday 2018-05-21 17:00', 0, 'Monday 2018-05-21 17:00'],
['Monday 2018-05-21 18:00', 0, 'Monday 2018-05-21 18:00'],
['Monday 2018-05-21 18:00', 0.25, 'Monday 2018-05-21 15:00'],
['Monday 2018-05-21 18:00', 0.5, 'Monday 2018-05-21 13:00'],
['Monday 2018-05-21 18:00', 0.75, 'Monday 2018-05-21 11:00'],
['Monday 2018-05-21 18:00', 1, 'Friday 2018-05-18 18:00'],
['Monday 2018-05-21 18:00', 1.25, 'Friday 2018-05-18 15:00'],
['Monday 2018-05-21 18:00', 1.5, 'Friday 2018-05-18 13:00'],
['Monday 2018-05-21 18:00', 1.75, 'Friday 2018-05-18 11:00'],
['Monday 2018-05-21 18:00', 2, 'Friday 2018-05-18 09:00'],
['Monday 2018-05-21 18:00', 2.5, 'Thursday 2018-05-17 13:00'],
['Monday 2018-05-21 18:00', 3, 'Thursday 2018-05-17 09:00'],
// Negative values.
['Wednesday 2018-05-23 13:00', -0, 'Wednesday 2018-05-23 13:00'],
['Wednesday 2018-05-23 13:00', -0.25, 'Wednesday 2018-05-23 15:00'],
Expand All @@ -126,4 +140,19 @@ public function subBusinessDaysProvider(): array
['Wednesday 2018-05-23 13:00', -2, 'Friday 2018-05-25 13:00'],
];
}

/**
* The subBusinessDay method should always return a business day.
*/
public function testAlwaysEndsOnBusinessDay()
{
// Given we have a business time for Monday;
$businessTime = new BusinessTime('Monday');

// When we subtract one business day from it;
$addDay = $businessTime->subBusinessDay();

// Then it should be Friday.
self::assertEquals('Friday', $addDay->format('l'));
}
}

0 comments on commit f0eb226

Please sign in to comment.