|
|
@@ -1407,12 +1407,11 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
|
|
|
['keyField', 'valueField', 'groupField']
|
|
|
);
|
|
|
|
|
|
- return $query->formatResults(fn (CollectionInterface $results) =>
|
|
|
- $results->combine(
|
|
|
- $options['keyField'],
|
|
|
- $options['valueField'],
|
|
|
- $options['groupField']
|
|
|
- ));
|
|
|
+ return $query->formatResults(fn (CollectionInterface $results) => $results->combine(
|
|
|
+ $options['keyField'],
|
|
|
+ $options['valueField'],
|
|
|
+ $options['groupField']
|
|
|
+ ));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -1447,8 +1446,11 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
|
|
|
|
|
|
$options = $this->_setFieldMatchers(compact('keyField', 'parentField'), ['keyField', 'parentField']);
|
|
|
|
|
|
- return $query->formatResults(fn (CollectionInterface $results) =>
|
|
|
- $results->nest($options['keyField'], $options['parentField'], $nestingKey));
|
|
|
+ return $query->formatResults(fn (CollectionInterface $results) => $results->nest(
|
|
|
+ $options['keyField'],
|
|
|
+ $options['parentField'],
|
|
|
+ $nestingKey
|
|
|
+ ));
|
|
|
}
|
|
|
|
|
|
/**
|