Skip to content

Commit fd3917f

Browse files
committed
Fix checking of parents use of SoftDeletes trait
1 parent 34417df commit fd3917f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/EventListeners/SoftDeletableListener.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function onFlush(OnFlushEventArgs $event)
3030

3131
private function isSoftDeletable($entity)
3232
{
33-
return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses($entity));
33+
if (is_object($entity)) $entity = get_class($entity);
34+
return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses_recursive($entity));
3435
}
3536
}

src/Filters/TrashedFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public function addFilterConstraint(ClassMetadata $metadata, $table)
1212

1313
private function isSoftDeletable($entity)
1414
{
15-
return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses($entity));
15+
if (is_object($entity)) $entity = get_class($entity);
16+
return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses_recursive($entity));
1617
}
1718
}

0 commit comments

Comments
 (0)