diff --git a/src/Mapper/Dbal/RelationshipMapperHasOne.php b/src/Mapper/Dbal/RelationshipMapperHasOne.php index ad362cbd..ce842b31 100644 --- a/src/Mapper/Dbal/RelationshipMapperHasOne.php +++ b/src/Mapper/Dbal/RelationshipMapperHasOne.php @@ -21,7 +21,6 @@ use Nextras\Orm\Repository\IRepository; use Nextras\Orm\Mapper\IMapper; use Nextras\Orm\NotSupportedException; -use Nextras\Orm\LogicException; /** @@ -88,7 +87,10 @@ protected function execute(DbalCollection $collection, IEntity $parent) protected function fetch(QueryBuilder $builder, $hasJoin, array $values) { - $values = array_values(array_unique(array_filter($values))); + $values = array_values(array_unique(array_filter($values, function($value) { + return $value !== NULL; + }))); + if (count($values) === 0) { return new EntityContainer([]); }