Merge pull request #81 from Roywcm/master

Update SoftDelete trait name
GetStream · Jan 22, 2020 · d81ea09 · d81ea09
2 parents 2756a00 + aefd2f2
commit d81ea09
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/GetStream/StreamLaravel/Enrich.php b/src/GetStream/StreamLaravel/Enrich.php
@@ -20,7 +20,12 @@ public function fromDb($model, $ids, $with = [])
         $results = [];
         $pkName = (new $model())->getKeyName();
         $query = $model::with($with)->whereIn($pkName, $ids);
-        if (in_array('Illuminate\Database\Eloquent\SoftDeletingTrait', class_uses(get_class($model))) && $this->withTrashed) // previous withTrash method deprecated in Laravel 4.2
+        $softDeleteTraits = [
+            'Illuminate\Database\Eloquent\SoftDeletes',
+            'Illuminate\Database\Eloquent\SoftDeletingTrait'
+        ];
+
+        if ((bool)array_intersect($softDeleteTraits, class_uses(get_class($model))) && $this->withTrashed) // previous withTrash method deprecated in Laravel 4.2
             $query = $query->withTrashed();
         $objects = $query->get();
         foreach ($objects as $object) {