Skip to content

[5.6] Fix that you can't give a custom channel to notifications #24223

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

Closed
wants to merge 4 commits into from
Closed

[5.6] Fix that you can't give a custom channel to notifications #24223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0aac61d
Revert broken functionality
DrowningElysium May 15, 2018
09cf36f
Fix tests
DrowningElysium May 15, 2018
85d517d
Change missed function call
DrowningElysium May 15, 2018
17615d3
Another missed one
DrowningElysium May 15, 2018
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
8 changes: 4 additions & 4 deletions src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function broadcastWith()
{
return array_merge($this->data, [
'id' => $this->notification->id,
'type' => $this->broadcastType(),
'type' => $this->broadcastAs(),
]);
}

Expand All @@ -97,10 +97,10 @@ public function broadcastWith()
*
* @return string
*/
public function broadcastType()
public function broadcastAs()
{
return method_exists($this->notification, 'broadcastType')
? $this->notification->broadcastType()
return method_exists($this->notification, 'broadcastAs')
? $this->notification->broadcastAs()
: get_class($this->notification);
}
}
4 changes: 2 additions & 2 deletions tests/Notifications/NotificationBroadcastChannelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function testNotificationIsBroadcastedWithCustomEventName()
$notifiable, $notification, $notification->toArray($notifiable)
);

$eventName = $event->broadcastType();
$eventName = $event->broadcastAs();

$this->assertSame('custom.type', $eventName);
}
Expand Down Expand Up @@ -115,7 +115,7 @@ public function toArray($notifiable)
return ['invoice_id' => 1];
}

public function broadcastType()
public function broadcastAs()
{
return 'custom.type';
}
Expand Down