make unresolved content types in entries resolve (#35)

Author: shieldo

src/Entry.php

@@ -9,7 +9,9 @@ class Entry implements EntryInterface
 {
     use DisallowArrayAccessMutationTrait;
     use EntryUnknownMethodTrait;
-    use MetadataAccessTrait;
+    use MetadataAccessTrait {
+        getContentType as protected getMetadataContentType;
+    }
 
     /**
      * @var array
@@ -94,6 +96,19 @@ public function getField($key)
         return $this->fields[$key];
     }
 
+    public function getContentType()
+    {
+        $metadataContentType = $this->getMetadataContentType();
+        if (!$metadataContentType instanceof Link) {
+            return $metadataContentType;
+        }
+        if (null === $this->resolveLinkFunction) {
+            return null;
+        }
+
+        return call_user_func($this->resolveLinkFunction, $metadataContentType)->wait();
+    }
+
     /**
      * @param mixed $offset
      * @return bool true on success or false on failure

tests/EntryTest.php

@@ -5,6 +5,7 @@
 use GuzzleHttp\Promise\Promise;
 use function GuzzleHttp\Promise\promise_for;
 use Markup\Contentful\AssetInterface;
+use Markup\Contentful\ContentTypeInterface;
 use Markup\Contentful\Entry;
 use Markup\Contentful\EntryInterface;
 use Markup\Contentful\Exception\LinkUnresolvableException;
@@ -115,4 +116,29 @@ public function testUnresolvedSingleLinkEmitsNull()
         $entry->setResolveLinkFunction($callback);
         $this->assertNull($entry['asset']);
     }
+
+    public function testGetResolvedContentType()
+    {
+        $contentType = m::mock(ContentTypeInterface::class);
+        $this->metadata
+            ->shouldReceive('getContentType')
+            ->andReturn($contentType);
+        $this->assertSame($contentType, $this->entry->getContentType());
+    }
+
+    public function testGetUnresolvedContentType()
+    {
+        $link = m::mock(Link::class);
+        $this->metadata
+            ->shouldReceive('getContentType')
+            ->andReturn($link);
+        $contentType = m::mock(ContentTypeInterface::class);
+        $callback = function ($link) use ($contentType) {
+            $this->assertInstanceOf(Link::class, $link);
+
+            return promise_for($contentType);
+        };
+        $this->entry->setResolveLinkFunction($callback);
+        $this->assertSame($contentType, $this->entry->getContentType());
+    }
 }