diff --git a/src/EventListeners/SoftDeletableListener.php b/src/EventListeners/SoftDeletableListener.php index 1c6ab72..afb6531 100644 --- a/src/EventListeners/SoftDeletableListener.php +++ b/src/EventListeners/SoftDeletableListener.php @@ -30,6 +30,7 @@ public function onFlush(OnFlushEventArgs $event) private function isSoftDeletable($entity) { - return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses($entity)); + if (is_object($entity)) $entity = get_class($entity); + return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses_recursive($entity)); } } diff --git a/src/Filters/TrashedFilter.php b/src/Filters/TrashedFilter.php index 35f2952..9dde9e8 100644 --- a/src/Filters/TrashedFilter.php +++ b/src/Filters/TrashedFilter.php @@ -12,6 +12,7 @@ public function addFilterConstraint(ClassMetadata $metadata, $table) private function isSoftDeletable($entity) { - return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses($entity)); + if (is_object($entity)) $entity = get_class($entity); + return array_key_exists('Mitch\LaravelDoctrine\Traits\SoftDeletes', class_uses_recursive($entity)); } }