Skip to content

Commit 053707c

Browse files
authored
Merge pull request #4932 from Kovah/backed-enums-fix
Correctly use values of backed enums for options (#4929)
2 parents b7ef325 + 4ed7bd8 commit 053707c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/resources/views/crud/fields/enum.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
2020
// developer can provide the enum class so that we extract the available options from it
21-
$enumClassReflection = isset($field['enum_class']) ? new \ReflectionEnum($field['enum_class']) : false;
21+
$enumClassReflection = isset($field['enum_class']) ? new \ReflectionEnum($field['enum_class']) : false;
2222
2323
if(! $enumClassReflection) {
2424
// check for model casting
@@ -27,12 +27,12 @@
2727
$enumClassReflection = new \ReflectionEnum($possibleEnumCast);
2828
}
2929
}
30-
30+
3131
if($enumClassReflection) {
3232
$options = array_map(function($item) use ($enumClassReflection) {
3333
return $enumClassReflection->isBacked() ? [$item->getBackingValue() => $item->name] : $item->name;
3434
},$enumClassReflection->getCases());
35-
$options = is_multidimensional_array($options) ? array_merge(...$options) : array_combine($options, $options);
35+
$options = is_multidimensional_array($options) ? array_replace(...$options) : array_combine($options, $options);
3636
}
3737
3838
if(isset($field['enum_function']) && isset($options)) {
@@ -54,7 +54,7 @@
5454
$options = $entity_model::getPossibleEnumValues($field['name']);
5555
return array_combine($options, $options);
5656
})();
57-
57+
5858
5959
if(function_exists('enum_exists') && !empty($field['value']) && $field['value'] instanceof \UnitEnum) {
6060
$field['value'] = $field['value'] instanceof \BackedEnum ? $field['value']->value : $field['value']->name;

0 commit comments

Comments
 (0)