From 3f490c960cf842aba08f734f548f9bfac9631339 Mon Sep 17 00:00:00 2001
From: Chris Brown <code@drbyte.dev>
Date: Thu, 30 Nov 2023 18:35:54 -0500
Subject: [PATCH] Fix deprecated enum::tryFrom(null) in PHP 8.3

Fixes #9706
---
 .../actions/resources/views/components/actions.blade.php    | 2 +-
 packages/forms/resources/views/components/actions.blade.php | 2 +-
 .../forms/resources/views/components/file-upload.blade.php  | 2 +-
 .../infolists/resources/views/components/actions.blade.php  | 2 +-
 .../views/components/entry-wrapper/index.blade.php          | 2 +-
 packages/support/resources/views/components/badge.blade.php | 6 +++---
 .../resources/views/components/button/index.blade.php       | 6 +++---
 .../resources/views/components/icon-button.blade.php        | 4 ++--
 packages/support/resources/views/components/link.blade.php  | 6 +++---
 .../resources/views/components/modal/index.blade.php        | 4 ++--
 .../support/resources/views/components/tabs/item.blade.php  | 2 +-
 .../tables/resources/views/columns/layout/stack.blade.php   | 2 +-
 .../resources/views/columns/text-input-column.blade.php     | 2 +-
 .../tables/resources/views/components/actions.blade.php     | 2 +-
 .../resources/views/components/columns/column.blade.php     | 2 +-
 .../tables/resources/views/components/header-cell.blade.php | 2 +-
 .../resources/views/components/summary/index.blade.php      | 2 +-
 .../tables/resources/views/components/summary/row.blade.php | 2 +-
 18 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/actions/resources/views/components/actions.blade.php b/packages/actions/resources/views/components/actions.blade.php
index 71fd3f39cf..e041665c8d 100644
--- a/packages/actions/resources/views/components/actions.blade.php
+++ b/packages/actions/resources/views/components/actions.blade.php
@@ -18,7 +18,7 @@
         );
 
         if (! $alignment instanceof Alignment) {
-            $alignment = Alignment::tryFrom($alignment) ?? $alignment;
+            $alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
         }
     @endphp
 
diff --git a/packages/forms/resources/views/components/actions.blade.php b/packages/forms/resources/views/components/actions.blade.php
index 6e18fed02c..ea45c3eb8a 100644
--- a/packages/forms/resources/views/components/actions.blade.php
+++ b/packages/forms/resources/views/components/actions.blade.php
@@ -4,7 +4,7 @@
     $verticalAlignment = $getVerticalAlignment();
 
     if (! $verticalAlignment instanceof VerticalAlignment) {
-        $verticalAlignment = VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment;
+        $verticalAlignment = filled($verticalAlignment) ? (VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment) : null;
     }
 @endphp
 
diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php
index 15fb9f0dbb..66db45fbbd 100644
--- a/packages/forms/resources/views/components/file-upload.blade.php
+++ b/packages/forms/resources/views/components/file-upload.blade.php
@@ -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
 
diff --git a/packages/infolists/resources/views/components/actions.blade.php b/packages/infolists/resources/views/components/actions.blade.php
index add7364bf9..501a62eb4d 100644
--- a/packages/infolists/resources/views/components/actions.blade.php
+++ b/packages/infolists/resources/views/components/actions.blade.php
@@ -4,7 +4,7 @@
     $verticalAlignment = $getVerticalAlignment();
 
     if (! $verticalAlignment instanceof VerticalAlignment) {
-        $verticalAlignment = VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment;
+        $verticalAlignment = filled($verticalAlignment) ? (VerticalAlignment::tryFrom($verticalAlignment) ?? $verticalAlignment) : null;
     }
 @endphp
 
