From 84fa78359b1620b027bba66ff07a241395dfd865 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 Jan 2024 21:28:39 +0000 Subject: [PATCH] minor formatting fixes --- DataStorage/Database/Mapper/ReadMapper.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/DataStorage/Database/Mapper/ReadMapper.php b/DataStorage/Database/Mapper/ReadMapper.php index 549582cda..e59176c5c 100755 --- a/DataStorage/Database/Mapper/ReadMapper.php +++ b/DataStorage/Database/Mapper/ReadMapper.php @@ -260,8 +260,7 @@ final class ReadMapper extends DataMapperAbstract */ public function executeGet(?Builder $query = null) : mixed { - // Get initialized objects from memory cache. - $objs = []; + $objs = []; $indexed = []; $hasFactory = $this->mapper::hasFactory(); @@ -1206,6 +1205,8 @@ final class ReadMapper extends DataMapperAbstract $relMapper = $this->createRelationMapper($relation['mapper']::reader($this->db), $member); $isPrivate = $relation['private'] ?? false; + $tempObjs = []; + if ($isPrivate) { if ($refClass === null) { $refClass = new \ReflectionClass($obj); @@ -1213,20 +1214,16 @@ final class ReadMapper extends DataMapperAbstract $refProp = $refClass->getProperty($member); - $tempObjs = []; foreach ($objs as $obj) { $tempObjs[] = $refProp->getValue($obj); } - - $relMapper->loadHasManyRelations($tempObjs); } else { - $tempObjs = []; foreach ($objs as $obj) { $tempObjs[] = $obj->{$member}; } - - $relMapper->loadHasManyRelations($tempObjs); } + + $relMapper->loadHasManyRelations($tempObjs); } } }