Add type parameter

staudenmeir · Jun 21, 2019 · 0a0ed56 · 0a0ed56
1 parent 599b81e
commit 0a0ed56
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -212,6 +212,12 @@ public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boole
 
                     $belongsTo->getQuery()->mergeConstraintsFrom($relation->getQuery());
 
+                    if ($callback) {
+                        $callback = function ($query) use ($callback, $type) {
+                            return $callback($query, $type);
+                        };
+                    }
+
                     $query->where($relation->getMorphType(), '=', $type)
                         ->whereHas($belongsTo, $callback, $operator, $count);
                 });

diff --git a/tests/Integration/Database/EloquentWhereHasMorphTest.php b/tests/Integration/Database/EloquentWhereHasMorphTest.php
@@ -91,7 +91,7 @@ public function testWhereHasMorphWithMorphMap()
         }
     }
 
-    public function testWhereHasMorphWithConstraint()
+    public function testWhereHasMorphWithRelationConstraint()
     {
         $comments = Comment::whereHasMorph('commentableWithConstraint', Video::class, function (Builder $query) {
             $query->where('title', 'like', 'ba%');
@@ -100,6 +100,21 @@ public function testWhereHasMorphWithConstraint()
         $this->assertEquals([5], $comments->pluck('id')->all());
     }
 
+    public function testWhereHasMorphWitDifferentConstraints()
+    {
+        $comments = Comment::whereHasMorph('commentable', [Post::class, Video::class], function (Builder $query, $type) {
+            if ($type === Post::class) {
+                $query->where('title', 'foo');
+            }
+
+            if ($type === Video::class) {
+                $query->where('title', 'bar');
+            }
+        })->get();
+
+        $this->assertEquals([1, 5], $comments->pluck('id')->all());
+    }
+
     public function testWhereHasMorphWithOwnerKey()
     {
         Schema::table('posts', function (Blueprint $table) {