refactor: Update enum handling in LogsActivity for Laravel 11 compati…

…bility
spatie · Mar 8, 2024 · af305c9 · af305c9
1 parent 2caf20d
commit af305c9
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/Traits/LogsActivity.php b/src/Traits/LogsActivity.php
@@ -366,14 +366,13 @@ public static function logChanges(Model $model): array
             if ($model->hasCast($attribute)) {
                 $cast = $model->getCasts()[$attribute];
 
-                if (function_exists('enum_exists') && enum_exists($cast)) {
-                    if (method_exists($model, 'getStorableEnumValue')) {
+                if ($model->isEnumCastable($attribute)) {
+                    try {
                         $changes[$attribute] = $model->getStorableEnumValue($changes[$attribute]);
-                    } else {
-                        // ToDo: DEPRECATED - only here for Laravel 8 support
-                        $changes[$attribute] = $changes[$attribute] instanceof \BackedEnum
-                            ? $changes[$attribute]->value
-                            : $changes[$attribute]->name;
+                    } catch (\ArgumentCountError $e) {
+                        // In Laravel 11, this method has an extra argument
+                        // https://github.com/laravel/framework/pull/47465
+                        $changes[$attribute] = $model->getStorableEnumValue($cast, $changes[$attribute]);
                     }
                 }