Correctly resolve internal and external links #98
Conversation
Content/StructureResolver.php
Outdated
| $originalDocument = $originalStructure->getDocument(); | ||
|
|
||
| /** @var string|null $structureType */ | ||
| $structureType = null; |
There was a problem hiding this comment.
would call this templateKey to be consistent with the SulucontentBundle
Content/StructureResolver.php
Outdated
| $type = 'page'; | ||
| } | ||
| } | ||
| $type = $this->getTemplateType($structure, $document); |
There was a problem hiding this comment.
would call this templateType
Content/StructureResolver.php
Outdated
| @@ -65,7 +69,10 @@ public function resolve( | |||
| string $locale, | |||
| bool $includeExtension = true | |||
| ): array { | |||
| $data = $this->getStructureData($structure); | |||
| $originalStructure = $structure; | |||
There was a problem hiding this comment.
would call this requestedStructure
Content/StructureResolver.php
Outdated
| @@ -65,7 +69,10 @@ public function resolve( | |||
| string $locale, | |||
| bool $includeExtension = true | |||
| ): array { | |||
| $data = $this->getStructureData($structure); | |||
| $originalStructure = $structure; | |||
| $structure = $this->getMostSpecificStructure($originalStructure); | |||
There was a problem hiding this comment.
would call this targetStructure
Content/StructureResolver.php
Outdated
| @@ -87,6 +94,18 @@ public function resolve( | |||
| $data['view'][$property->getName()] = $contentView->getView(); | |||
| } | |||
|
|
|||
| $titleProperty = $originalStructure->getProperty('title'); | |||
There was a problem hiding this comment.
think i would implement a private getProperties method with a $requestedStructure and $targetStructure argument. then we can loop over the properties of that method instead of $structure->getProperties(true) and the special logic for the title is handled at a single place
Content/StructureResolver.php
Outdated
| @@ -133,14 +156,19 @@ public function resolveProperties( | |||
| ); | |||
| } | |||
| } else { | |||
| if (!$structure->hasProperty($sourceProperty)) { | |||
| $propertyStructure = $structure; | |||
| if ('title' === $sourceProperty) { | |||
There was a problem hiding this comment.
would use the getProperties proposed above here too, then we dont need to handle the title differently
Content/StructureResolver.php
Outdated
|
|
||
| $contentView = $this->resolveProperty( | ||
| $structure, | ||
| $propertyStructure, |
There was a problem hiding this comment.
think we can access the structure of the property via the getStructure() method
Content/StructureResolver.php
Outdated
| * | ||
| * @return StructureBridge | ||
| */ | ||
| private function getMostSpecificStructure(StructureInterface $structure): StructureInterface |
fixes #62
fixes #96
fixes #97