-
-
Notifications
You must be signed in to change notification settings - Fork 223
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TASK: Introduce
NeosFusionContextSerializer to replace node propert…
…y converters
- Loading branch information
Showing
7 changed files
with
148 additions
and
188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
Neos.Neos/Classes/Fusion/Cache/NeosFusionContextSerializer.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Neos\Neos\Fusion\Cache; | ||
|
|
||
| use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint; | ||
| use Neos\ContentRepository\Core\Factory\ContentRepositoryId; | ||
| use Neos\ContentRepository\Core\Projection\ContentGraph\Node; | ||
| use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints; | ||
| use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId; | ||
| use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; | ||
| use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; | ||
| use Neos\Fusion\Core\Cache\FusionContextSerializer; | ||
| use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; | ||
| use Symfony\Component\Serializer\Normalizer\NormalizerInterface; | ||
|
|
||
| /** | ||
| * Serializer for Fusion's [at]cache.context values | ||
| * | ||
| * Uses the flow property mapper as implementation. | ||
| * It relies on a converter being available from the context value type to string and reverse. | ||
| * | ||
| * {@see FusionContextSerializer} | ||
| * | ||
| * @internal | ||
| */ | ||
| final class NeosFusionContextSerializer implements NormalizerInterface, DenormalizerInterface | ||
| { | ||
| public function __construct( | ||
| private readonly FusionContextSerializer $fusionContextSerializer, | ||
| private readonly ContentRepositoryRegistry $contentRepositoryRegistry | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * @param array<int|string,mixed> $context | ||
| */ | ||
| public function denormalize(mixed $data, string $type, string $format = null, array $context = []) | ||
| { | ||
| if ($type === Node::class) { | ||
| return $this->deserializeNode($data); | ||
| } | ||
| return $this->fusionContextSerializer->denormalize($data, $type, $format, $context); | ||
| } | ||
|
|
||
| /** | ||
| * @param array<int|string,mixed> $context | ||
| * @return array<int|string,mixed> | ||
| */ | ||
| public function normalize(mixed $object, string $format = null, array $context = []) | ||
| { | ||
| if ($object instanceof Node) { | ||
| return $this->serializeNode($object); | ||
| } | ||
| return $this->fusionContextSerializer->normalize($object, $format, $context); | ||
| } | ||
|
|
||
| /** | ||
| * @param array<int|string,mixed> $serializedNode | ||
| */ | ||
| private function deserializeNode(array $serializedNode): Node | ||
| { | ||
| $contentRepositoryId = ContentRepositoryId::fromString($serializedNode['contentRepositoryId']); | ||
|
|
||
| $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); | ||
|
|
||
| $workspace = $contentRepository->getWorkspaceFinder()->findOneByName(WorkspaceName::fromString($serializedNode['workspaceName'])); | ||
| if (!$workspace) { | ||
| throw new \RuntimeException(sprintf('Could not find workspace while trying to convert node from array %s.', json_encode($serializedNode)), 1699782153); | ||
| } | ||
|
|
||
| $subgraph = $contentRepository->getContentGraph()->getSubgraph( | ||
| $workspace->currentContentStreamId, | ||
| DimensionSpacePoint::fromArray($serializedNode['dimensionSpacePoint']), | ||
| $workspace->isPublicWorkspace() | ||
| ? VisibilityConstraints::frontend() | ||
| : VisibilityConstraints::withoutRestrictions() | ||
| ); | ||
|
|
||
| $node = $subgraph->findNodeById(NodeAggregateId::fromString($serializedNode['nodeAggregateId'])); | ||
| if (!$node) { | ||
| throw new \RuntimeException(sprintf('Could not find serialized node %s.', json_encode($serializedNode)), 1699782153); | ||
| } | ||
| return $node; | ||
| } | ||
|
|
||
| /** | ||
| * @return array<int|string,mixed> | ||
| */ | ||
| private function serializeNode(Node $source): array | ||
| { | ||
| $contentRepository = $this->contentRepositoryRegistry->get( | ||
| $source->subgraphIdentity->contentRepositoryId | ||
| ); | ||
|
|
||
| $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($source->subgraphIdentity->contentStreamId); | ||
|
|
||
| if (!$workspace) { | ||
| throw new \RuntimeException(sprintf('Could not fetch workspace for node (%s) in content stream (%s).', $source->nodeAggregateId->value, $source->subgraphIdentity->contentStreamId->value), 1699780153); | ||
| } | ||
|
|
||
| return [ | ||
| 'contentRepositoryId' => $source->subgraphIdentity->contentRepositoryId->value, | ||
| 'workspaceName' => $workspace->workspaceName->value, | ||
| 'dimensionSpacePoint' => $source->subgraphIdentity->dimensionSpacePoint->jsonSerialize(), | ||
| 'nodeAggregateId' => $source->nodeAggregateId->value | ||
| ]; | ||
| } | ||
|
|
||
| public function supportsDenormalization(mixed $data, string $type, string $format = null) | ||
| { | ||
| throw new \BadMethodCallException(sprintf('Method %s is not supported.', __METHOD__), 1706978912); | ||
| } | ||
|
|
||
| public function supportsNormalization(mixed $data, string $format = null) | ||
| { | ||
| throw new \BadMethodCallException(sprintf('Method %s is not supported.', __METHOD__), 1706978913); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<int|string,mixed> | ||
| */ | ||
| public function getSupportedTypes(?string $format): array | ||
| { | ||
| throw new \BadMethodCallException(sprintf('Method %s is not supported.', __METHOD__), 1706978914); | ||
| } | ||
| } |
96 changes: 0 additions & 96 deletions
96
Neos.Neos/Classes/TypeConverter/JsonStringToNodeConverter.php
This file was deleted.
Oops, something went wrong.
87 changes: 0 additions & 87 deletions
87
Neos.Neos/Classes/TypeConverter/NodeToJsonStringSerializer.php
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters