Merge pull request #68 from gradinarufelix/bugfix-empty-dimensions

BUGFIX: Do not fail on empty dimension values
sitegeist · Sep 20, 2024 · 940f920 · 940f920
2 parents a1f2e50 + 3a788ba
commit 940f920
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/Classes/Application/GetChildrenForTreeNode/GetChildrenForTreeNodeQuery.php b/Classes/Application/GetChildrenForTreeNode/GetChildrenForTreeNodeQuery.php
@@ -45,11 +45,6 @@ public static function fromArray(array $array): self
         is_string($array['workspaceName'])
             or throw new \InvalidArgumentException('Workspace name must be a string');
 
-        isset($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be set');
-        is_array($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be an array');
-
         isset($array['treeNodeId'])
             or throw new \InvalidArgumentException('Tree node id must be set');
         is_string($array['treeNodeId'])
@@ -63,7 +58,7 @@ public static function fromArray(array $array): self
 
         return new self(
             workspaceName: $array['workspaceName'],
-            dimensionValues: $array['dimensionValues'],
+            dimensionValues: $array['dimensionValues'] ?? [],
             treeNodeId: NodeAggregateIdentifier::fromString($array['treeNodeId']),
             nodeTypeFilter: $array['nodeTypeFilter'] ?? '',
             linkableNodeTypes: NodeTypeNames::fromArray($array['linkableNodeTypes'] ?? []),

diff --git a/Classes/Application/GetNodeSummary/GetNodeSummaryQuery.php b/Classes/Application/GetNodeSummary/GetNodeSummaryQuery.php
@@ -41,19 +41,14 @@ public static function fromArray(array $array): self
         is_string($array['workspaceName'])
             or throw new \InvalidArgumentException('Workspace name must be a string');
 
-        isset($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be set');
-        is_array($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be an array');
-
         isset($array['nodeId'])
             or throw new \InvalidArgumentException('Node id must be set');
         is_string($array['nodeId'])
             or throw new \InvalidArgumentException('Node id must be a string');
 
         return new self(
             workspaceName: $array['workspaceName'],
-            dimensionValues: $array['dimensionValues'],
+            dimensionValues: $array['dimensionValues'] ?? [],
             nodeId: NodeAggregateIdentifier::fromString($array['nodeId']),
         );
     }

diff --git a/Classes/Application/GetTree/GetTreeQuery.php b/Classes/Application/GetTree/GetTreeQuery.php
@@ -50,11 +50,6 @@ public static function fromArray(array $array): self
         is_string($array['workspaceName'])
             or throw new \InvalidArgumentException('Workspace name must be a string');
 
-        isset($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be set');
-        is_array($array['dimensionValues'])
-            or throw new \InvalidArgumentException('Dimension values must be an array');
-
         isset($array['startingPoint'])
             or throw new \InvalidArgumentException('Starting point must be set');
         is_string($array['startingPoint'])
@@ -85,7 +80,7 @@ public static function fromArray(array $array): self
 
         return new self(
             workspaceName: $array['workspaceName'],
-            dimensionValues: $array['dimensionValues'],
+            dimensionValues: $array['dimensionValues'] ?? [],
             startingPoint: NodePath::fromString($array['startingPoint']),
             loadingDepth: $array['loadingDepth'],
             baseNodeTypeFilter: $array['baseNodeTypeFilter'] ?? '',