filter nulls resulting in "spl_object_hash() expects parameter 1 to be object, null given vendor/doctrine/orm/lib/Doctrine/ORM/UnitOfWork.php..."

Author: bendavies

src/AssociationHydrator.php

@@ -45,13 +45,12 @@ public function hydrateAssociations($subjects, iterable $associationsPaths): voi
      */
     public function hydrateAssociation($subjects, string $associationPath): void
     {
-        if (null === $subjects || [] === $subjects) {
+        if ([] === $subjects = $this->normalizeSubject($subjects)) {
             return;
         }
 
         $initialAssociations = explode('.', $associationPath);
         $finalAssociation = array_pop($initialAssociations);
-        $subjects = $this->normalizeSubject($subjects);
 
         $classMetadata = $this->classMetadata;
         foreach ($initialAssociations as $initialAssociation) {
@@ -90,13 +89,13 @@ public function hydrateAssociation($subjects, string $associationPath): void
     private function normalizeSubject($subject): array
     {
         if ($subject instanceof Collection) {
-            return $subject->toArray();
+            $subject = $subject->toArray();
         }
 
         if (!is_array($subject)) {
-            return [$subject];
+            $subject = [$subject];
         }
 
-        return $subject;
+        return \array_filter($subject);
     }
 }