WIP: Fix SetSerializedNodeProperties event

neos · Feb 14, 2024 · d641f94 · d641f94
1 parent f9fad15
commit d641f94
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/...s/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature b/...s/Tests/Behavior/Features/ContentStreamForking/ForkContentStreamWithoutDimensions.feature
@@ -46,6 +46,7 @@ Feature: ForkContentStream Without Dimensions
       | originDimensionSpacePoint    | {}                                                      |
       | affectedDimensionSpacePoints | [{}]                                                    |
       | propertyValues               | {"text": {"value": "original value", "type": "string"}} |
+      | propertiesToUnset            | {}                                                      |
 
   Scenario: Ensure that the node is available in the forked content stream
     When the command "ForkContentStream" is executed with payload:
@@ -69,6 +70,7 @@ Feature: ForkContentStream Without Dimensions
       | originDimensionSpacePoint    | {}                                                      |
       | affectedDimensionSpacePoints | [{}]                                                    |
       | propertyValues               | {"text": {"value": "modified value", "type": "string"}} |
+      | propertiesToUnset            | {}                                                      |
     And the graph projection is fully up to date
 
       # live
@@ -98,6 +100,7 @@ Feature: ForkContentStream Without Dimensions
       | originDimensionSpacePoint    | {}                                                      |
       | affectedDimensionSpacePoints | [{}]                                                    |
       | propertyValues               | {"text": {"value": "modified value", "type": "string"}} |
+      | propertiesToUnset            | {}                                                      |
     And the graph projection is fully up to date
 
     # live

diff --git a/...Repository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature b/...Repository.BehavioralTests/Tests/Behavior/Features/StructureAdjustment/Properties.feature
@@ -126,6 +126,7 @@ Feature: Properties
       | originDimensionSpacePoint    | {}                                                                          |
       | affectedDimensionSpacePoints | [{}]                                                                        |
       | propertyValues               | {"myProp": {"value": "original value", "type": "My\\Non\\Existing\\Class"}} |
+      | propertiesToUnset            | {}                                                      |
     And the graph projection is fully up to date
     Then I expect the following structure adjustments for type "Neos.ContentRepository.Testing:Document":
       | Type                        | nodeAggregateId        |

diff --git a/...alTests/Tests/Behavior/Features/WorkspacePublishing/RebasingAutoCreatedNodesWorks.feature b/...alTests/Tests/Behavior/Features/WorkspacePublishing/RebasingAutoCreatedNodesWorks.feature
@@ -71,6 +71,7 @@ Feature: Rebasing auto-created nodes works
       | nodeAggregateId   | $this->currentNodeAggregateId          |
       | originDimensionSpacePoint | {}                                             |
       | propertyValues            | {"text": {"value":"Modified","type":"string"}} |
+      | propertiesToUnset         | {}                                             |
     And the graph projection is fully up to date
 
     When the command RebaseWorkspace is executed with payload:

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/PropertyNames.php b/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/PropertyNames.php
@@ -11,7 +11,7 @@
  * Todo move to shared and use {@see PropertyName} ???
  * @api used as part of commands/events
  */
-final readonly class PropertyNames
+final readonly class PropertyNames implements \JsonSerializable
 {
     /**
      * @var array<string>
@@ -56,6 +56,11 @@ public function splitByScope(NodeType $nodeType): array
 
     public function merge(self $other): self
     {
-        return new self(...array_merge($this->values, $other->values));
+        return new self(...$this->values, ...$other->values);
+    }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->values;
     }
 }