Also allow more than one relationship to be saved via a variadic prop…

…erty argument on save method
thewunder · Mar 25, 2024 · 0ae65b9 · 0ae65b9
1 parent de70cdc
commit 0ae65b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/ObjectMapper.php b/src/ObjectMapper.php
@@ -194,9 +194,7 @@ public function load(array $objects, string ...$properties): array
         $objectsByClass = $this->groupByClass($objects);
         $loadedObjects = [];
         foreach ($objectsByClass as $classObjects) {
-            foreach ($properties as $property) {
-                $loadedObjects += $relationshipManager->load($classObjects, $property);
-            }
+            $loadedObjects += $relationshipManager->load($classObjects, ...$properties);
         }
         return $loadedObjects;
     }

diff --git a/src/Relationship/RelationshipManager.php b/src/Relationship/RelationshipManager.php
@@ -30,24 +30,30 @@ public function addHandler(RelationshipHandler $handler): void
         $this->handlers[$handler::getRelationshipClass()] = $handler;
     }
 
-    public function save(array $objects, string $property): void
+    public function save(array $objects, string ...$properties): void
     {
         if (empty($objects)) {
             return;
         }
 
-        $relationshipType = $this->readAttribute(reset($objects), $property);
-        $this->getHandler($relationshipType)->save($objects, $relationshipType);
+        foreach ($properties as $property) {
+            $relationshipType = $this->readAttribute(reset($objects), $property);
+            $this->getHandler($relationshipType)->save($objects, $relationshipType);
+        }
     }
 
-    public function load(array $objects, string $property): array
+    public function load(array $objects, string ...$properties): array
     {
         if (empty($objects)) {
             return [];
         }
 
-        $relationshipType = $this->readAttribute(reset($objects), $property);
-        return $this->getHandler($relationshipType)->load($objects, $relationshipType);
+        $loadedObjects = [];
+        foreach ($properties as $property) {
+            $relationshipType = $this->readAttribute(reset($objects), $property);
+            $loadedObjects += $this->getHandler($relationshipType)->load($objects, $relationshipType);
+        }
+        return $loadedObjects;
     }
 
     /**