| @@ -162,14 +162,16 @@ | ||
| 162 | 162 | * @return mixed[] |
| 163 | 163 | */ |
| 164 | 164 | private function buildCoreFieldSettings(array $data, bool $forUpdate): array |
| 165 | 165 | { |
| 166 | - return [ | |
| 167 | - ...$this->buildBaseFieldSettings($data), | |
| 168 | - 'limitRange' => $this->resolveLimitRangeFlag($data, $forUpdate), | |
| 169 | - 'visible' => $this->resolveVisibleFlag($data, $forUpdate), | |
| 170 | - ...$this->buildExtendedFieldSettings($data), | |
| 171 | - ]; | |
| 166 | + return array_merge( | |
| 167 | + $this->buildBaseFieldSettings($data), | |
| 168 | + [ | |
| 169 | + 'limitRange' => $this->resolveLimitRangeFlag($data, $forUpdate), | |
| 170 | + 'visible' => $this->resolveVisibleFlag($data, $forUpdate), | |
| 171 | + ], | |
| 172 | + $this->buildExtendedFieldSettings($data) | |
| 173 | + ); | |
| 172 | 174 | } |
| 173 | 175 | |
| 174 | 176 | /** |
| 175 | 177 | * @param mixed[] $data |
