Merge branch '8.x'

# Conflicts:
#	CHANGELOG-8.x.md
#	composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Routing/UrlGenerator.php
#	tests/Integration/Routing/UrlSigningTest.php

Author: driesvints

composer.json

@@ -89,7 +89,7 @@
         "orchestra/testbench-core": "^7.0",
         "pda/pheanstalk": "^4.0",
         "phpunit/phpunit": "^9.4",
-        "predis/predis": "^1.1.1",
+        "predis/predis": "^1.1.2",
         "symfony/cache": "^5.3"
     },
     "provide": {

src/Illuminate/Auth/Authenticatable.php

@@ -31,6 +31,16 @@ public function getAuthIdentifier()
         return $this->{$this->getAuthIdentifierName()};
     }
 
+    /**
+     * Get the unique broadcast identifier for the user.
+     *
+     * @return mixed
+     */
+    public function getAuthIdentifierForBroadcasting()
+    {
+        return $this->getAuthIdentifier();
+    }
+
     /**
      * Get the password for the user.
      *

src/Illuminate/Broadcasting/BroadcastEvent.php

@@ -60,8 +60,14 @@ public function handle(Broadcaster $broadcaster)
         $name = method_exists($this->event, 'broadcastAs')
                 ? $this->event->broadcastAs() : get_class($this->event);
 
+        $channels = Arr::wrap($this->event->broadcastOn());
+
+        if (empty($channels)) {
+            return;
+        }
+
         $broadcaster->broadcast(
-            Arr::wrap($this->event->broadcastOn()), $name,
+            $channels, $name,
             $this->getPayloadFromEvent($this->event)
         );
     }

src/Illuminate/Broadcasting/Broadcasters/AblyBroadcaster.php

@@ -72,11 +72,17 @@ public function validAuthenticationResponse($request, $result)
 
         $channelName = $this->normalizeChannelName($request->channel_name);
 
+        $user = $this->retrieveUser($request, $channelName);
+
+        $broadcastIdentifier = method_exists($user, 'getAuthIdentifierForBroadcasting')
+                    ? $user->getAuthIdentifierForBroadcasting()
+                    : $user->getAuthIdentifier();
+
         $signature = $this->generateAblySignature(
             $request->channel_name,
             $request->socket_id,
             $userData = array_filter([
-                'user_id' => (string) $this->retrieveUser($request, $channelName)->getAuthIdentifier(),
+                'user_id' => (string) $broadcastIdentifier,
                 'user_info' => $result,
             ])
         );

src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php

@@ -5,6 +5,7 @@
 use Exception;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Broadcasting\Broadcaster as BroadcasterContract;
+use Illuminate\Contracts\Broadcasting\HasBroadcastChannel;
 use Illuminate\Contracts\Routing\BindingRegistrar;
 use Illuminate\Contracts\Routing\UrlRoutable;
 use Illuminate\Support\Arr;
@@ -40,13 +41,19 @@ abstract class Broadcaster implements BroadcasterContract
     /**
      * Register a channel authenticator.
      *
-     * @param  string  $channel
+     * @param  \Illuminate\Contracts\Broadcasting\HasBroadcastChannel|string  $channel
      * @param  callable|string  $callback
      * @param  array  $options
      * @return $this
      */
     public function channel($channel, $callback, $options = [])
     {
+        if ($channel instanceof HasBroadcastChannel) {
+            $channel = $channel->broadcastChannelRoute();
+        } elseif (is_string($channel) && class_exists($channel) && is_a($channel, HasBroadcastChannel::class, true)) {
+            $channel = (new $channel)->broadcastChannelRoute();
+        }
+
         $this->channels[$channel] = $callback;
 
         $this->channelOptions[$channel] = $options;

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

@@ -71,11 +71,17 @@ public function validAuthenticationResponse($request, $result)
 
         $channelName = $this->normalizeChannelName($request->channel_name);
 
+        $user = $this->retrieveUser($request, $channelName);
+
+        $broadcastIdentifier = method_exists($user, 'getAuthIdentifierForBroadcasting')
+                        ? $user->getAuthIdentifierForBroadcasting()
+                        : $user->getAuthIdentifier();
+
         return $this->decodePusherResponse(
             $request,
             $this->pusher->presence_auth(
                 $request->channel_name, $request->socket_id,
-                $this->retrieveUser($request, $channelName)->getAuthIdentifier(), $result
+                $broadcastIdentifier, $result
             )
         );
     }
@@ -137,7 +143,7 @@ public function getPusher()
     /**
      * Set the Pusher SDK instance.
      *
-     * @param \Pusher\Pusher $pusher
+     * @param  \Pusher\Pusher  $pusher
      * @return void
      */
     public function setPusher($pusher)

src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php

@@ -86,8 +86,14 @@ public function validAuthenticationResponse($request, $result)
 
         $channelName = $this->normalizeChannelName($request->channel_name);
 
+        $user = $this->retrieveUser($request, $channelName);
+
+        $broadcastIdentifier = method_exists($user, 'getAuthIdentifierForBroadcasting')
+                        ? $user->getAuthIdentifierForBroadcasting()
+                        : $user->getAuthIdentifier();
+
         return json_encode(['channel_data' => [
-            'user_id' => $this->retrieveUser($request, $channelName)->getAuthIdentifier(),
+            'user_id' => $broadcastIdentifier,
             'user_info' => $result,
         ]]);
     }

src/Illuminate/Broadcasting/Channel.php

@@ -2,6 +2,8 @@
 
 namespace Illuminate\Broadcasting;
 
+use Illuminate\Contracts\Broadcasting\HasBroadcastChannel;
+
 class Channel
 {
     /**
@@ -14,12 +16,12 @@ class Channel
     /**
      * Create a new channel instance.
      *
-     * @param  string  $name
+     * @param  \Illuminate\Contracts\Broadcasting\HasBroadcastChannel|string  $name
      * @return void
      */
     public function __construct($name)
     {
-        $this->name = $name;
+        $this->name = $name instanceof HasBroadcastChannel ? $name->broadcastChannel() : $name;
     }
 
     /**

src/Illuminate/Broadcasting/PrivateChannel.php

@@ -2,16 +2,20 @@
 
 namespace Illuminate\Broadcasting;
 
+use Illuminate\Contracts\Broadcasting\HasBroadcastChannel;
+
 class PrivateChannel extends Channel
 {
     /**
      * Create a new channel instance.
      *
-     * @param  string  $name
+     * @param  \Illuminate\Contracts\Broadcasting\HasBroadcastChannel|string  $name
      * @return void
      */
     public function __construct($name)
     {
+        $name = $name instanceof HasBroadcastChannel ? $name->broadcastChannel() : $name;
+
         parent::__construct('private-'.$name);
     }
 }

src/Illuminate/Bus/Dispatcher.php

@@ -209,6 +209,8 @@ protected function commandShouldBeQueued($command)
      *
      * @param  mixed  $command
      * @return mixed
+     *
+     * @throws \RuntimeException
      */
     public function dispatchToQueue($command)
     {