Skip to content

Commit a53d881

Browse files
authored
[10.x] Use match expression in getArrayableItems (#47549)
1 parent 32bb133 commit a53d881

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

src/Illuminate/Collections/Traits/EnumeratesValues.php

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -972,21 +972,17 @@ protected function getArrayableItems($items)
972972
{
973973
if (is_array($items)) {
974974
return $items;
975-
} elseif ($items instanceof Enumerable) {
976-
return $items->all();
977-
} elseif ($items instanceof Arrayable) {
978-
return $items->toArray();
979-
} elseif ($items instanceof Traversable) {
980-
return iterator_to_array($items);
981-
} elseif ($items instanceof Jsonable) {
982-
return json_decode($items->toJson(), true);
983-
} elseif ($items instanceof JsonSerializable) {
984-
return (array) $items->jsonSerialize();
985-
} elseif ($items instanceof UnitEnum) {
986-
return [$items];
987975
}
988976

989-
return (array) $items;
977+
return match (true) {
978+
$items instanceof Enumerable => $items->all(),
979+
$items instanceof Arrayable => $items->toArray(),
980+
$items instanceof Traversable => iterator_to_array($items),
981+
$items instanceof Jsonable => json_decode($items->toJson(), true),
982+
$items instanceof JsonSerializable => (array) $items->jsonSerialize(),
983+
$items instanceof UnitEnum => [$items],
984+
default => (array) $items,
985+
};
990986
}
991987

992988
/**

0 commit comments

Comments
 (0)