Skip to content

Commit dd2c527

Browse files
slavcodevslavcodev
authored
Rename states classes (#14)
1 parent 2d5a5bf commit dd2c527

File tree

10 files changed

+37
-37
lines changed

10 files changed

+37
-37
lines changed

‎src/DateRange.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use JsonSerializable;
1818
use Traversable;
1919
use Zee\DateRange\States\RangeState;
20-
use Zee\DateRange\States\UndefinedRange;
20+
use Zee\DateRange\States\UndefinedState;
2121

2222
/**
2323
* Implementation of date range value object.
@@ -35,7 +35,7 @@ final class DateRange implements DateRangeInterface, JsonSerializable
3535
*/
3636
public function __construct(DateTimeInterface $startDate = null, DateTimeInterface $endDate = null)
3737
{
38-
$state = new UndefinedRange();
38+
$state = new UndefinedState();
3939

4040
if (isset($startDate)) {
4141
$state = $state->setStartDate($startDate);

src/States/FiniteRange.php renamed to src/States/FiniteState.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Zee\DateRange\DateRangeException;
77

88
/**
9-
* Class FiniteRange.
9+
* State of the finite range.
1010
*/
11-
final class FiniteRange extends RangeState
11+
final class FiniteState extends RangeState
1212
{
1313
/**
1414
* @var DateTimeInterface
@@ -71,14 +71,14 @@ public function getEndDate(): DateTimeInterface
7171
*/
7272
public function setStartDate(DateTimeInterface $start): RangeState
7373
{
74-
return new FiniteRange($start, $this->endDate);
74+
return new FiniteState($start, $this->endDate);
7575
}
7676

7777
/**
7878
* {@inheritdoc}
7979
*/
8080
public function setEndDate(DateTimeInterface $end): RangeState
8181
{
82-
return new FiniteRange($this->startDate, $end);
82+
return new FiniteState($this->startDate, $end);
8383
}
8484
}

src/States/InfiniteEndRange.php renamed to src/States/InfiniteEndState.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Zee\DateRange\DateRangeException;
77

88
/**
9-
* Class InfiniteEndRange.
9+
* State of the range with infinite end.
1010
*/
11-
final class InfiniteEndRange extends RangeState
11+
final class InfiniteEndState extends RangeState
1212
{
1313
/**
1414
* @var DateTimeInterface
@@ -60,15 +60,15 @@ public function getEndDate(): DateTimeInterface
6060
*/
6161
public function setStartDate(DateTimeInterface $start): RangeState
6262
{
63-
return new InfiniteEndRange($start);
63+
return new InfiniteEndState($start);
6464
}
6565

6666
/**
6767
* {@inheritdoc}
6868
*/
6969
public function setEndDate(DateTimeInterface $end): RangeState
7070
{
71-
return new FiniteRange($this->startDate, $end);
71+
return new FiniteState($this->startDate, $end);
7272
}
7373

7474
/**

src/States/InfiniteStartRange.php renamed to src/States/InfiniteStartState.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Zee\DateRange\DateRangeException;
77

88
/**
9-
* Class InfiniteStartRange.
9+
* State of the range with infinite start.
1010
*/
11-
final class InfiniteStartRange extends RangeState
11+
final class InfiniteStartState extends RangeState
1212
{
1313
/**
1414
* @var DateTimeInterface
@@ -52,15 +52,15 @@ public function getEndDate(): DateTimeInterface
5252
*/
5353
public function setStartDate(DateTimeInterface $start): RangeState
5454
{
55-
return new FiniteRange($start, $this->endDate);
55+
return new FiniteState($start, $this->endDate);
5656
}
5757

5858
/**
5959
* {@inheritdoc}
6060
*/
6161
public function setEndDate(DateTimeInterface $end): RangeState
6262
{
63-
return new InfiniteStartRange($end);
63+
return new InfiniteStartState($end);
6464
}
6565

6666
/**

‎src/States/RangeState.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use DateTimeInterface;
66

77
/**
8-
* Interface RangeState.
8+
* Date range abstract state.
99
*/
1010
abstract class RangeState
1111
{

src/States/UndefinedRange.php renamed to src/States/UndefinedState.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
use Zee\DateRange\DateRangeException;
77

88
/**
9-
* Class UndefinedRange.
9+
* State of the undefined range.
1010
*/
11-
final class UndefinedRange extends RangeState
11+
final class UndefinedState extends RangeState
1212
{
1313
/**
1414
* {@inheritdoc}
@@ -31,15 +31,15 @@ public function getEndDate(): DateTimeInterface
3131
*/
3232
public function setStartDate(DateTimeInterface $start): RangeState
3333
{
34-
return new InfiniteEndRange($start);
34+
return new InfiniteEndState($start);
3535
}
3636

3737
/**
3838
* {@inheritdoc}
3939
*/
4040
public function setEndDate(DateTimeInterface $end): RangeState
4141
{
42-
return new InfiniteStartRange($end);
42+
return new InfiniteStartState($end);
4343
}
4444

4545
/**

‎tests/States/FiniteRangeTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
final class FiniteRangeTest extends TestCase
2121
{
2222
/**
23-
* @var FiniteRange
23+
* @var FiniteState
2424
*/
2525
private $subject;
2626

@@ -43,7 +43,7 @@ protected function setUp()
4343

4444
$this->yesterday = new DateTimeImmutable('-1 day');
4545
$this->tomorrow = new DateTimeImmutable('+1 day');
46-
$this->subject = new FiniteRange($this->yesterday, $this->tomorrow);
46+
$this->subject = new FiniteState($this->yesterday, $this->tomorrow);
4747
}
4848

4949
/**
@@ -53,8 +53,8 @@ public function checkFiniteState()
5353
{
5454
self::assertTrue($this->subject->hasStartDate());
5555
self::assertTrue($this->subject->hasEndDate());
56-
self::assertInstanceOf(FiniteRange::class, $this->subject->setStartDate(new DateTimeImmutable()));
57-
self::assertInstanceOf(FiniteRange::class, $this->subject->setEndDate(new DateTimeImmutable()));
56+
self::assertInstanceOf(FiniteState::class, $this->subject->setStartDate(new DateTimeImmutable()));
57+
self::assertInstanceOf(FiniteState::class, $this->subject->setEndDate(new DateTimeImmutable()));
5858
self::assertSame($this->yesterday, $this->subject->getStartDate());
5959
self::assertSame($this->tomorrow, $this->subject->getEndDate());
6060
self::assertSame(0, $this->subject->compareStartDate($this->yesterday));
@@ -73,7 +73,7 @@ public function guardRangeSequence()
7373
$this->expectException(DateRangeException::class);
7474
$this->expectExceptionMessage('Invalid end date, must be after start');
7575

76-
new FiniteRange($this->tomorrow, $this->yesterday);
76+
new FiniteState($this->tomorrow, $this->yesterday);
7777
}
7878

7979
/**
@@ -84,6 +84,6 @@ public function guardRangeDatesDifference()
8484
$this->expectException(DateRangeException::class);
8585
$this->expectExceptionMessage('Invalid end date, must be after start');
8686

87-
new FiniteRange($this->tomorrow, $this->tomorrow);
87+
new FiniteState($this->tomorrow, $this->tomorrow);
8888
}
8989
}

‎tests/States/InfiniteEndRangeTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
final class InfiniteEndRangeTest extends TestCase
2121
{
2222
/**
23-
* @var FiniteRange
23+
* @var FiniteState
2424
*/
2525
private $subject;
2626

@@ -43,7 +43,7 @@ protected function setUp()
4343

4444
$this->yesterday = new DateTimeImmutable('-1 day');
4545
$this->tomorrow = new DateTimeImmutable('+1 day');
46-
$this->subject = new InfiniteEndRange($this->yesterday);
46+
$this->subject = new InfiniteEndState($this->yesterday);
4747
}
4848

4949
/**
@@ -53,8 +53,8 @@ public function checkFiniteState()
5353
{
5454
self::assertTrue($this->subject->hasStartDate());
5555
self::assertFalse($this->subject->hasEndDate());
56-
self::assertInstanceOf(InfiniteEndRange::class, $this->subject->setStartDate(new DateTimeImmutable()));
57-
self::assertInstanceOf(FiniteRange::class, $this->subject->setEndDate(new DateTimeImmutable()));
56+
self::assertInstanceOf(InfiniteEndState::class, $this->subject->setStartDate(new DateTimeImmutable()));
57+
self::assertInstanceOf(FiniteState::class, $this->subject->setEndDate(new DateTimeImmutable()));
5858
self::assertSame($this->yesterday, $this->subject->getStartDate());
5959
self::assertSame(0, $this->subject->compareStartDate($this->yesterday));
6060
self::assertSame(-1, $this->subject->compareStartDate($this->tomorrow));

‎tests/States/InfiniteStartRangeTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
final class InfiniteStartRangeTest extends TestCase
2121
{
2222
/**
23-
* @var FiniteRange
23+
* @var FiniteState
2424
*/
2525
private $subject;
2626

@@ -43,7 +43,7 @@ protected function setUp()
4343

4444
$this->yesterday = new DateTimeImmutable('-1 day');
4545
$this->tomorrow = new DateTimeImmutable('+1 day');
46-
$this->subject = new InfiniteStartRange($this->tomorrow);
46+
$this->subject = new InfiniteStartState($this->tomorrow);
4747
}
4848

4949
/**
@@ -53,8 +53,8 @@ public function checkFiniteState()
5353
{
5454
self::assertFalse($this->subject->hasStartDate());
5555
self::assertTrue($this->subject->hasEndDate());
56-
self::assertInstanceOf(FiniteRange::class, $this->subject->setStartDate(new DateTimeImmutable()));
57-
self::assertInstanceOf(InfiniteStartRange::class, $this->subject->setEndDate(new DateTimeImmutable()));
56+
self::assertInstanceOf(FiniteState::class, $this->subject->setStartDate(new DateTimeImmutable()));
57+
self::assertInstanceOf(InfiniteStartState::class, $this->subject->setEndDate(new DateTimeImmutable()));
5858
self::assertSame($this->tomorrow, $this->subject->getEndDate());
5959
self::assertSame(0, $this->subject->compareEndDate($this->tomorrow));
6060
self::assertSame(1, $this->subject->compareEndDate($this->yesterday));

‎tests/States/UndefinedRangeTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
final class UndefinedRangeTest extends TestCase
2121
{
2222
/**
23-
* @var UndefinedRange
23+
* @var UndefinedState
2424
*/
2525
private $subject;
2626

@@ -31,7 +31,7 @@ protected function setUp()
3131
{
3232
parent::setUp();
3333

34-
$this->subject = new UndefinedRange();
34+
$this->subject = new UndefinedState();
3535
}
3636

3737
/**
@@ -41,8 +41,8 @@ public function checkUndefinedState()
4141
{
4242
self::assertFalse($this->subject->hasStartDate());
4343
self::assertFalse($this->subject->hasEndDate());
44-
self::assertInstanceOf(InfiniteEndRange::class, $this->subject->setStartDate(new DateTimeImmutable()));
45-
self::assertInstanceOf(InfiniteStartRange::class, $this->subject->setEndDate(new DateTimeImmutable()));
44+
self::assertInstanceOf(InfiniteEndState::class, $this->subject->setStartDate(new DateTimeImmutable()));
45+
self::assertInstanceOf(InfiniteStartState::class, $this->subject->setEndDate(new DateTimeImmutable()));
4646
self::assertNull($this->subject->formatStartDate());
4747
self::assertNull($this->subject->formatEndDate());
4848
}

0 commit comments

Comments
 (0)