Merge pull request #14 from TomHAnderson/feature/simplify-embedding

Feature/simplify embedding

README.md

@@ -84,7 +84,7 @@ final class UserHydrator extends Hydrator
         // is used for arrays and `addEmbeddedResource` is used for classes
         return $this->hydratorManager->resource($data)
             ->addLink('self', route('hal/user::fetch', $class->id))
-            ->addEmbeddedResources('roles', $this->hydratorManager->extract($class->roles))
+            ->addEmbeddedResources('roles', $class->roles)
             ;
     }
 }

src/Resource.php

@@ -63,9 +63,13 @@ public function addLink(string $reference, $definition): self
         return $this;
     }
 
-    public function addEmbeddedResource(string $ref, Resource |null $resource): self
+    public function addEmbeddedResource(string $ref, object |null $resource, ?string $hydrator = null): self
     {
-        $this->embedded[$ref] = $resource;
+        if ($resource instanceof Resource || $resource === null) {
+            $this->embedded[$ref] = $resource;
+        } else {
+            $this->embedded[$ref] = $this->hydratorManager->extract($resource, $hydrator);
+        }
 
         return $this;
     }

test/ResourceTest.php

@@ -53,6 +53,21 @@ public function testNullEmbeddedResource(): void
         $this->assertNull($result['_embedded']['embedded']);
     }
 
+    public function testObjectEmbeddedResource(): void
+    {
+        $user        = new User();
+        $user->id    = 1;
+        $user->name  = 'Test';
+        $user->email = 'test@testing.net';
+
+        $hydratorManager = new HydratorManager();
+        $resource1       = $hydratorManager->resource();
+        $resource1->addEmbeddedResource('user', $user);
+        $result = $resource1->toArray();
+
+        $this->assertEquals(1, $result['_embedded']['user']['id']);
+    }
+
     public function testEmbeddedResources(): void
     {
         $hydratorManager = new HydratorManager();