diff --git a/packages/infolists/resources/views/components/entry-wrapper/index.blade.php b/packages/infolists/resources/views/components/entry-wrapper/index.blade.php
index a923f2b9f6..cb5a54f3bd 100644
--- a/packages/infolists/resources/views/components/entry-wrapper/index.blade.php
+++ b/packages/infolists/resources/views/components/entry-wrapper/index.blade.php
@@ -43,7 +43,7 @@
     }
 
     if (! $alignment instanceof Alignment) {
-        $alignment = Alignment::tryFrom($alignment) ?? $alignment;
+        $alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
     }
 
     $hintActions = array_filter(
diff --git a/packages/support/resources/views/components/badge.blade.php b/packages/support/resources/views/components/badge.blade.php
index e1836d2263..0ced64f3a1 100644
--- a/packages/support/resources/views/components/badge.blade.php
+++ b/packages/support/resources/views/components/badge.blade.php
@@ -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;
diff --git a/packages/support/resources/views/components/button/index.blade.php b/packages/support/resources/views/components/button/index.blade.php
index dac5d60dc8..95d0a2141a 100644
--- a/packages/support/resources/views/components/button/index.blade.php
+++ b/packages/support/resources/views/components/button/index.blade.php
@@ -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([
diff --git a/packages/support/resources/views/components/icon-button.blade.php b/packages/support/resources/views/components/icon-button.blade.php
index f2a668eb20..acec40d705 100644
--- a/packages/support/resources/views/components/icon-button.blade.php
+++ b/packages/support/resources/views/components/icon-button.blade.php
@@ -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([
diff --git a/packages/support/resources/views/components/link.blade.php b/packages/support/resources/views/components/link.blade.php
index ce7af6b6d0..1ce6b52e22 100644
--- a/packages/support/resources/views/components/link.blade.php
+++ b/packages/support/resources/views/components/link.blade.php
@@ -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([
diff --git a/packages/support/resources/views/components/modal/index.blade.php b/packages/support/resources/views/components/modal/index.blade.php
index 3b591048c3..49d29dd4ae 100644
--- a/packages/support/resources/views/components/modal/index.blade.php
+++ b/packages/support/resources/views/components/modal/index.blade.php
@@ -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') {
diff --git a/packages/support/resources/views/components/tabs/item.blade.php b/packages/support/resources/views/components/tabs/item.blade.php
index ada0f19eb7..2bfe217317 100644
--- a/packages/support/resources/views/components/tabs/item.blade.php
+++ b/packages/support/resources/views/components/tabs/item.blade.php
@@ -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);
diff --git a/packages/tables/resources/views/columns/layout/stack.blade.php b/packages/tables/resources/views/columns/layout/stack.blade.php
index 615fba6de2..a225c0bcd3 100644
--- a/packages/tables/resources/views/columns/layout/stack.blade.php
+++ b/packages/tables/resources/views/columns/layout/stack.blade.php
@@ -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
 
diff --git a/packages/tables/resources/views/columns/text-input-column.blade.php b/packages/tables/resources/views/columns/text-input-column.blade.php
index 144cd14322..63ad028985 100644
--- a/packages/tables/resources/views/columns/text-input-column.blade.php
+++ b/packages/tables/resources/views/columns/text-input-column.blade.php
@@ -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
 
diff --git a/packages/tables/resources/views/components/actions.blade.php b/packages/tables/resources/views/components/actions.blade.php
index 8a154208f7..460770d0e0 100644
--- a/packages/tables/resources/views/components/actions.blade.php
+++ b/packages/tables/resources/views/components/actions.blade.php
@@ -22,7 +22,7 @@
     );
 
     if (! $alignment instanceof Alignment) {
-        $alignment = Alignment::tryFrom($alignment) ?? $alignment;
+        $alignment = filled($alignment) ? (Alignment::tryFrom($alignment) ?? $alignment) : null;
     }
 @endphp
 
diff --git a/packages/tables/resources/views/components/columns/column.blade.php b/packages/tables/resources/views/components/columns/column.blade.php
index 0a164fbe52..5ddc04aba4 100644
--- a/packages/tables/resources/views/components/columns/column.blade.php
+++ b/packages/tables/resources/views/components/columns/column.blade.php
@@ -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([
diff --git a/packages/tables/resources/views/components/header-cell.blade.php b/packages/tables/resources/views/components/header-cell.blade.php
index 9aaaabc127..1ad3453fc3 100644
--- a/packages/tables/resources/views/components/header-cell.blade.php
+++ b/packages/tables/resources/views/components/header-cell.blade.php
@@ -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
 
diff --git a/packages/tables/resources/views/components/summary/index.blade.php b/packages/tables/resources/views/components/summary/index.blade.php
index c1e9aecdd9..cffd1d202f 100644
--- a/packages/tables/resources/views/components/summary/index.blade.php
+++ b/packages/tables/resources/views/components/summary/index.blade.php
@@ -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();
diff --git a/packages/tables/resources/views/components/summary/row.blade.php b/packages/tables/resources/views/components/summary/row.blade.php
index 2404d08446..2e2accad3f 100644
--- a/packages/tables/resources/views/components/summary/row.blade.php
+++ b/packages/tables/resources/views/components/summary/row.blade.php
@@ -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