Fix infinte resolve loop (#275)

Author: martinlagler

Content/Infrastructure/Sulu/Structure/DecoratedStructureResolver.php

@@ -29,9 +29,12 @@ public function __construct(private StructureResolverInterface $inner)
     /**
      * @return mixed[]
      */
-    public function resolve(StructureInterface $structure, bool $loadExcerpt = true): array
+    public function resolve(StructureInterface $structure, bool $loadExcerpt = true/*, array $includedProperties = null*/): array
     {
-        $data = $this->inner->resolve($structure, $loadExcerpt);
+        $includedProperties = (\func_num_args() > 2) ? \func_get_arg(2) : null;
+
+        /** @phpstan-ignore-next-line */
+        $data = $this->inner->resolve($structure, $loadExcerpt, $includedProperties);
 
         if (!$structure instanceof ContentStructureBridge) {
             return $data;

Tests/Unit/Content/Infrastructure/Sulu/Structure/DecoratedStructureResolverTest.php

@@ -50,7 +50,7 @@ public function testResolveWithNonContentStructureBridge(): void
         $structure = $this->prophesize(StructureInterface::class);
         $expectedData = ['key' => 'value'];
 
-        $this->innerResolver->resolve($structure->reveal(), true)
+        $this->innerResolver->resolve($structure->reveal(), true, null)
             ->willReturn($expectedData);
 
         $result = $this->decoratedResolver->resolve($structure->reveal());
@@ -68,7 +68,7 @@ public function testResolveWithContentStructureBridgeNonAuthorInterface(): void
         $document->getContent()->willReturn($content);
 
         $expectedData = ['key' => 'value'];
-        $this->innerResolver->resolve($structure->reveal(), true)
+        $this->innerResolver->resolve($structure->reveal(), true, null)
             ->willReturn($expectedData);
 
         $result = $this->decoratedResolver->resolve($structure->reveal());
@@ -88,7 +88,7 @@ public function testResolveWithContentStructureBridgeAndAuthorInterface(): void
         $document->getContent()->willReturn($content->reveal());
 
         $expectedData = ['key' => 'value'];
-        $this->innerResolver->resolve($structure->reveal(), true)
+        $this->innerResolver->resolve($structure->reveal(), true, null)
             ->willReturn($expectedData);
 
         $authDate = new \DateTimeImmutable();
@@ -117,7 +117,7 @@ public function testResolveWithContentStructureBridgeAndAuthorInterfaceNoAuthor(
         $document->getContent()->willReturn($content->reveal());
 
         $expectedData = ['key' => 'value'];
-        $this->innerResolver->resolve($structure->reveal(), true)
+        $this->innerResolver->resolve($structure->reveal(), true, null)
             ->willReturn($expectedData);
 
         $content->getAuthored()->willReturn(null);
@@ -138,11 +138,25 @@ public function testResolveWithExcerptFlag(): void
         $structure = $this->prophesize(StructureInterface::class);
         $expectedData = ['key' => 'value'];
 
-        $this->innerResolver->resolve($structure->reveal(), false)
+        $this->innerResolver->resolve($structure->reveal(), false, null)
             ->willReturn($expectedData);
 
         $result = $this->decoratedResolver->resolve($structure->reveal(), false);
 
         $this->assertSame($expectedData, $result);
     }
+
+    public function testResolveWithIncludedProperties(): void
+    {
+        $structure = $this->prophesize(StructureInterface::class);
+        $includedProperties = ['title' => 'title', 'url' => 'url'];
+        $expectedData = ['key' => 'value'];
+
+        $this->innerResolver->resolve($structure->reveal(), false, $includedProperties)
+            ->willReturn($expectedData);
+
+        $result = $this->decoratedResolver->resolve($structure->reveal(), false, $includedProperties);
+
+        $this->assertSame($expectedData, $result);
+    }
 }