Skip to content

Commit

Permalink
Merge 220be6c into 0bf7a40
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugh Grigg committed Apr 5, 2018
2 parents 0bf7a40 + 220be6c commit 4449e99
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/BusinessTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ private function diffInBusinessTime(
*/
private function canonicalNarrator(): BusinessTimeNarrator
{
/** @var BusinessTimeConstraint $constraint */
/* @var BusinessTimeConstraint $constraint */
if (!$this->isBusinessTime()) {
foreach ($this->businessTimeConstraints() as $constraint) {
if (!$constraint->isBusinessTime($this)) {
Expand Down
4 changes: 1 addition & 3 deletions src/BusinessTimePeriod.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
use DatePeriod;

/**
* @package BusinessTime
*
* @property-read BusinessTime $start
* @property-read BusinessTime $end
*/
Expand All @@ -33,7 +31,7 @@ public function __construct(
}

/**
* TODO
* TODO.
*
* Get this business time period separated into consecutive business and
* non-business times.
Expand Down
2 changes: 1 addition & 1 deletion src/Constraint/AnyTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace BusinessTime\Constraint;

use BusinessTime\Constraint\Composite\Combinations;
use BusinessTime\Constraint\Narration\BusinessTimeNarrator;
use BusinessTime\Constraint\Narration\BasicNarration;
use BusinessTime\Constraint\Narration\BusinessTimeNarrator;
use DateTimeInterface;

/**
Expand Down
2 changes: 2 additions & 0 deletions src/Constraint/Composite/All.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ public function isBusinessTime(DateTimeInterface $time): bool
* Retrieve an external iterator.
*
* @link http://php.net/manual/en/iteratoraggregate.getiterator.php
*
* @return Traversable
*
* @since 5.0.0
*/
public function getIterator(): Traversable
Expand Down
2 changes: 1 addition & 1 deletion src/Constraint/Narration/BusinessTimeNarrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

interface BusinessTimeNarrator
{
public const DEFAULT_BUSINESS = 'business hours';
public const DEFAULT_BUSINESS = 'business hours';
public const DEFAULT_NON_BUSINESS = 'outside business hours';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Constraint/Weekends.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct()
*/
public function narrate(DateTimeInterface $time): string
{
/**
/*
* The Weekends constraint matches weekends as business time.
*
* @see WeekDays is the opposite.
Expand Down
3 changes: 1 addition & 2 deletions tests/Unit/Constraint/Narration/DefaultNarratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ public function testOffersDefault(
string $expectedNarration
): void {
// Given we have a constraint without narration;
$constraint = new class implements BusinessTimeConstraint
{
$constraint = new class() implements BusinessTimeConstraint {
public function isBusinessTime(DateTimeInterface $time): bool
{
return true;
Expand Down

0 comments on commit 4449e99

Please sign in to comment.