Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
bootstrap="./tests/bootstrap.php"
colors="true"
>
<coverage processUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="pauci/datetime test suite">
<directory>./tests</directory>
Expand Down
4 changes: 3 additions & 1 deletion src/DateInterval.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public static function fromDateInterval(\DateInterval $dateInterval): static
$interval->i = $dateInterval->i;
$interval->s = $dateInterval->s;
$interval->invert = $dateInterval->invert;
$interval->days = $dateInterval->days;

return $interval;
}
Expand Down Expand Up @@ -59,16 +58,19 @@ public static function fromString(string $interval): static
return new static($interval);
}

#[\Override]
public function __toString(): string
{
return $this->toString();
}

#[\Override]
public function jsonSerialize(): string
{
return $this->toString();
}

#[\Override]
public function toString(): string
{
$datePart = '';
Expand Down
2 changes: 1 addition & 1 deletion src/DateTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public function sub(\DateInterval $interval): static
}

#[\Override]
public function modify(string $modifier): static|false
public function modify(string $modifier): static
{
return parent::modify($modifier);
}
Expand Down
1 change: 1 addition & 0 deletions src/SystemClock.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

class SystemClock implements ClockInterface
{
#[\Override]
public function now(): DateTime
{
return new DateTime();
Expand Down
9 changes: 5 additions & 4 deletions tests/src/DateIntervalTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Pauci\DateTime\Test;

use Pauci\DateTime\DateInterval;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;

final class DateIntervalTest extends TestCase
Expand All @@ -28,9 +29,9 @@ public static function dateIntervalStrings(): array
}

/**
* @dataProvider dateIntervalStrings
* @param list<int> $parts
*/
#[DataProvider('dateIntervalStrings')]
public function testFromDateInterval(string $intervalSpec, array $parts): void
{
$interval = DateInterval::fromDateInterval(new \DateInterval($intervalSpec));
Expand Down Expand Up @@ -62,9 +63,9 @@ public function testFromDateIntervalBetweenWinterAndDst(): void
}

/**
* @dataProvider dateIntervalStrings
* @param list<int> $parts
*/
#[DataProvider('dateIntervalStrings')]
public function testFromString(string $intervalSpec, array $parts): void
{
$interval = DateInterval::fromString($intervalSpec);
Expand All @@ -78,9 +79,9 @@ public function testFromString(string $intervalSpec, array $parts): void
}

/**
* @dataProvider dateIntervalStrings
* @param list<int> $parts
*/
#[DataProvider('dateIntervalStrings')]
public function testToString(string $intervalSpec, array $parts): void
{
$interval = DateInterval::fromParts($parts[0], $parts[1], $parts[2], $parts[3], $parts[4], $parts[5]);
Expand All @@ -89,9 +90,9 @@ public function testToString(string $intervalSpec, array $parts): void
}

/**
* @dataProvider dateIntervalStrings
* @param list<int> $parts
*/
#[DataProvider('dateIntervalStrings')]
public function testJsonEncode(string $intervalSpec, array $parts): void
{
$interval = DateInterval::fromParts($parts[0], $parts[1], $parts[2], $parts[3], $parts[4], $parts[5]);
Expand Down
Loading