Aligning DateTimeImmutable usages to vimeo/psalm:^4.27.0

See vimeo/psalm#8350
Ocramius · Sep 2, 2022 · 0cfdf82 · 0cfdf82
1 parent 8ac3c9b
commit 0cfdf82
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/src/Payment/Domain/Aggregate/Payment.php b/src/Payment/Domain/Aggregate/Payment.php
@@ -49,12 +49,16 @@ public static function requestPayment(
     ): AggregateChanged {
         $id = PaymentId::generate();
 
+        // We hardcode the deadline, for now: good enough for us
+        $deadline = $time->modify('+5 day');
+
+        assert($deadline !== false);
+
         return AggregateChanged::created(
             PaymentId::generate(),
             [
                 new PaymentRequested($id, $debtor, $amount, $time),
-                // We hardcode the deadline, for now: good enough for us
-                new PaymentDeadlineSet($id, $time->modify('+5 day'), $time),
+                new PaymentDeadlineSet($id, $deadline, $time),
             ],
         );
     }

diff --git a/src/TimeTracking/Domain/Date.php b/src/TimeTracking/Domain/Date.php
@@ -7,7 +7,6 @@
 use DateTimeImmutable;
 use Psl\Exception\InvariantViolationException;
 
-use function assert;
 use function Psl\invariant;
 
 /** @psalm-immutable */
@@ -36,11 +35,6 @@ public function __construct(string $date)
     /** @return non-empty-string */
     public function toString(): string
     {
-        $date = $this->date->format('Y-m-d');
-
-        // Until https://github.com/vimeo/psalm/pull/8350 released, `DateTimeImmutable#format()` produces `string`
-        assert($date !== '');
-
-        return $date;
+        return $this->date->format('Y-m-d');
     }
 }
diff --git a/test/Payment/Unit/Domain/Aggregate/PaymentTest.php b/test/Payment/Unit/Domain/Aggregate/PaymentTest.php
@@ -15,6 +15,7 @@
 use PHPUnit\Framework\TestCase;
 
 use function array_map;
+use function assert;
 use function get_class;
 
 /** @covers \EventSourcingWorkshop\Payment\Domain\Aggregate\Payment */
@@ -41,7 +42,11 @@ public function testWillAllowRequestingAPayment(): void
 
     public function testWillAllowMarkingAPaymentAsPaid(): void
     {
-        $id      = PaymentId::generate();
+        $deadline = (new DateTimeImmutable())->modify('+50 day');
+        $id       = PaymentId::generate();
+
+        assert($deadline !== false);
+
         $payment = Payment::fromHistory(
             $id,
             [
@@ -53,7 +58,7 @@ public function testWillAllowMarkingAPaymentAsPaid(): void
                 ),
                 new PaymentDeadlineSet(
                     $id,
-                    (new DateTimeImmutable())->modify('+50 day'),
+                    $deadline,
                     new DateTimeImmutable(),
                 ),
             ],

diff --git a/...Payment/Unit/Infrastructure/CommandHandler/HandleSendNotificationsForLatePaymentsTest.php b/...Payment/Unit/Infrastructure/CommandHandler/HandleSendNotificationsForLatePaymentsTest.php
@@ -11,6 +11,8 @@
 use EventSourcingWorkshopTest\EventSourcing\Integration\Support\EventSourcingTestHelper;
 use PHPUnit\Framework\TestCase;
 
+use function assert;
+
 /** @covers \EventSourcingWorkshop\Payment\Infrastructure\CommandHandler\HandleSendNotificationsForLatePayments */
 final class HandleSendNotificationsForLatePaymentsTest extends TestCase
 {
@@ -25,6 +27,9 @@ public function testWillFindLatePaymentsToProcess(): void
         $lateButNoDebtor = PaymentId::generate();
         $db              = EventSourcingTestHelper::freshDatabase();
 
+        assert($notLateDate !== false);
+        assert($lateDate !== false);
+
         $db->executeStatement(<<<'SQL'
 CREATE TABLE projection_pending_payments (
     payment VARCHAR(1024) PRIMARY KEY NOT NULL,