Merge pull request #1115 from stevebauman/fix-nullable-custom-propert…

…ies-php-80 Fix nullable custom properties in PHP 8.0
spatie · Nov 11, 2022 · 3619d82 · 3619d82
2 parents 89aee26 + 5642f39
commit 3619d82
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Actions/ResolveForPropertyValueAction.php b/src/Actions/ResolveForPropertyValueAction.php
@@ -34,6 +34,6 @@ protected function isValueAnEnum($value): bool
 
         $enumNamespace = is_object($value) ? get_class($value) : $value;
 
-        return ! is_array($value) && enum_exists($enumNamespace);
+        return ! is_array($value) && is_string($enumNamespace) && enum_exists($enumNamespace);
     }
 }
diff --git a/tests/ActivityLoggerTest.php b/tests/ActivityLoggerTest.php
@@ -148,6 +148,21 @@
     expect($firstActivity->getExtraProperty('property.subProperty'))->toEqual('value');
 });
 
+it('can log activity with null properties', function () {
+    $properties = [
+        'property' => null,
+    ];
+
+    activity()
+        ->withProperties($properties)
+        ->log($this->activityDescription);
+
+    $firstActivity = Activity::first();
+
+    expect($firstActivity->properties)->toBeInstanceOf(Collection::class);
+    expect($firstActivity->getExtraProperty('property'))->toBeNull();
+});
+
 it('can log activity with a single properties', function () {
     activity()
         ->withProperty('key', 'value')