Fix MorphTo lazy loading and withoutGlobalScopes() (#25406)

laravel · Sep 2, 2018 · ec81088 · ec81088
1 parent e095619
commit ec81088
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Relations/MorphTo.php b/src/Illuminate/Database/Eloquent/Relations/MorphTo.php
@@ -231,6 +231,8 @@ public function dissociate()
      */
     public function withoutGlobalScopes(array $scopes = null)
     {
+        $this->getQuery()->withoutGlobalScopes($scopes);
+
         $this->macroBuffer[] = [
             'method' => __FUNCTION__,
             'parameters' => [$scopes],

diff --git a/tests/Integration/Database/EloquentMorphToGlobalScopesTest.php b/tests/Integration/Database/EloquentMorphToGlobalScopesTest.php
@@ -63,6 +63,14 @@ public function test_without_global_scopes()
         $this->assertNotNull($comments[0]->commentable);
         $this->assertNotNull($comments[1]->commentable);
     }
+
+    public function test_lazy_loading()
+    {
+        $comment = Comment::latest('id')->first();
+        $post = $comment->commentable()->withoutGlobalScopes()->first();
+
+        $this->assertNotNull($post);
+    }
 }
 
 class Comment extends Model