Merge pull request #4739 from mhsdesign/task/4736-jsonSerialize-subgr…

…aph-correctly TASK: #4736 Json serialize Subgraph correctly
neos · Feb 7, 2024 · 86582ef · 86582ef
2 parents dcb31c7 + 3a7aa79
commit 86582ef
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 20 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php
@@ -461,15 +461,9 @@ public function countNodes(): int
         }
     }
 
-    /**
-     * @return array<string,mixed>
-     */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): ContentSubgraphIdentity
     {
-        return [
-            'contentStreamId' => $this->contentStreamId,
-            'dimensionSpacePoint' => $this->dimensionSpacePoint
-        ];
+        return $this->getIdentity();
     }
 
     /** ------------------------------------------- */

diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php
@@ -534,14 +534,8 @@ private function getDatabaseConnection(): DatabaseConnection
         return $this->databaseClient->getConnection();
     }
 
-    /**
-     * @return array<string,mixed>
-     */
-    public function jsonSerialize(): array
+    public function jsonSerialize(): ContentSubgraphIdentity
     {
-        return [
-            'contentStreamId' => $this->contentStreamId,
-            'dimensionSpacePoint' => $this->dimensionSpacePoint
-        ];
+        return $this->getIdentity();
     }
 }
diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php
@@ -19,7 +19,7 @@
  *
  * @api
  */
-final class ContentRepositoryId
+final class ContentRepositoryId implements \JsonSerializable
 {
     private function __construct(
         public readonly string $value
@@ -47,4 +47,9 @@ public function equals(self $other): bool
     {
         return $this->value === $other->value;
     }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->value;
+    }
 }
diff --git a/...rojection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php b/...rojection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php
@@ -247,7 +247,7 @@ private static function isFilterEmpty(object $filter): bool
         return array_filter(get_object_vars($filter), static fn ($value) => $value !== null) === [];
     }
 
-    public function jsonSerialize(): mixed
+    public function jsonSerialize(): ContentSubgraphIdentity
     {
         return $this->wrappedContentSubgraph->jsonSerialize();
     }

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php
@@ -33,7 +33,7 @@
  *
  * @api
  */
-final class ContentSubgraphIdentity
+final class ContentSubgraphIdentity implements \JsonSerializable
 {
     private function __construct(
         public readonly ContentRepositoryId $contentRepositoryId,
@@ -90,4 +90,17 @@ public function withVisibilityConstraints(VisibilityConstraints $visibilityConst
             $visibilityConstraints
         );
     }
+
+    /**
+     * @return array<string,mixed>
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'contentRepositoryId' => $this->contentRepositoryId,
+            'contentStreamId' => $this->contentStreamId,
+            'dimensionSpacePoint' => $this->dimensionSpacePoint,
+            'visibilityConstraints' => $this->visibilityConstraints
+        ];
+    }
 }
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php
@@ -204,4 +204,6 @@ public function retrieveNodePath(NodeAggregateId $nodeAggregateId): AbsoluteNode
      * @internal this method might change without further notice.
      */
     public function countNodes(): int;
+
+    public function jsonSerialize(): ContentSubgraphIdentity;
 }
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php
@@ -21,7 +21,7 @@
  *
  * @api
  */
-final class VisibilityConstraints
+final class VisibilityConstraints implements \JsonSerializable
 {
     protected bool $disabledContentShown = false;
 
@@ -49,4 +49,9 @@ public static function frontend(): VisibilityConstraints
     {
         return new VisibilityConstraints(false);
     }
+
+    public function jsonSerialize(): string
+    {
+        return $this->getHash();
+    }
 }