Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public function getQueueableIds()
*/
public function getQueueableRelations()
{
return $this->isNotEmpty() ? $this->first()->getQueueableRelations() : [];
return $this->isEmpty() ? [] : array_intersect(...$this->map->getQueueableRelations()->all());
}

/**
Expand Down
18 changes: 18 additions & 0 deletions tests/Database/DatabaseEloquentCollectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,24 @@ public function testQueueableCollectionImplementationThrowsExceptionOnMultipleMo
$c->getQueueableClass();
}

public function testQueueableRelationshipsReturnsOnlyRelationsCommonToAllModels()
{
// This is needed to prevent loading non-existing relationships on polymorphic model collections (#26126)
$c = new Collection([new class {
public function getQueueableRelations()
{
return ['user'];
}
}, new class {
public function getQueueableRelations()
{
return ['user', 'comments'];
}
}]);

$this->assertEquals(['user'], $c->getQueueableRelations());
}

public function testEmptyCollectionStayEmptyOnFresh()
{
$c = new Collection;
Expand Down