Merge pull request #104 from Roxayl/bugfix/null-created-updated-fields

Fix model with no updated_at or deleted_at columns
mpociot · Mar 3, 2024 · 5b2786d · 5b2786d
2 parents 9af7957 + 8ee3c20
commit 5b2786d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Mpociot/Versionable/VersionableTrait.php b/src/Mpociot/Versionable/VersionableTrait.php
@@ -263,11 +263,13 @@ private function purgeOldVersions()
      */
     private function isValidForVersioning()
     {
-        $dontVersionFields = isset( $this->dontVersionFields ) ? $this->dontVersionFields : [];
-        $removeableKeys    = array_merge($dontVersionFields, [$this->getUpdatedAtColumn()]);
+        $removeableKeys = isset( $this->dontVersionFields ) ? $this->dontVersionFields : [];
+        if (($updatedAt = $this->getUpdatedAtColumn()) !== null) {
+            $removeableKeys[] = $updatedAt;
+        }
 
-        if (method_exists($this, 'getDeletedAtColumn')) {
-            $removeableKeys[] = $this->getDeletedAtColumn();
+        if (method_exists($this, 'getDeletedAtColumn') && ($deletedAt = $this->getDeletedAtColumn() !== null)) {
+            $removeableKeys[] = $deletedAt;
         }
 
         return ( count(array_diff_key($this->versionableDirtyData, array_flip($removeableKeys))) > 0 );