Skip to content

Ignore empty event type as per EventSource specs #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonFrings merged 1 commit into from
Apr 13, 2022
Merged

Ignore empty event type as per EventSource specs #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/MessageEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ public static function parse($data, $lastEventId)

foreach ($lines as $line) {
$name = strstr($line, ':', true);
$value = substr(strstr($line, ':'), 1);
$value = (string) substr(strstr($line, ':'), 1);
if (isset($value[0]) && $value[0] === ' ') {
$value = substr($value, 1);
$value = (string) substr($value, 1);
}
if ($name === 'data') {
$data .= $value . "\n";
} elseif ($name === 'id') {
$id = $value;
} elseif ($name === 'event') {
} elseif ($name === 'event' && $value !== '') {
$type = $value;
} elseif ($name === 'retry' && $value === (string)(int)$value && $value >= 0) {
$retry = (int)$value;
Expand Down
32 changes: 32 additions & 0 deletions tests/MessageEventTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,38 @@ public function testParseWithMultipleIdsReturnsMessageWithLastEventIdFromStream(
$this->assertEquals('2', $message->lastEventId);
}

public function testParseReturnsMessageWithTypeFromStream()
{
$message = MessageEvent::parse("data: hello\r\nevent: join", '');

$this->assertEquals("hello", $message->data);
$this->assertEquals('join', $message->type);
}

public function testParseWithoutEventReturnsMessageWithDefaultMessageType()
{
$message = MessageEvent::parse("data: hello", '');

$this->assertEquals("hello", $message->data);
$this->assertEquals('message', $message->type);
}

public function testParseWithMultipleEventsReturnsMessageWithLastTypeFromStream()
{
$message = MessageEvent::parse("data: hello\nevent: join\nevent: leave", '');

$this->assertEquals("hello", $message->data);
$this->assertEquals('leave', $message->type);
}

public function testParseWithEmptyEventReturnsMessageWithDefaultMessageType()
{
$message = MessageEvent::parse("data: hello\r\nevent:", '');

$this->assertEquals("hello", $message->data);
$this->assertEquals('message', $message->type);
}

public function retryTimeDataProvider()
{
return [
Expand Down