[Grid] [Data Objects] make Group optional. (#872)

* [Grid] [Column] Update getGroup method to allow null return type and add validation in GridService * Apply php-cs-fixer changes --------- Co-authored-by: martineiber <11687066+martineiber@users.noreply.github.com>
pimcore · Mar 6, 2025 · cd3a8a1 · cd3a8a1
1 parent 700af31
commit cd3a8a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Grid/Schema/Column.php b/src/Grid/Schema/Column.php
@@ -61,7 +61,7 @@ public function getType(): string
         return $this->type;
     }
 
-    public function getGroup(): string
+    public function getGroup(): ?string
     {
         return $this->group;
     }

diff --git a/src/Grid/Service/GridService.php b/src/Grid/Service/GridService.php
@@ -215,6 +215,10 @@ public function getColumnKeys(ColumnCollection $columnCollection, bool $withGrou
     {
         return array_map(
             static function (Column $column) use ($withGroup) {
+                if (!$column->getGroup()) {
+                    throw new InvalidArgumentException('Group must be set when withGroup is true');
+                }
+
                 return $column->getKey() . ($withGroup ? '~' . $column->getGroup() : '');
             },
             $columnCollection->getColumns()