diff --git a/src/Illuminate/Broadcasting/BroadcastEvent.php b/src/Illuminate/Broadcasting/BroadcastEvent.php index 77b864e0b6d9..2ef568dc6bb0 100644 --- a/src/Illuminate/Broadcasting/BroadcastEvent.php +++ b/src/Illuminate/Broadcasting/BroadcastEvent.php @@ -141,13 +141,13 @@ protected function formatProperty($value) * Get the channels for the given connection. * * @param array $channels - * @param string $connection + * @param string|null $connection * @return array */ protected function getConnectionChannels($channels, $connection) { - return is_array($channels[$connection] ?? null) - ? $channels[$connection] + return is_array($channels[$connection ?? ''] ?? null) + ? $channels[$connection ?? ''] : $channels; } @@ -155,13 +155,13 @@ protected function getConnectionChannels($channels, $connection) * Get the payload for the given connection. * * @param array $payload - * @param string $connection + * @param string|null $connection * @return array */ protected function getConnectionPayload($payload, $connection) { - $connectionPayload = is_array($payload[$connection] ?? null) - ? $payload[$connection] + $connectionPayload = is_array($payload[$connection ?? ''] ?? null) + ? $payload[$connection ?? ''] : $payload; if (isset($payload['socket'])) { diff --git a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php index 908dc1eef1d9..24c61f63c036 100755 --- a/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php +++ b/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php @@ -168,8 +168,8 @@ public function match(array $models, EloquentCollection $results, $relation) foreach ($models as $model) { $attribute = $this->getDictionaryKey($this->getForeignKeyFrom($model)); - if (isset($dictionary[$attribute])) { - $model->setRelation($relation, $dictionary[$attribute]); + if (isset($dictionary[$attribute ?? ''])) { + $model->setRelation($relation, $dictionary[$attribute ?? '']); } } diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php index 875a9c7f409d..b89fddd044e5 100644 --- a/src/Illuminate/Queue/Worker.php +++ b/src/Illuminate/Queue/Worker.php @@ -32,7 +32,7 @@ class Worker /** * The name of the worker. * - * @var string + * @var string|null */ protected $name; @@ -363,8 +363,8 @@ protected function getNextJob($connection, $queue) $this->raiseBeforeJobPopEvent($connection->getConnectionName()); try { - if (isset(static::$popCallbacks[$this->name])) { - if (! is_null($job = (static::$popCallbacks[$this->name])($popJobCallback, $queue))) { + if (isset(static::$popCallbacks[$this->name ?? ''])) { + if (! is_null($job = (static::$popCallbacks[$this->name ?? ''])($popJobCallback, $queue))) { $this->raiseAfterJobPopEvent($connection->getConnectionName(), $job); }