make sure contents of resource arrays are written into envelope (#28)

Author: shieldo

src/ResourceBuilder.php

@@ -159,8 +159,7 @@ public function buildFromData(array $data, $spaceName = null, AssetDecoratorInte
                 return new Link($metadata, $spaceName);
             case 'Array':
                 $this->addToEnvelope((isset($data['includes'])) ? $data['includes'] : [], $buildFromData);
-
-                return new ResourceArray(
+                $resources = new ResourceArray(
                     array_map(function ($itemData) use ($buildFromData) {
                         $envelopeResource = $this->resolveResourceDataToEnvelopeResource($itemData);
                         if ($envelopeResource) {
@@ -176,6 +175,9 @@ public function buildFromData(array $data, $spaceName = null, AssetDecoratorInte
                     intval($data['skip']),
                     $this->envelope
                 );
+                $this->envelope->insert($resources);
+
+                return $resources;
             default:
                 break;
         }

src/ResourceEnvelope.php

@@ -116,6 +116,30 @@ public function hasContentType($contentTypeId)
         return isset($this->contentTypes[$contentTypeId]);
     }
 
+    /**
+     * @param ResourceInterface|ResourceArray $resource
+     * @return $this
+     */
+    public function insert($resource)
+    {
+        if ($resource instanceof ResourceArray) {
+            foreach ($resource as $resourceItem) {
+                $this->insert($resourceItem);
+            }
+        }
+        if ($resource instanceof EntryInterface) {
+            return $this->insertEntry($resource);
+        }
+        if ($resource instanceof AssetInterface) {
+            return $this->insertAsset($resource);
+        }
+        if ($resource instanceof ContentTypeInterface) {
+            return $this->insertContentType($resource);
+        }
+
+        return $this;
+    }
+
     /**
      * @param EntryInterface $entry
      * @return self

tests/ResourceEnvelopeTest.php

@@ -97,4 +97,35 @@ public function testSetAndAccessContentTypes()
         $this->assertSame($contentType1, $this->envelope->findContentTypeByName($contentTypeName1));
         $this->assertNull($this->envelope->findContentTypeByName('unknown'));
     }
+
+    public function testSetAndAccessUsingGenericInsertMethod()
+    {
+        $contentType1 = m::mock(ContentTypeInterface::class);
+        $id1 = 'id1';
+        $contentType1
+            ->shouldReceive('getId')
+            ->andReturn($id1);
+        $contentTypeName1 = 'name1';
+        $contentType1
+            ->shouldReceive('getName')
+            ->andReturn($contentTypeName1);
+        $contentType2 = m::mock(ContentTypeInterface::class);
+        $id2 = 'id2';
+        $contentType2
+            ->shouldReceive('getId')
+            ->andReturn($id2);
+        $contentTypeName2 = 'name2';
+        $contentType2
+            ->shouldReceive('getName')
+            ->andReturn($contentTypeName2);
+        $this->envelope->insert($contentType1);
+        $this->envelope->insert($contentType2);
+        $this->assertSame($contentType2, $this->envelope->findContentType($id2));
+        $this->assertTrue($this->envelope->hasContentType($id2));
+        $this->assertNull($this->envelope->findContentType('unknown'));
+        $this->assertFalse($this->envelope->hasContentType('unknown'));
+        $this->assertEquals(2, $this->envelope->getContentTypeCount());
+        $this->assertSame($contentType1, $this->envelope->findContentTypeByName($contentTypeName1));
+        $this->assertNull($this->envelope->findContentTypeByName('unknown'));
+    }
 }