[Revert] Database channel should store custom type too

laravel · Feb 21, 2018 · dadfb95 · dadfb95
1 parent 0e4b174
commit dadfb95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 45 deletions.
diff --git a/src/Illuminate/Notifications/Channels/DatabaseChannel.php b/src/Illuminate/Notifications/Channels/DatabaseChannel.php
@@ -2,8 +2,8 @@
 
 namespace Illuminate\Notifications\Channels;
 
-use RuntimeException;
 use Illuminate\Notifications\Notification;
+use RuntimeException;
 
 class DatabaseChannel
 {
@@ -18,7 +18,7 @@ public function send($notifiable, Notification $notification)
     {
         return $notifiable->routeNotificationFor('database', $notification)->create([
             'id' => $notification->id,
-            'type' => $notification->broadcastAs(),
+            'type' => get_class($notification),
             'data' => $this->getData($notifiable, $notification),
             'read_at' => null,
         ]);

diff --git a/src/Illuminate/Notifications/Notification.php b/src/Illuminate/Notifications/Notification.php
@@ -15,16 +15,6 @@ class Notification
      */
     public $id;
 
-    /**
-     * Get the type of the broadcasted event.
-     *
-     * @return string
-     */
-    public function broadcastAs()
-    {
-        return get_class($this);
-    }
-
     /**
      * Get the channels the event should broadcast on.
      *

diff --git a/tests/Notifications/NotificationDatabaseChannelTest.php b/tests/Notifications/NotificationDatabaseChannelTest.php
@@ -2,11 +2,11 @@
 
 namespace Illuminate\Tests\Notifications;
 
-use Mockery;
-use PHPUnit\Framework\TestCase;
-use Illuminate\Notifications\Notification;
 use Illuminate\Notifications\Channels\DatabaseChannel;
 use Illuminate\Notifications\Messages\DatabaseMessage;
+use Illuminate\Notifications\Notification;
+use Mockery;
+use PHPUnit\Framework\TestCase;
 
 class NotificationDatabaseChannelTest extends TestCase
 {
@@ -31,23 +31,6 @@ public function testDatabaseChannelCreatesDatabaseRecordWithProperData()
         $channel = new DatabaseChannel;
         $channel->send($notifiable, $notification);
     }
-
-    public function testDatabaseChannelCreatesDatabaseRecordWithCustomType()
-    {
-        $notification = new NotificationDatabaseChannelWithCustomTypeTestNotification;
-        $notification->id = 1;
-        $notifiable = Mockery::mock();
-
-        $notifiable->shouldReceive('routeNotificationFor->create')->with([
-            'id' => 1,
-            'type' => $notification->broadcastAs(),
-            'data' => ['invoice_id' => 1],
-            'read_at' => null,
-        ]);
-
-        $channel = new DatabaseChannel;
-        $channel->send($notifiable, $notification);
-    }
 }
 
 class NotificationDatabaseChannelTestNotification extends Notification
@@ -57,16 +40,3 @@ public function toDatabase($notifiable)
         return new DatabaseMessage(['invoice_id' => 1]);
     }
 }
-
-class NotificationDatabaseChannelWithCustomTypeTestNotification extends Notification
-{
-    public function toDatabase($notifiable)
-    {
-        return new DatabaseMessage(['invoice_id' => 1]);
-    }
-
-    public function broadcastAs()
-    {
-        return 'custom.type';
-    }
-}