[5.5] An easy way to route notifications on the go

src/Illuminate/Notifications/InstantNotifiable.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Illuminate\Notifications;
+
+use Illuminate\Contracts\Notifications\Dispatcher;
+
+class InstantNotifiable
+{
+    /**
+     * The array of routes a notification should be sent to.
+     *
+     * @var array
+     */
+    public $routes;
+
+    /**
+     * Send the given notification.
+     *
+     * @param  mixed  $instance
+     * @return void
+     */
+    public function notify($instance)
+    {
+        app(Dispatcher::class)->send($this, $instance);
+    }
+
+    /**
+     * Get the notification routing information for the given driver.
+     *
+     * @param  string  $driver
+     * @return mixed
+     */
+    public function routeNotificationFor($driver)
+    {
+        return $this->routes[$driver] ?? null;
+    }
+
+    /**
+     * Register the given route.
+     *
+     * @param  mixed  $route
+     * @param  string  $channel
+     * @return $this
+     */
+    public function addRoute($route, $channel)
+    {
+        $this->routes[$channel] = $route;
+
+        return $this;
+    }
+}

src/Illuminate/Notifications/NotificationSender.php

@@ -154,7 +154,7 @@ protected function queueNotification($notifiables, $notification)
                 $notification->id = $notificationId;
 
                 $this->bus->dispatch(
-                    (new SendQueuedNotifications($this->formatNotifiables($notifiable), $notification, [$channel]))
+                    (new SendQueuedNotifications($notifiable, $notification, [$channel]))
                             ->onConnection($notification->connection)
                             ->onQueue($notification->queue)
                             ->delay($notification->delay)

tests/Integration/Notifications/SendingNotificationsViaInstantNotifiableTest.php

@@ -0,0 +1,59 @@
+<?php
+
+use Orchestra\Testbench\TestCase;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\InstantNotifiable;
+use Illuminate\Support\Facades\Notification as NotificationFacade;
+
+/**
+ * @group integration
+ */
+class SendingNotificationsViaInstantNotifiableTest extends TestCase
+{
+    public $mailer;
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('app.debug', 'true');
+    }
+
+    public function test_mail_is_sent()
+    {
+        $notifiable = (new InstantNotifiable())
+            ->addRoute('enzo', 'testchannel')
+            ->addRoute('[email protected]', 'anothertestchannel');
+
+        NotificationFacade::send(
+            $notifiable,
+            new TestMailNotificationForInstantNotifiable()
+        );
+
+        $this->assertEquals([
+            'enzo', '[email protected]',
+        ], $_SERVER['__notifiable.route']);
+    }
+}
+
+class TestMailNotificationForInstantNotifiable extends Notification
+{
+    public function via($notifiable)
+    {
+        return [TestCustomChannel::class, AnotherTestCustomChannel::class];
+    }
+}
+
+class TestCustomChannel
+{
+    public function send($notifiable, $notification)
+    {
+        $_SERVER['__notifiable.route'][] = $notifiable->routeNotificationFor('testchannel');
+    }
+}
+
+class AnotherTestCustomChannel
+{
+    public function send($notifiable, $notification)
+    {
+        $_SERVER['__notifiable.route'][] = $notifiable->routeNotificationFor('anothertestchannel');
+    }
+}