Skip to content

Commit 3ed98fb

Browse files
committed
Fix message status (enum)
1 parent 5b7835d commit 3ed98fb

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

src/Messaging/Serializer/MessageNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function normalize($object, string $format = null, array $context = []):
3939
'format_options' => $object->getFormat()->getFormatOptions()
4040
],
4141
'message_metadata' => [
42-
'status' => $object->getMetadata()->getStatus(),
42+
'status' => $object->getMetadata()->getStatus()->value,
4343
'processed' => $object->getMetadata()->isProcessed(),
4444
'views' => $object->getMetadata()->getViews(),
4545
'bounce_count' => $object->getMetadata()->getBounceCount(),

tests/Integration/Messaging/Fixtures/MessageFixture.php

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,43 +59,43 @@ public function load(ObjectManager $manager): void
5959
);
6060

6161
$schedule = new MessageSchedule(
62-
(int)$row['repeatinterval'],
63-
new DateTime($row['repeatuntil']),
64-
(int)$row['requeueinterval'],
65-
new DateTime($row['requeueuntil']),
66-
new DateTime($row['embargo']),
62+
repeatInterval: (int)$row['repeatinterval'],
63+
repeatUntil: new DateTime($row['repeatuntil']),
64+
requeueInterval: (int)$row['requeueinterval'],
65+
requeueUntil: new DateTime($row['requeueuntil']),
66+
embargo: new DateTime($row['embargo']),
6767
);
6868
$metadata = new MessageMetadata(
69-
$row['status'],
70-
(int)$row['bouncecount'],
71-
new DateTime($row['entered']),
72-
new DateTime($row['sent']),
73-
new DateTime($row['sendstart']),
69+
status: Message\MessageStatus::from($row['status']),
70+
bounceCount: (int)$row['bouncecount'],
71+
entered: new DateTime($row['entered']),
72+
sent: new DateTime($row['sent']),
73+
sendStart: new DateTime($row['sendstart']),
7474
);
7575
$metadata->setProcessed((bool) $row['processed']);
7676
$metadata->setViews((int)$row['viewed']);
7777
$content = new MessageContent(
78-
$row['subject'],
79-
$row['message'],
80-
$row['textmessage'],
81-
$row['footer']
78+
subject: $row['subject'],
79+
text: $row['message'],
80+
textMessage: $row['textmessage'],
81+
footer: $row['footer']
8282
);
8383
$options = new MessageOptions(
84-
$row['fromfield'],
85-
$row['tofield'],
86-
$row['replyto'],
87-
$row['userselection'],
88-
$row['rsstemplate'],
84+
fromField: $row['fromfield'],
85+
toField: $row['tofield'],
86+
replyTo: $row['replyto'],
87+
userSelection: $row['userselection'],
88+
rssTemplate: $row['rsstemplate'],
8989
);
9090

9191
$message = new Message(
92-
$format,
93-
$schedule,
94-
$metadata,
95-
$content,
96-
$options,
97-
$admin,
98-
$template,
92+
format: $format,
93+
schedule: $schedule,
94+
metadata: $metadata,
95+
content: $content,
96+
options: $options,
97+
owner: $admin,
98+
template: $template,
9999
);
100100
$this->setSubjectId($message, (int)$row['id']);
101101
$this->setSubjectProperty($message, 'uuid', $row['uuid']);

tests/Unit/Messaging/Serializer/MessageNormalizerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testNormalizeReturnsExpectedArray(): void
4646
$entered = new DateTime('2025-01-01T10:00:00+00:00');
4747
$sent = new DateTime('2025-01-02T10:00:00+00:00');
4848

49-
$metadata = new Message\MessageMetadata('draft');
49+
$metadata = new Message\MessageMetadata( Message\MessageStatus::Draft);
5050
$metadata->setProcessed(true);
5151
$metadata->setViews(10);
5252
$metadata->setBounceCount(3);
@@ -80,7 +80,7 @@ public function testNormalizeReturnsExpectedArray(): void
8080
$this->assertSame('Test Template', $result['template']['title']);
8181
$this->assertSame('Subject', $result['message_content']['subject']);
8282
$this->assertSame(['text', 'html'], $result['message_format']['format_options']);
83-
$this->assertSame('draft', $result['message_metadata']['status']);
83+
$this->assertSame( Message\MessageStatus::Draft->value, $result['message_metadata']['status']);
8484
$this->assertSame('[email protected]', $result['message_options']['from_field']);
8585
}
8686

0 commit comments

Comments
 (0)