Fix smartcontent properties and page selection for non exist properti…

…es (#95)
sulu · Jun 9, 2021 · edf1c60 · edf1c60
1 parent df9c375
commit edf1c60
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Content/StructureResolver.php b/Content/StructureResolver.php
@@ -118,7 +118,11 @@ public function resolveProperties(
             if (false !== strpos($sourceProperty, '.')) {
                 [$extensionName, $propertyName] = explode('.', $sourceProperty);
 
-                $contentView = new ContentView($unresolvedExtensionData[$extensionName][$propertyName] ?? null);
+                if (!isset($unresolvedExtensionData[$extensionName][$propertyName])) {
+                    continue;
+                }
+
+                $contentView = new ContentView($unresolvedExtensionData[$extensionName][$propertyName]);
                 if ('excerpt' === $extensionName) {
                     $contentView = $this->resolveProperty(
                         $excerptStructure,
@@ -129,7 +133,12 @@ public function resolveProperties(
                     );
                 }
             } else {
+                if (!$structure->hasProperty($sourceProperty)) {
+                    continue;
+                }
+
                 $property = $structure->getProperty($sourceProperty);
+
                 $contentView = $this->resolveProperty(
                     $structure,
                     $sourceProperty,

diff --git a/Controller/NavigationController.php b/Controller/NavigationController.php
@@ -62,6 +62,7 @@ public function getAction(Request $request, string $context): Response
         $webspace = $attributes->getAttribute('webspace');
         $locale = $request->getLocale();
 
+        /** @var string $uuid */
         $uuid = $request->query->get('uuid');
         $depth = (int) $this->getRequestParameter($request, 'depth', false, 1);
         $flat = $this->getBooleanRequestParameter($request, 'flat', false, false);

diff --git a/Tests/Unit/Content/StructureResolverTest.php b/Tests/Unit/Content/StructureResolverTest.php
@@ -487,7 +487,9 @@ public function testResolveProperties(): void
         $titleProperty->getValue()->willReturn('test-123');
         $titleProperty->setValue('test-123')->shouldBeCalled();
 
+        $structure->hasProperty('title')->willReturn(true);
         $structure->getProperty('title')->willReturn($titleProperty->reveal());
+        $structure->hasProperty('notExist')->willReturn(false);
 
         $titleContentView = $this->prophesize(ContentView::class);
         $titleContentView->getContent()->willReturn('test-123');
@@ -512,7 +514,13 @@ public function testResolveProperties(): void
         // call test function
         $result = $this->structureResolver->resolveProperties(
             $structure->reveal(),
-            ['myTitle' => 'title', 'seoDescription' => 'seo.description', 'excerptTitle' => 'excerpt.title'],
+            [
+                'myTitle' => 'title',
+                'seoDescription' => 'seo.description',
+                'excerptTitle' => 'excerpt.title',
+                'notExist' => 'notExist',
+                'excerptNotExist' => 'excerpt.notExist',
+            ],
             'en'
         );
 
@@ -591,6 +599,7 @@ public function testResolvePropertiesIncludeExtension(): void
         $titleProperty->getValue()->willReturn('test-123');
         $titleProperty->setValue('test-123')->shouldBeCalled();
 
+        $structure->hasProperty('title')->willReturn(true);
         $structure->getProperty('title')->willReturn($titleProperty->reveal());
 
         $titleContentView = $this->prophesize(ContentView::class);