[5.2] Apply constraints to a morphTo relation on eager load

src/Illuminate/Database/Eloquent/Relations/MorphTo.php

@@ -29,13 +29,6 @@ class MorphTo extends BelongsTo
      */
     protected $dictionary = [];
 
-    /*
-     * Indicates if soft-deleted model instances should be fetched.
-     *
-     * @var bool
-     */
-    protected $withTrashed = false;
-
     /**
      * Create a new morph to relationship instance.
      *
@@ -186,6 +179,11 @@ protected function getResultsByType($type)
 
         $query = $this->useWithTrashed($query);
 
+        $query = $query->withoutGlobalScopes($this->query->removedScopes());
+        foreach ($this->query->getQuery()->getRawBindings() as $bindingType => $bindings) {
+            $query->setBindings($bindings, $bindingType);
+        }
+
         return $query->whereIn($key, $this->gatherKeysByType($type)->all())->get();
     }
 
@@ -238,32 +236,4 @@ public function getDictionary()
         return $this->dictionary;
     }
 
-    /**
-     * Fetch soft-deleted model instances with query.
-     *
-     * @return $this
-     */
-    public function withTrashed()
-    {
-        $this->withTrashed = true;
-
-        $this->query = $this->useWithTrashed($this->query);
-
-        return $this;
-    }
-
-    /**
-     * Return trashed models with query if told so.
-     *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    protected function useWithTrashed(Builder $query)
-    {
-        if ($this->withTrashed && $query->getMacro('withTrashed') !== null) {
-            return $query->withTrashed();
-        }
-
-        return $query;
-    }
 }

tests/Database/DatabaseEloquentMorphToTest.php

@@ -62,6 +62,11 @@ public function testModelsAreProperlyPulledAndMatched()
         $secondQuery->shouldReceive('getTable')->andReturn('foreign_table_2');
         $secondQuery->shouldReceive('getKeyName')->andReturn('id');
 
+        $firstQuery->shouldReceive('withoutGlobalScopes')->with([])->andReturn($firstQuery);
+        $firstQuery->shouldReceive('setBindings')->andReturnNull();
+        $secondQuery->shouldReceive('withoutGlobalScopes')->with([])->andReturn($secondQuery);
+        $secondQuery->shouldReceive('setBindings')->andReturnNull();
+
         $firstQuery->shouldReceive('newQuery')->once()->andReturn($firstQuery);
         $secondQuery->shouldReceive('newQuery')->once()->andReturn($secondQuery);
 
@@ -139,6 +144,17 @@ protected function getRelationAssociate($parent)
     public function getRelation($parent = null, $builder = null)
     {
         $builder = $builder ?: m::mock('Illuminate\Database\Eloquent\Builder');
+        $builder->shouldReceive('getQuery')->andReturn($builder);
+        $builder->shouldReceive('removedScopes')->andReturn([]);
+        $builder->shouldReceive('withoutGlobalScopes')->with([])->andReturn($builder);
+        $builder->shouldReceive('getRawBindings')->andReturn([
+            'select' => [],
+            'join'   => [],
+            'where'  => [],
+            'having' => [],
+            'order'  => [],
+            'union'  => [],
+        ]);
         $builder->shouldReceive('where')->with('relation.id', '=', 'foreign.value');
         $related = m::mock('Illuminate\Database\Eloquent\Model');
         $related->shouldReceive('getKeyName')->andReturn('id');