From 0d1bfda750dab9052768e6b6c1acd9beb34b4315 Mon Sep 17 00:00:00 2001 From: Lucas Girardot Date: Tue, 24 Dec 2019 16:06:00 +0100 Subject: [PATCH] =?UTF-8?q?fix=20d=C3=A9tection=20soft=20deletes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eloquent/JoinRelBuilder.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Eloquent/JoinRelBuilder.php b/src/Eloquent/JoinRelBuilder.php index c24b436..5be2c51 100644 --- a/src/Eloquent/JoinRelBuilder.php +++ b/src/Eloquent/JoinRelBuilder.php @@ -12,11 +12,6 @@ class JoinRelBuilder { - /** - * Nom du trait utilisé par le modèle pour gérer les soft deletes. - */ - const SOFT_DELETES_TRAIT = 'Illuminate\Database\Eloquent\SoftDeletes'; - /** * Instance du modèle. * @@ -148,7 +143,7 @@ protected function buildCondition(Relation $relation, $callback, $withTrashed) $join->where($morphType, '=', $relation->getMorphClass()); } - if (!$withTrashed && in_array(static::SOFT_DELETES_TRAIT, class_uses($relation->getRelated()))) { + if (!$withTrashed && method_exists($relation->getRelated(), 'getQualifiedDeletedAtColumn')) { $join->whereNull($relation->getRelated()->getQualifiedDeletedAtColumn()); }