fix: combine update

chialab · Jul 3, 2024 · e289658 · e289658
1 parent 5a79577
commit e289658
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Model/ObjectsLoader.php b/src/Model/ObjectsLoader.php
@@ -22,6 +22,7 @@
 use Cake\ORM\Table;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
+use InvalidArgumentException;
 use Iterator;
 
 /**
@@ -403,8 +404,8 @@ protected function toConcreteTypes(iterable $objects, int $depth): CollectionInt
         $sortedIds = $objects->extract('id')->toList();
 
         return $objects
-            ->combine('id', fn (Entity $object): Entity => $object, 'type')
-            ->unfold(function (iterable $items, string $type) use ($depth): Iterator {
+            ->combine('id', fn (Entity $object): Entity => $object, fn (Entity $object): string|null => $object->type ?? (string)$object->id)
+            ->unfold(function (iterable $items, string|int $type) use ($depth): Iterator {
                 if (!$type) {
                     yield from $items;
 
@@ -517,6 +518,7 @@ protected function autoHydrateAssociations(iterable $objects, int $depth, array|
                     }
 
                     $related = $object->get($prop);
+
                     if ($related instanceof ObjectEntity) {
                         $original = $related;