Merge pull request #29 from markusreis-yd/main

__clone method called on non-object
Stillat · Nov 27, 2023 · e6b30e2 · e6b30e2
2 parents 8e3570d + a220568
commit e6b30e2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Listeners/BaseListener.php b/src/Listeners/BaseListener.php
@@ -9,9 +9,10 @@ abstract class BaseListener
     protected function checkForDatabaseObject($object)
     {
         if ($object instanceof User || (method_exists($object, 'model') && method_exists($object, 'toModel'))) {
-            $object = $object->model();
+            // If model() returns null (eg. on create), fallback to $object, as `clone null` will throw an exception
+            $object = $object->model() ?: $object;
         }
 
         return clone $object;
     }
-}
+}