Skip to content

Commit f3a97d6

Browse files
authored
Rename methods to more natural language (#8)
1 parent 8a0335e commit f3a97d6

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/DateRange.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ public function setEndTime(DateTimeInterface $time): DateRangeInterface
139139
/**
140140
* {@inheritdoc}
141141
*/
142-
public function isStartAt(DateTimeInterface $time): bool
142+
public function isStartedAt(DateTimeInterface $time): bool
143143
{
144144
return $this->hasStartTime() && $this->state->compareStartTime($time) === 0;
145145
}
146146

147147
/**
148148
* {@inheritdoc}
149149
*/
150-
public function isEndAt(DateTimeInterface $time): bool
150+
public function isEndedAt(DateTimeInterface $time): bool
151151
{
152152
return $this->hasEndTime() && $this->state->compareEndTime($time) === 0;
153153
}

src/DateRangeInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function setEndTime(DateTimeInterface $time): DateRangeInterface;
7777
*
7878
* @return bool
7979
*/
80-
public function isStartAt(DateTimeInterface $time): bool;
80+
public function isStartedAt(DateTimeInterface $time): bool;
8181

8282
/**
8383
* Tells whether range is ended at specific time.
@@ -86,7 +86,7 @@ public function isStartAt(DateTimeInterface $time): bool;
8686
*
8787
* @return bool
8888
*/
89-
public function isEndAt(DateTimeInterface $time): bool;
89+
public function isEndedAt(DateTimeInterface $time): bool;
9090

9191
/**
9292
* Tells whether range is started at current time.

tests/DateRangeTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public function undefinedRange()
3333
self::assertFalse($actual->hasEndTime());
3434
self::assertFalse($actual->isStarted());
3535
self::assertFalse($actual->isEnded());
36-
self::assertFalse($actual->isStartAt($now));
37-
self::assertFalse($actual->isEndAt($now));
36+
self::assertFalse($actual->isStartedAt($now));
37+
self::assertFalse($actual->isEndedAt($now));
3838
self::assertSame('-/-', (string) $actual);
3939
self::assertSame(
4040
json_encode(['startTime' => null, 'endTime' => null]),
@@ -117,9 +117,9 @@ public function infiniteEndRange()
117117
self::assertFalse($actual->hasEndTime());
118118
self::assertTrue($actual->isStarted());
119119
self::assertFalse($actual->isEnded());
120-
self::assertTrue($actual->isStartAt($now));
121-
self::assertFalse($actual->isStartAt($tomorrow));
122-
self::assertFalse($actual->isEndAt($now));
120+
self::assertTrue($actual->isStartedAt($now));
121+
self::assertFalse($actual->isStartedAt($tomorrow));
122+
self::assertFalse($actual->isEndedAt($now));
123123
self::assertSame("{$now->format('c')}/-", (string) $actual);
124124
self::assertSame(
125125
json_encode(['startTime' => $now->format('c'), 'endTime' => null]),
@@ -165,9 +165,9 @@ public function infiniteStartRange()
165165
self::assertTrue($actual->hasEndTime());
166166
self::assertTrue($actual->isStarted());
167167
self::assertFalse($actual->isEnded());
168-
self::assertFalse($actual->isStartAt($now));
169-
self::assertTrue($actual->isEndAt($now));
170-
self::assertFalse($actual->isEndAt($yesterday));
168+
self::assertFalse($actual->isStartedAt($now));
169+
self::assertTrue($actual->isEndedAt($now));
170+
self::assertFalse($actual->isEndedAt($yesterday));
171171
self::assertSame("-/{$now->format('c')}", (string) $actual);
172172
self::assertSame(
173173
json_encode(['startTime' => null, 'endTime' => $now->format('c')]),
@@ -215,10 +215,10 @@ public function finiteRange()
215215
self::assertTrue($actual->hasEndTime());
216216
self::assertTrue($actual->isStarted());
217217
self::assertFalse($actual->isEnded());
218-
self::assertFalse($actual->isStartAt($now));
219-
self::assertTrue($actual->isStartAt($yesterday));
220-
self::assertFalse($actual->isEndAt($now));
221-
self::assertTrue($actual->isEndAt($tomorrow));
218+
self::assertFalse($actual->isStartedAt($now));
219+
self::assertTrue($actual->isStartedAt($yesterday));
220+
self::assertFalse($actual->isEndedAt($now));
221+
self::assertTrue($actual->isEndedAt($tomorrow));
222222
self::assertSame("{$yesterday->format('c')}/{$tomorrow->format('c')}", (string) $actual);
223223
self::assertSame(
224224
json_encode(['startTime' => $yesterday->format('c'), 'endTime' => $tomorrow->format('c')]),

0 commit comments

Comments
 (0)