Support wildcard and morph map

laravel · Jun 25, 2019 · c676fc0 · c676fc0
1 parent 0b88202
commit c676fc0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -202,7 +202,11 @@ public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boole
         $types = (array) $types;
 
         if ($types === ['*']) {
-            $types = $this->model->newModelQuery()->distinct()->pluck($relation->getMorphType());
+            $types = $this->model->newModelQuery()->distinct()->pluck($relation->getMorphType())->all();
+
+            foreach ($types as &$type) {
+                $type = Relation::getMorphedModel($type) ?? $type;
+            }
         }
 
         return $this->where(function ($query) use ($relation, $callback, $operator, $count, $types) {

diff --git a/tests/Integration/Database/EloquentWhereHasMorphTest.php b/tests/Integration/Database/EloquentWhereHasMorphTest.php
@@ -61,6 +61,23 @@ public function testWhereHasMorph()
         $this->assertEquals([1, 4], $comments->pluck('id')->all());
     }
 
+    public function testWhereHasMorphWithMorphMap()
+    {
+        Relation::morphMap(['posts' => Post::class]);
+
+        Comment::where('commentable_type', Post::class)->update(['commentable_type' => 'posts']);
+
+        try {
+            $comments = Comment::whereHasMorph('commentable', [Post::class, Video::class], function (Builder $query) {
+                $query->where('title', 'foo');
+            })->get();
+
+            $this->assertEquals([1, 4], $comments->pluck('id')->all());
+        } finally {
+            Relation::morphMap([], false);
+        }
+    }
+
     public function testWhereHasMorphWithWildcard()
     {
         // Test newModelQuery() without global scopes.
@@ -74,6 +91,23 @@ public function testWhereHasMorphWithWildcard()
         $this->assertEquals([1, 4], $comments->pluck('id')->all());
     }
 
+    public function testWhereHasMorphWithWildcardAndMorphMap()
+    {
+        Relation::morphMap(['posts' => Post::class]);
+
+        Comment::where('commentable_type', Post::class)->update(['commentable_type' => 'posts']);
+
+        try {
+            $comments = Comment::whereHasMorph('commentable', '*', function (Builder $query) {
+                $query->where('title', 'foo');
+            })->get();
+
+            $this->assertEquals([4, 1], $comments->pluck('id')->all());
+        } finally {
+            Relation::morphMap([], false);
+        }
+    }
+
     public function testWhereHasMorphWithRelationConstraint()
     {
         $comments = Comment::whereHasMorph('commentableWithConstraint', Video::class, function (Builder $query) {