Merge pull request #106 from Kentico/fix/97

Extend InlineLinkedItemsResolverInterface.resolveInlineLinkedItems with linked items. The changes were tested in the wrapper by @stevie-mccomb.
kontent-ai · Nov 8, 2021 · 22e2083 · 22e2083
2 parents c69006f + 542d9fb
commit 22e2083
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/src/Kentico/Kontent/Delivery/DefaultMapper.php b/src/Kentico/Kontent/Delivery/DefaultMapper.php
@@ -176,10 +176,11 @@ public function resolveBrokenLinkUrl()
      * 
      * @param string $input input html of inline linked items.
      * @param mixed $item data for inline linked items.
+     * @param mixed|null $linkedItems JSON response containing nested linked items
      * 
      * @return string
      */
-    public function resolveInlineLinkedItems($input, $item)
+    public function resolveInlineLinkedItems($input, $item, $linkedItems)
     {
         if(isset($item) && strpos($input, $item->system->codename) !== false){
             return $input;

diff --git a/src/Kentico/Kontent/Delivery/InlineLinkedItemsResolverInterface.php b/src/Kentico/Kontent/Delivery/InlineLinkedItemsResolverInterface.php
@@ -15,8 +15,9 @@ interface InlineLinkedItemsResolverInterface
      * 
      * @param string $input input html of inline linked items.
      * @param mixed $item data for inline linked items.
+     * @param mixed|null $linkedItems JSON response containing nested linked items
      * 
      * @return string
      */
-    public function resolveInlineLinkedItems($input, $item);
+    public function resolveInlineLinkedItems($input, $item, $linkedItems);
 }
diff --git a/src/Kentico/Kontent/Delivery/ModelBinder.php b/src/Kentico/Kontent/Delivery/ModelBinder.php
@@ -295,7 +295,7 @@ private function resolveLinkedItem($linkedItem, $linkedItems, $processedItems)
             $linkedItemsArray = get_object_vars($linkedItems);
             $linkedItemData = array_merge($linkedItemsArray, $processedItems);
             if (isset($linkedItemData[$itemCodeName])) {
-                $linkedItem->outertext = $this->inlineLinkedItemsResolver->resolveInlineLinkedItems($linkedItem->outertext, $linkedItemData[$itemCodeName]);
+                $linkedItem->outertext = $this->inlineLinkedItemsResolver->resolveInlineLinkedItems($linkedItem->outertext, $linkedItemData[$itemCodeName], $linkedItems);
             }
         }
         return $linkedItem->outertext;

diff --git a/tests/Unit/DefaultMapperTest.php b/tests/Unit/DefaultMapperTest.php
@@ -62,7 +62,7 @@ public function test_ResolveInlineLinkedItems_ItemNull_returnEmptyString()
     {
         $mapper = new DefaultMapper();
         $input = '<object type=\"application/kenticocloud\" data-type=\"item\" data-codename=\"modular_item_1\"></object>';
-        $result = $mapper->resolveInlineLinkedItems($input, null); 
+        $result = $mapper->resolveInlineLinkedItems($input, null, null); 
 
         $this->assertTrue(is_string($result));
         $this->assertEmpty($result);
@@ -74,7 +74,7 @@ public function test_ResolveInlineLinkedItems_ItemValid_returnInput()
         $input = '<object type=\"application/kenticocloud\" data-type=\"item\" data-codename=\"modular_item_1\"></object>';
         $itemJson = file_get_contents('./tests/Unit/Data/SimpleItem.json');
         $item = json_decode($itemJson);
-        $result = $mapper->resolveInlineLinkedItems($input, $item); 
+        $result = $mapper->resolveInlineLinkedItems($input, $item, null); 
 
         $this->assertTrue(is_string($result));
         $this->assertEquals($input, $result);

diff --git a/tests/Unit/ModelBinderTest.php b/tests/Unit/ModelBinderTest.php
@@ -81,7 +81,8 @@ public function test_BindModel_MockImplementation_InlineLinkedItemsResolved()
         $inlineLinkedItemsResolver
             ->expects($this->exactly(3))
             ->method('resolveInlineLinkedItems')
-            ->will($this->returnCallback(function ($input, $item) {
+            ->will($this->returnCallback(function ($input, $item, $linkedItems) {
+                $this->assertCount(2, get_object_vars($linkedItems));
                 return '<div>' . $item->system->name . '</div>';
             }));
 
@@ -120,7 +121,8 @@ public function test_BindModel_MockImplementation_WorkflowStepNotSetForComponent
         $inlineLinkedItemsResolver
             ->expects($this->exactly(2))
             ->method('resolveInlineLinkedItems')
-            ->will($this->returnCallback(function ($input, $item) {
+            ->will($this->returnCallback(function ($input, $item, $linkedItems) {
+                $this->assertCount(2, get_object_vars($linkedItems));
                 if($item->system->codename == 'n8bf1055d_7b61_0180_e1c6_3a09d88f0396') {
                     $this->assertFalse(isset($item->system->workflow_step));
                 } else {