Merge pull request #32613 from laravel/issue-26126

[6.x] Only restore common relations
laravel · Apr 30, 2020 · dcaf8a8 · dcaf8a8
2 parents 62aea7e + c613a18
commit dcaf8a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/src/Illuminate/Database/Eloquent/Collection.php
@@ -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());
     }
 
     /**

diff --git a/tests/Database/DatabaseEloquentCollectionTest.php b/tests/Database/DatabaseEloquentCollectionTest.php
@@ -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;