Skip to content

Commit bcabab2

Browse files
committed
fix: phpstan issues
1 parent 8bcf8b9 commit bcabab2

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/Fields/RichEditor.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ public static function mutateBeforeSaveCallback(Model $record, Field $field, arr
124124

125125
private static function ensureRichEditorDataFormat(Model $record, Field $field, array $data): array
126126
{
127+
$valueColumn = $record->valueColumn ?? 'values';
127128
$data = self::normalizeContentResourceValue($data, $field);
128-
$data = self::normalizeDynamicFieldValue($record, $data, $field);
129+
$data = self::normalizeDynamicFieldValue($record, $data, $field, $valueColumn);
129130

130131
return $data;
131132
}
@@ -139,10 +140,10 @@ private static function normalizeContentResourceValue(array $data, Field $field)
139140
return $data;
140141
}
141142

142-
private static function normalizeDynamicFieldValue(Model $record, array $data, Field $field): array
143+
private static function normalizeDynamicFieldValue(Model $record, array $data, Field $field, string $valueColumn): array
143144
{
144-
if (isset($data[$record->valueColumn][$field->ulid]) && empty($data[$record->valueColumn][$field->ulid])) {
145-
$data[$record->valueColumn][$field->ulid] = '';
145+
if (isset($data[$valueColumn][$field->ulid]) && empty($data[$valueColumn][$field->ulid])) {
146+
$data[$valueColumn][$field->ulid] = '';
146147
}
147148

148149
return $data;
@@ -153,7 +154,8 @@ public static function mutateFormDataCallback(Model $record, Field $field, array
153154
$rawValue = self::getFieldValueFromRecord($record, $field);
154155

155156
if ($rawValue !== null) {
156-
$data[$record->valueColumn][$field->ulid] = $rawValue;
157+
$valueColumn = $record->valueColumn ?? 'values';
158+
$data[$valueColumn][$field->ulid] = $rawValue;
157159
}
158160

159161
return $data;
@@ -162,7 +164,7 @@ public static function mutateFormDataCallback(Model $record, Field $field, array
162164
private static function getFieldValueFromRecord(Model $record, Field $field): mixed
163165
{
164166
// Check if record has values method
165-
if (!method_exists($record, 'values') || !is_callable([$record, 'values'])) {
167+
if (!method_exists($record, 'values')) {
166168
return null;
167169
}
168170

0 commit comments

Comments
 (0)