Merge branch '3.0'

laravel · Dec 7, 2017 · 11d19af · 11d19af
2 parents 4c1a203 + 0d97152
commit 11d19af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Searchable.php b/src/Searchable.php
@@ -104,7 +104,13 @@ public static function makeAllSearchable()
     {
         $self = new static();
 
+        $softDeletes = in_array(SoftDeletes::class, class_uses_recursive(get_called_class())) &&
+                       config('scout.soft_delete', false);
+
         $self->newQuery()
+            ->when($softDeletes, function ($query) {
+                $query->withTrashed();
+            })
             ->orderBy($self->getKeyName())
             ->searchable();
     }

diff --git a/tests/SearchableTest.php b/tests/SearchableTest.php
@@ -65,6 +65,8 @@ public function newQuery()
             ->andReturnSelf()
             ->shouldReceive('searchable');
 
+        $mock->shouldReceive('when')->andReturnSelf();
+
         return $mock;
     }
 }