rename method

laravel · Feb 21, 2018 · 4227bd7 · antonkomarev · Feb 21, 2018 · antonkomarev
1 parent 6626512
commit 4227bd7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php b/src/Illuminate/Notifications/Events/BroadcastNotificationCreated.php
@@ -64,17 +64,19 @@ public function broadcastOn()
     }
 
     /**
-     * Get the type of the broadcasted event.
+     * Get the broadcast channel name for the event.
      *
      * @return string
      */
-    public function broadcastAs()
+    protected function channelName()
     {
-        if (method_exists($this->notification, 'broadcastAs')) {
-            return $this->notification->broadcastAs();
+        if (method_exists($this->notifiable, 'receivesBroadcastNotificationsOn')) {
+            return $this->notifiable->receivesBroadcastNotificationsOn($this->notification);
         }
 
-        return get_class($this->notification);
+        $class = str_replace('\\', '.', get_class($this->notifiable));
+
+        return $class.'.'.$this->notifiable->getKey();
     }
 
     /**
@@ -86,23 +88,19 @@ public function broadcastWith()
     {
         return array_merge($this->data, [
             'id' => $this->notification->id,
-            'type' => $this->broadcastAs(),
+            'type' => $this->broadcastType(),
         ]);
     }
 
     /**
-     * Get the broadcast channel name for the event.
+     * Get the type of the notification being broadcast.
      *
      * @return string
      */
-    protected function channelName()
+    public function broadcastType()
     {
-        if (method_exists($this->notifiable, 'receivesBroadcastNotificationsOn')) {
-            return $this->notifiable->receivesBroadcastNotificationsOn($this->notification);
-        }
-
-        $class = str_replace('\\', '.', get_class($this->notifiable));
-
-        return $class.'.'.$this->notifiable->getKey();
+        return method_exists($this->notification, 'broadcastType')
+                    ? $this->notification->broadcastType()
+                    : get_class($this->notification);
     }
 }
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -52,7 +52,7 @@ public function testNotificationIsBroadcastedWithCustomEventName()
             $notifiable, $notification, $notification->toArray($notifiable)
         );
 
-        $eventName = $event->broadcastAs();
+        $eventName = $event->broadcastType();
 
         $this->assertSame('custom.type', $eventName);
     }
@@ -115,7 +115,7 @@ public function toArray($notifiable)
         return ['invoice_id' => 1];
     }
 
-    public function broadcastAs()
+    public function broadcastType()
     {
         return 'custom.type';
     }