TASK: Unify command and event dispatching in Behat tests

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/02-NodeCreation/03-CreateNodeAggregateWithNode_WithoutDimensions.feature

@@ -202,14 +202,14 @@ Feature: Create node aggregate with node
       | nodeAggregateId | "lady-eleonode-rootford"      |
       | nodeTypeName    | "Neos.ContentRepository:Root" |
 
-    Given the command CreateNodeAggregateWithNodeAndSerializedProperties is executed with payload:
+    Given the command CreateNodeAggregateWithNode is executed with payload:
       | Key                       | Value                                                          |
       | nodeAggregateId           | "sir-david-nodenborough"                                       |
       | nodeTypeName              | "Neos.ContentRepository.Testing:NodeWithoutTetheredChildNodes" |
       | originDimensionSpacePoint | {}                                                             |
       | parentNodeAggregateId     | "lady-eleonode-rootford"                                       |
       | nodeName                  | "node"                                                         |
-    And the command CreateNodeAggregateWithNodeAndSerializedProperties is executed with payload:
+    And the command CreateNodeAggregateWithNode is executed with payload:
       | Key                              | Value                                                          |
       | nodeAggregateId                  | "sir-nodeward-nodington-iii"                                   |
       | nodeTypeName                     | "Neos.ContentRepository.Testing:NodeWithoutTetheredChildNodes" |

Neos.ContentRepository.Core/Classes/CommandHandler/CommandInterface.php

@@ -5,10 +5,14 @@
 namespace Neos\ContentRepository\Core\CommandHandler;
 
 /**
- * Common (marker) interface for all commands of the Content Repository
+ * Common interface for all commands of the Content Repository
  *
  * @internal because extra commands are no extension point
  */
 interface CommandInterface
 {
+    /**
+     * @param array<string,mixed> $array
+     */
+    public static function fromArray(array $array): self;
 }

Neos.ContentRepository.Core/Classes/Feature/Common/RebasableToOtherWorkspaceInterface.php

@@ -30,10 +30,4 @@ interface RebasableToOtherWorkspaceInterface extends CommandInterface
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
     ): self;
-
-    /**
-     * called during deserialization from metadata
-     * @param array<string,mixed> $array
-     */
-    public static function fromArray(array $array): self;
 }

Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/Command/MoveDimensionSpacePoint.php

@@ -58,9 +58,6 @@ public static function create(
         return new self($workspaceName, $source, $target);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeCreation/Command/CreateNodeAggregateWithNode.php

@@ -18,7 +18,9 @@
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\NodeCreation\Dto\NodeAggregateIdsByNodePaths;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
+use Neos\ContentRepository\Core\Feature\NodeModification\Dto\SerializedPropertyValues;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Dto\NodeReferencesToWrite;
+use Neos\ContentRepository\Core\Feature\NodeReferencing\Dto\SerializedNodeReferences;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
@@ -76,6 +78,32 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $nodeTypeName, $originDimensionSpacePoint, $parentNodeAggregateId, $initialPropertyValues ?: PropertyValuesToWrite::createEmpty(), $succeedingSiblingNodeAggregateId, null, NodeAggregateIdsByNodePaths::createEmpty(), $references ?: NodeReferencesToWrite::createEmpty());
     }
 
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            NodeAggregateId::fromString($array['nodeAggregateId']),
+            NodeTypeName::fromString($array['nodeTypeName']),
+            isset($array['originDimensionSpacePoint'])
+                ? OriginDimensionSpacePoint::fromArray($array['originDimensionSpacePoint'])
+                : OriginDimensionSpacePoint::createWithoutDimensions(),
+            NodeAggregateId::fromString($array['parentNodeAggregateId']),
+            isset($array['initialPropertyValues'])
+                ? PropertyValuesToWrite::fromArray($array['initialPropertyValues'])
+                : PropertyValuesToWrite::createEmpty(),
+            isset($array['succeedingSiblingNodeAggregateId'])
+                ? NodeAggregateId::fromString($array['succeedingSiblingNodeAggregateId'])
+                : null,
+            isset($array['nodeName'])
+                ? NodeName::fromString($array['nodeName'])
+                : null,
+            isset($array['tetheredDescendantNodeAggregateIds'])
+                ? NodeAggregateIdsByNodePaths::fromArray($array['tetheredDescendantNodeAggregateIds'])
+                : NodeAggregateIdsByNodePaths::createEmpty(),
+            isset($array['references']) ? NodeReferencesToWrite::fromArray($array['references']) : NodeReferencesToWrite::createEmpty(),
+        );
+    }
+
     public function withInitialPropertyValues(PropertyValuesToWrite $newInitialPropertyValues): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php

