From e15a372e59b53ccffb2e717fde00f6af553b1f49 Mon Sep 17 00:00:00 2001 From: Corentin Huet Date: Fri, 25 Sep 2026 11:20:51 +0200 Subject: [PATCH] refactor: :recycle: DateTime VO and use native DateTime class --- .../Coupon/CouponAvailabilityCalendar.php | 2 +- .../ValueObjects/Coupon/CouponValidity.php | 2 +- src/Domain/Models/ValueObjects/Period.php | 2 +- src/Shared/ValueObjects/DateTime.php | 51 ----------- .../Find/FindCampaignRequestTest.php | 4 +- .../List/ListCampaignsRequestTest.php | 6 +- .../Reject/RejectCampaignRequestTest.php | 4 +- .../Models/Entities/CampaignRequestTest.php | 4 +- .../Domain/Models/Entities/CouponTest.php | 2 +- .../Models/Entities/RequestedCouponTest.php | 8 +- .../Coupon/CouponAvailabilityCalendarTest.php | 2 +- .../Coupon/CouponDiffusionTest.php | 2 +- .../Coupon/CouponValidityTest.php | 2 +- .../RequestedCoupon/PeriodTest.php | 2 +- .../Unit/Shared/ValueObjects/DateTimeTest.php | 87 ------------------- 15 files changed, 21 insertions(+), 159 deletions(-) delete mode 100644 src/Shared/ValueObjects/DateTime.php delete mode 100644 tests/Unit/Shared/ValueObjects/DateTimeTest.php diff --git a/src/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendar.php b/src/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendar.php index 6121fe0..718ff59 100644 --- a/src/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendar.php +++ b/src/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendar.php @@ -6,7 +6,7 @@ namespace Domain\Models\ValueObjects\Coupon; use Domain\Models\ValueObjects\Period; use Shared\DDD\Models\Equatable; -use Shared\ValueObjects\DateTime; +use DateTime; final readonly class CouponAvailabilityCalendar implements Equatable { diff --git a/src/Domain/Models/ValueObjects/Coupon/CouponValidity.php b/src/Domain/Models/ValueObjects/Coupon/CouponValidity.php index a5304c9..ef59020 100644 --- a/src/Domain/Models/ValueObjects/Coupon/CouponValidity.php +++ b/src/Domain/Models/ValueObjects/Coupon/CouponValidity.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Domain\Models\ValueObjects\Coupon; use Shared\DDD\Models\Equatable; -use Shared\ValueObjects\DateTime; +use DateTime; final readonly class CouponValidity implements Equatable { diff --git a/src/Domain/Models/ValueObjects/Period.php b/src/Domain/Models/ValueObjects/Period.php index af6559f..da672a4 100644 --- a/src/Domain/Models/ValueObjects/Period.php +++ b/src/Domain/Models/ValueObjects/Period.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Domain\Models\ValueObjects; -use Shared\ValueObjects\DateTime; +use DateTime; final readonly class Period { diff --git a/src/Shared/ValueObjects/DateTime.php b/src/Shared/ValueObjects/DateTime.php deleted file mode 100644 index d8007d1..0000000 --- a/src/Shared/ValueObjects/DateTime.php +++ /dev/null @@ -1,51 +0,0 @@ -value = \DateTimeImmutable::createFromInterface($dateTime) - ->setTimezone(new \DateTimeZone('UTC')); - } - - public static function now(): self - { - return new self(DatesHelper::now()); - } - - #[\Override] - public function equals(mixed $other): bool - { - return $other instanceof self - && $this->value->format(\DateTimeInterface::RFC3339_EXTENDED) === $other->value->format(\DateTimeInterface::RFC3339_EXTENDED); - } - - public function __toString(): string - { - return DatesHelper::toRfc3339($this->value); - } - - public function jsonSerialize(): string - { - return (string) $this; - } -} diff --git a/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php index 1697e85..91fd4f9 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/Find/FindCampaignRequestTest.php @@ -41,7 +41,7 @@ use Domain\Ports\Repositories\BrandRepository; use Domain\Ports\Repositories\CampaignRequestRepository; use Shared\DDD\UseCases\Input as BaseInput; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Email; use Shared\ValueObjects\Money; use Shared\ValueObjects\Rcs; @@ -61,7 +61,7 @@ describe('find campaign request use case', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); }); diff --git a/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php index 866a348..dbc8c7d 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/List/ListCampaignsRequestTest.php @@ -34,7 +34,7 @@ use Domain\Models\ValueObjects\WarningThresholdQuantity; use Domain\Ports\Repositories\CampaignRequestRepository; use Shared\DDD\UseCases\Input as BaseInput; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Email; use Shared\ValueObjects\Money; use Shared\ValueObjects\Pagination\Paginated; @@ -55,7 +55,7 @@ describe('list campaigns request use case', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); $this->couponB = RequestedCoupon::hydrate( @@ -69,7 +69,7 @@ describe('list campaigns request use case', function (): void { new ProcessingCode('PC2'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); }); diff --git a/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php b/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php index 5c3abc4..5ffaa68 100644 --- a/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php +++ b/tests/Unit/Application/UseCases/CampaignRequest/Reject/RejectCampaignRequestTest.php @@ -37,7 +37,7 @@ use Domain\Models\ValueObjects\WarningThresholdQuantity; use Domain\Ports\Repositories\CampaignRequestRepository; use Shared\DDD\UseCases\Input as BaseInput; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Email; use Shared\ValueObjects\Money; @@ -60,7 +60,7 @@ describe('reject campaign request use case', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); }); diff --git a/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php b/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php index 5b86beb..caf16b5 100644 --- a/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php +++ b/tests/Unit/Domain/Models/Entities/CampaignRequestTest.php @@ -27,7 +27,7 @@ use Domain\Models\ValueObjects\ProcessingCode; use Domain\Models\ValueObjects\RequestedCoupon\RequestedCouponId; use Ramsey\Uuid\Uuid; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Email; use Shared\ValueObjects\Money; use Carbon\CarbonImmutable; @@ -54,7 +54,7 @@ describe('campaign request', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); }); diff --git a/tests/Unit/Domain/Models/Entities/CouponTest.php b/tests/Unit/Domain/Models/Entities/CouponTest.php index d98d68a..f5971fb 100644 --- a/tests/Unit/Domain/Models/Entities/CouponTest.php +++ b/tests/Unit/Domain/Models/Entities/CouponTest.php @@ -27,7 +27,7 @@ use Domain\Models\ValueObjects\PicturePath; use Domain\Models\ValueObjects\ProcessingCode; use Ramsey\Uuid\Uuid; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Money; covers(Coupon::class); diff --git a/tests/Unit/Domain/Models/Entities/RequestedCouponTest.php b/tests/Unit/Domain/Models/Entities/RequestedCouponTest.php index c365232..a06c737 100644 --- a/tests/Unit/Domain/Models/Entities/RequestedCouponTest.php +++ b/tests/Unit/Domain/Models/Entities/RequestedCouponTest.php @@ -21,7 +21,7 @@ use Domain\Models\ValueObjects\RequestedCoupon\RequestedCouponQuantity; use Domain\Models\ValueObjects\WarningThresholdQuantity; use Ramsey\Uuid\Uuid; use Shared\Enums\Currency; -use Shared\ValueObjects\DateTime; +use DateTime; use Shared\ValueObjects\Money; covers(RequestedCoupon::class); @@ -43,7 +43,7 @@ describe('requested coupon', function (): void { $processingCode = new ProcessingCode('PC1'); $couponPicture = new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')); $gs1 = new GS1('01234567890128', BarcodeFormat::EAN13); - $couponValidity = new CouponValidity(30, DateTime::now()); + $couponValidity = new CouponValidity(30, new DateTime()); // WHEN $coupon = RequestedCoupon::hydrate( @@ -92,7 +92,7 @@ describe('requested coupon', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), $updatedAt, ); @@ -116,7 +116,7 @@ describe('requested coupon', function (): void { new ProcessingCode('PC1'), new CouponPicture(new PicturePath('coupons/product.jpg'), new PicturePath('coupons/thumbnail.jpg')), new GS1('01234567890128', BarcodeFormat::EAN13), - new CouponValidity(30, DateTime::now()), + new CouponValidity(30, new DateTime()), ); // WHEN diff --git a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendarTest.php b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendarTest.php index 0ab0282..a663ef3 100644 --- a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendarTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponAvailabilityCalendarTest.php @@ -6,7 +6,7 @@ namespace Tests\Unit\Domain\Models\ValueObjects\Coupon; use Domain\Models\ValueObjects\Coupon\CouponAvailabilityCalendar; use Domain\Models\ValueObjects\Period; -use Shared\ValueObjects\DateTime; +use DateTime; covers(CouponAvailabilityCalendar::class); diff --git a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponDiffusionTest.php b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponDiffusionTest.php index 60d9196..15f0745 100644 --- a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponDiffusionTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponDiffusionTest.php @@ -6,7 +6,7 @@ namespace Tests\Unit\Domain\Models\ValueObjects\Coupon; use Domain\Models\ValueObjects\Coupon\CouponDiffusion; use Domain\Models\ValueObjects\Period; -use Shared\ValueObjects\DateTime; +use DateTime; covers(CouponDiffusion::class); diff --git a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponValidityTest.php b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponValidityTest.php index a4bb9e1..cd0db59 100644 --- a/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponValidityTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/Coupon/CouponValidityTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Tests\Unit\Domain\Models\ValueObjects; use Domain\Models\ValueObjects\Coupon\CouponValidity; -use Shared\ValueObjects\DateTime; +use DateTime; covers(CouponValidity::class); diff --git a/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/PeriodTest.php b/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/PeriodTest.php index 20ff709..0602074 100644 --- a/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/PeriodTest.php +++ b/tests/Unit/Domain/Models/ValueObjects/RequestedCoupon/PeriodTest.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace Tests\Unit\Domain\Models\ValueObjects\RequestedCoupon; use Domain\Models\ValueObjects\Period; -use Shared\ValueObjects\DateTime; +use DateTime; covers(Period::class); diff --git a/tests/Unit/Shared/ValueObjects/DateTimeTest.php b/tests/Unit/Shared/ValueObjects/DateTimeTest.php deleted file mode 100644 index d7f081c..0000000 --- a/tests/Unit/Shared/ValueObjects/DateTimeTest.php +++ /dev/null @@ -1,87 +0,0 @@ -value)->toBeInstanceOf(\DateTimeImmutable::class) - ->and($dateTime->value->getTimezone()->getName())->toBe('UTC') - ->and($dateTime->value->format('H:i:s'))->toBe('12:00:00'); - }); - - it('parses a valid date string', function (): void { - // WHEN - $dateTime = new DateTime('2026-01-15'); - - // THEN - expect($dateTime->value->format('Y-m-d'))->toBe('2026-01-15'); - }); - - it('rejects an invalid date string', function (): void { - // WHEN - $action = fn (): DateTime => new DateTime('not-a-date'); - - // THEN - expect($action)->toThrow(InvalidDateFormatException::class); - }); - - it('creates the current instant via now', function (): void { - // GIVEN - CarbonImmutable::setTestNow('2026-06-15T12:00:00Z'); - - // WHEN - $dateTime = DateTime::now(); - - // THEN - expect($dateTime)->toBeInstanceOf(DateTime::class) - ->and($dateTime->value->getTimezone()->getName())->toBe('UTC') - ->and($dateTime->value->format(\DateTimeInterface::ATOM))->toBe('2026-06-15T12:00:00+00:00'); - - // TEARDOWN - CarbonImmutable::setTestNow(); - }); - - it('implements equals correctly', function (): void { - // GIVEN - $a = new DateTime('2026-01-15T10:00:00Z'); - $b = new DateTime('2026-01-15T10:00:00Z'); - $c = new DateTime('2026-01-16T10:00:00Z'); - - // THEN - expect($a->equals($b))->toBeTrue() - ->and($a->equals($c))->toBeFalse() - ->and($a->equals(null))->toBeFalse(); - }); - - it('converts to a RFC3339 string', function (): void { - // GIVEN - $dateTime = new DateTime('2026-01-15T10:00:00Z'); - - // THEN - expect((string) $dateTime)->toBe(DatesHelper::toRfc3339($dateTime->value)); - }); - - it('serializes to json as a RFC3339 string', function (): void { - // GIVEN - $dateTime = new DateTime('2026-01-15T10:00:00Z'); - - // THEN - expect($dateTime->jsonSerialize())->toBe((string) $dateTime); - }); -});