Fix deprecated enum::tryFrom(null) in PHP 8.3

Fixes #9706
This commit is contained in:
Chris Brown
2023-11-30 18:35:54 -05:00
parent d84f26cd90
commit 3f490c960c
18 changed files with 26 additions and 26 deletions
@@ -18,7 +18,7 @@
);
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -4,7 +4,7 @@
$verticalAlignment = $getVerticalAlignment();
if (! $verticalAlignment instanceof VerticalAlignment) {
$verticalAlignment = VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment;
$verticalAlignment = filled($verticalAlignment) ? (VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment) : null;
}
@endphp
@@ -14,7 +14,7 @@
$alignment = $getAlignment() ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -4,7 +4,7 @@
$verticalAlignment = $getVerticalAlignment();
if (! $verticalAlignment instanceof VerticalAlignment) {
$verticalAlignment = VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment;
$verticalAlignment = filled($verticalAlignment) ? (VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment) : null;
}
@endphp
@@ -43,7 +43,7 @@
}
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
$hintActions = array_filter(
@@ -25,15 +25,15 @@
@php
if (! $iconPosition instanceof IconPosition) {
$iconPosition = $iconPosition ? IconPosition::tryFrom($iconPosition) : null;
$iconPosition = filled($iconPosition) ? (IconPosition::tryFrom($iconPosition) ?? $iconPosition) : null;
}
if (! $size instanceof ActionSize) {
$size = ActionSize::tryFrom($size) ?? $size;
$size = filled($size) ? (ActionSize::tryFrom($size) ?? $size) : null;
}
if (! $iconSize instanceof IconSize) {
$iconSize = IconSize::tryFrom($iconSize) ?? $iconSize;
$iconSize = filled($iconSize) ? (IconSize::tryFrom($iconSize) ?? $iconSize) : null;
}
$isDeletable = count($deleteButton?->attributes->getAttributes() ?? []) > 0;
@@ -30,11 +30,11 @@
@php
if (! $iconPosition instanceof IconPosition) {
$iconPosition = $iconPosition ? IconPosition::tryFrom($iconPosition) : null;
$iconPosition = filled($iconPosition) ? (IconPosition::tryFrom($iconPosition) ?? $iconPosition) : null;
}
if (! $size instanceof ActionSize) {
$size = ActionSize::tryFrom($size) ?? $size;
$size = filled($size) ? (ActionSize::tryFrom($size) ?? $size) : null;
}
$iconSize ??= match ($size) {
@@ -43,7 +43,7 @@
};
if (! $iconSize instanceof IconSize) {
$iconSize = IconSize::tryFrom($iconSize) ?? $iconSize;
$iconSize = filled($iconSize) ? (IconSize::tryFrom($iconSize) ?? $iconSize) : null;
}
$buttonClasses = \Illuminate\Support\Arr::toCssClasses([
@@ -25,7 +25,7 @@
@php
if (! $size instanceof ActionSize) {
$size = ActionSize::tryFrom($size) ?? $size;
$size = filled($size) ? (ActionSize::tryFrom($size) ?? $size) : null;
}
$iconSize ??= match ($size) {
@@ -36,7 +36,7 @@
};
if (! $iconSize instanceof IconSize) {
$iconSize = IconSize::tryFrom($iconSize) ?? $iconSize;
$iconSize = filled($iconSize) ? (IconSize::tryFrom($iconSize) ?? $iconSize) : null;
}
$buttonClasses = \Illuminate\Support\Arr::toCssClasses([
@@ -26,11 +26,11 @@
@php
if (! $iconPosition instanceof IconPosition) {
$iconPosition = $iconPosition ? IconPosition::tryFrom($iconPosition) : null;
$iconPosition = filled($iconPosition) ? (IconPosition::tryFrom($iconPosition) ?? $iconPosition) : null;
}
if (! $size instanceof ActionSize) {
$size = ActionSize::tryFrom($size) ?? $size;
$size = filled($size) ? (ActionSize::tryFrom($size) ?? $size) : null;
}
$iconSize ??= match ($size) {
@@ -39,7 +39,7 @@
};
if (! $iconSize instanceof IconSize) {
$iconSize = IconSize::tryFrom($iconSize) ?? $iconSize;
$iconSize = filled($iconSize) ? (IconSize::tryFrom($iconSize) ?? $iconSize) : null;
}
$linkClasses = \Illuminate\Support\Arr::toCssClasses([
@@ -31,11 +31,11 @@
@php
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
if (! $footerActionsAlignment instanceof Alignment) {
$footerActionsAlignment = Alignment::tryFrom($footerActionsAlignment) ?? $footerActionsAlignment;
$footerActionsAlignment = filled($footerActionsAlignment) ? (Alignment::tryFrom($footerActionsAlignment) ?? $footerActionsAlignment) : null;
}
if ($width === 'screen') {
@@ -18,7 +18,7 @@
@php
if (! $iconPosition instanceof IconPosition) {
$iconPosition = $iconPosition ? IconPosition::tryFrom($iconPosition) : null;
$iconPosition = filled($iconPosition) ? (IconPosition::tryFrom($iconPosition) ?? $iconPosition) : null;
}
$hasAlpineActiveClasses = filled($alpineActive);
@@ -4,7 +4,7 @@
$alignment = $getAlignment() ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -8,7 +8,7 @@
$alignment = $getAlignment() ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -22,7 +22,7 @@
);
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -18,7 +18,7 @@
$url = $column->getUrl();
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
$columnClasses = \Illuminate\Support\Arr::toCssClasses([
@@ -13,7 +13,7 @@
$alignment = $alignment ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp
@@ -51,7 +51,7 @@
$alignment = $column->getAlignment() ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
$hasColumnHeaderLabel = (! $placeholderColumns) || $column->hasSummary();
@@ -72,7 +72,7 @@
$alignment = $column->getAlignment() ?? Alignment::Start;
if (! $alignment instanceof Alignment) {
$alignment = Alignment::tryFrom($alignment) ?? $alignment;
$alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
}
@endphp