@@ -80,9 +80,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $nodeTypeName, $originDimensionSpacePoint, $parentNodeAggregateId, $initialPropertyValues ?? SerializedPropertyValues::createEmpty(), $succeedingSiblingNodeAggregateId, null, NodeAggregateIdsByNodePaths::createEmpty(), $references ?: SerializedNodeReferences::createEmpty());
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/DisableNodeAggregate.php

@@ -60,9 +60,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $coveredDimensionSpacePoint, $nodeVariantSelectionStrategy);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/EnableNodeAggregate.php

@@ -60,9 +60,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $coveredDimensionSpacePoint, $nodeVariantSelectionStrategy);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php

@@ -100,9 +100,6 @@ public static function createFromSubgraphAndStartNode(
         );
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeModification/Command/SetNodeProperties.php

@@ -60,4 +60,14 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
     {
         return new self($workspaceName, $nodeAggregateId, $originDimensionSpacePoint, $propertyValues);
     }
+
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            NodeAggregateId::fromString($array['nodeAggregateId']),
+            OriginDimensionSpacePoint::fromArray($array['originDimensionSpacePoint']),
+            PropertyValuesToWrite::fromArray($array['propertyValues']),
+        );
+    }
 }

Neos.ContentRepository.Core/Classes/Feature/NodeModification/Command/SetSerializedNodeProperties.php

@@ -77,9 +77,6 @@ public static function create(
         );
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php

@@ -82,16 +82,15 @@ public static function create(WorkspaceName $workspaceName, DimensionSpacePoint
         return new self($workspaceName, $dimensionSpacePoint, $nodeAggregateId, $relationDistributionStrategy, $newParentNodeAggregateId, $newPrecedingSiblingNodeAggregateId, $newSucceedingSiblingNodeAggregateId);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(
             WorkspaceName::fromString($array['workspaceName']),
             DimensionSpacePoint::fromArray($array['dimensionSpacePoint']),
             NodeAggregateId::fromString($array['nodeAggregateId']),
-            RelationDistributionStrategy::fromString($array['relationDistributionStrategy']),
+            isset($array['relationDistributionStrategy'])
+                ? RelationDistributionStrategy::from($array['relationDistributionStrategy'])
+                : RelationDistributionStrategy::default(),
             isset($array['newParentNodeAggregateId'])
                 ? NodeAggregateId::fromString($array['newParentNodeAggregateId'])
                 : null,

Neos.ContentRepository.Core/Classes/Feature/NodeMove/Dto/RelationDistributionStrategy.php

@@ -34,11 +34,9 @@ enum RelationDistributionStrategy: string implements \JsonSerializable
     case STRATEGY_GATHER_ALL = 'gatherAll';
     case STRATEGY_GATHER_SPECIALIZATIONS = 'gatherSpecializations';
 
-    public static function fromString(?string $serialization): self
+    public static function default(): self
     {
-        return !is_null($serialization)
-            ? self::from($serialization)
-            : self::STRATEGY_GATHER_ALL;
+        return self::STRATEGY_GATHER_ALL;
     }
 
     public function jsonSerialize(): string

Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetNodeReferences.php

@@ -6,6 +6,7 @@
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
+use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Dto\NodeReferencesToWrite;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\ReferenceName;
@@ -47,4 +48,14 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $sou
     {
         return new self($workspaceName, $sourceNodeAggregateId, $sourceOriginDimensionSpacePoint, $references);
     }
+
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            NodeAggregateId::fromString($array['sourceNodeAggregateId']),
+            OriginDimensionSpacePoint::fromArray($array['sourceOriginDimensionSpacePoint']),
+            NodeReferencesToWrite::fromArray($array['references']),
+        );
+    }
 }

Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php

@@ -61,9 +61,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $sou
         return new self($workspaceName, $sourceNodeAggregateId, $sourceOriginDimensionSpacePoint, $references);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php

@@ -59,9 +59,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $coveredDimensionSpacePoint, $nodeVariantSelectionStrategy, null);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php

@@ -61,9 +61,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $newNodeTypeName, $strategy, NodeAggregateIdsByNodePaths::createEmpty());
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php

@@ -60,9 +60,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $sourceOrigin, $targetOrigin);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php

@@ -102,9 +102,6 @@ public function withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePat
         );
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/Command/UpdateRootNodeAggregateDimensions.php

@@ -51,9 +51,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId);
     }
 
-    /**
-     * @param array<string,string> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/TagSubtree.php

@@ -64,9 +64,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $coveredDimensionSpacePoint, $nodeVariantSelectionStrategy, $tag);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/UntagSubtree.php

@@ -65,9 +65,6 @@ public static function create(WorkspaceName $workspaceName, NodeAggregateId $nod
         return new self($workspaceName, $nodeAggregateId, $coveredDimensionSpacePoint, $nodeVariantSelectionStrategy, $tag);
     }
 
-    /**
-     * @param array<string,mixed> $array
-     */
     public static function fromArray(array $array): self
     {
         return new self(

Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateRootWorkspace.php

@@ -45,4 +45,12 @@ public static function create(WorkspaceName $workspaceName, ContentStreamId $new
     {
         return new self($workspaceName, $newContentStreamId);
     }
+
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            ContentStreamId::fromString($array['newContentStreamId']),
+        );
+    }
 }

Neos.ContentRepository.Core/Classes/Feature/WorkspaceCreation/Command/CreateWorkspace.php

@@ -46,4 +46,13 @@ public static function create(WorkspaceName $workspaceName, WorkspaceName $baseW
     {
         return new self($workspaceName, $baseWorkspaceName, $newContentStreamId);
     }
+
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            WorkspaceName::fromString($array['baseWorkspaceName']),
+            ContentStreamId::fromString($array['newContentStreamId']),
+        );
+    }
 }

Neos.ContentRepository.Core/Classes/Feature/WorkspaceModification/Command/ChangeBaseWorkspace.php

@@ -36,6 +36,15 @@ public static function create(WorkspaceName $workspaceName, WorkspaceName $baseW
         return new self($workspaceName, $baseWorkspaceName, ContentStreamId::create());
     }
 
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            WorkspaceName::fromString($array['baseWorkspaceName']),
+            isset($array['newContentStreamId']) ? ContentStreamId::fromString($array['newContentStreamId']) : ContentStreamId::create(),
+        );
+    }
+
     /**
      * During the publish process, we create a new content stream.
      *

Neos.ContentRepository.Core/Classes/Feature/WorkspaceModification/Command/DeleteWorkspace.php

@@ -5,6 +5,7 @@
 namespace Neos\ContentRepository\Core\Feature\WorkspaceModification\Command;
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
@@ -29,4 +30,11 @@ public static function create(WorkspaceName $workspaceName): self
     {
         return new self($workspaceName);
     }
+
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+        );
+    }
 }

Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/DiscardIndividualNodesFromWorkspace.php

@@ -53,6 +53,15 @@ public static function create(
         );
     }
 
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            NodeIdsToPublishOrDiscard::fromArray($array['nodesToDiscard']),
+            isset($array['newContentStreamId']) ? ContentStreamId::fromString($array['newContentStreamId']) : ContentStreamId::create(),
+        );
+    }
+
     /**
      * Call this method if you want to run this command fully deterministically, f.e. during test cases
      */

Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Command/DiscardWorkspace.php

@@ -43,6 +43,14 @@ public static function create(WorkspaceName $workspaceName): self
         return new self($workspaceName, ContentStreamId::create());
     }
 
+    public static function fromArray(array $array): self
+    {
+        return new self(
+            WorkspaceName::fromString($array['workspaceName']),
+            isset($array['newContentStreamId']) ? ContentStreamId::fromString($array['newContentStreamId']) : ContentStreamId::create(),
+        );
+    }
+
     /**
      * Call this method if you want to run this command fully deterministically, f.e. during test cases
      */