Merge pull request #849 from erikn69/port-831

Merge v13 fixes into v14 branch
owen-it · Aug 24, 2023 · 11d56a4 · 11d56a4
2 parents a04093f + 6d53320
commit 11d56a4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
         }
     },
     "suggest": {
-        "laravelista/lumen-vendor-publish": "Needed to publish the package configuration in Lumen"
+        "irazasyed/larasupport": "Needed to publish the package configuration in Lumen"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/Auditor.php b/src/Auditor.php
@@ -55,7 +55,7 @@ public function auditDriver(Auditable $model): AuditDriver
     /**
      * {@inheritdoc}
      */
-    public function execute(Auditable $model)
+    public function execute(Auditable $model): void
     {
         if (! $model->readyForAuditing()) {
             return;

diff --git a/src/Concerns/AuditsPivotRecords.php b/src/Concerns/AuditsPivotRecords.php
@@ -23,11 +23,11 @@ public function auditAttach(string $relationName, $id, array $attributes = [], $
         $this->auditEvent = 'attach';
         $this->isCustomEvent = true;
         $this->auditCustomOld = [
-            $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+            $relationName => $this->{$relationName}()->get()->toArray(),
         ];
         $this->{$relationName}()->attach($id, $attributes, $touch);
         $this->auditCustomNew = [
-            $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+            $relationName => $this->{$relationName}()->get()->toArray(),
         ];
         Event::dispatch(AuditCustom::class, [$this]);
         $this->isCustomEvent = false;
@@ -49,11 +49,11 @@ public function auditDetach(string $relationName, $ids = null, $touch = true)
         $this->auditEvent = 'detach';
         $this->isCustomEvent = true;
         $this->auditCustomOld = [
-            $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+            $relationName => $this->{$relationName}()->get()->toArray(),
         ];
         $results = $this->{$relationName}()->detach($ids, $touch);
         $this->auditCustomNew = [
-            $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+            $relationName => $this->{$relationName}()->get()->toArray(),
         ];
         Event::dispatch(AuditCustom::class, [$this]);
         $this->isCustomEvent = false;
@@ -78,7 +78,7 @@ public function auditSync($relationName, $ids, $detaching = true)
         $this->auditEvent = 'sync';
 
         $this->auditCustomOld = [
-            $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+            $relationName => $this->{$relationName}()->get()->toArray(),
         ];
 
         $changes = $this->{$relationName}()->sync($ids, $detaching);
@@ -88,7 +88,7 @@ public function auditSync($relationName, $ids, $detaching = true)
             $this->auditCustomNew = [];
         } else {
             $this->auditCustomNew = [
-                $relationName => $this->{$relationName}()->get()->isEmpty() ? [] : $this->{$relationName}()->get()->toArray(),
+                $relationName => $this->{$relationName}()->get()->toArray(),
             ];
         }
 

diff --git a/src/Concerns/DeterminesAttributesToAudit.php b/src/Concerns/DeterminesAttributesToAudit.php
@@ -30,7 +30,12 @@ protected function resolveAuditExclusions(): array
 
             // Exclude Timestamps
             if (! $this->shouldAuditTimestamps()) {
-                array_push($excludedAttributes, $this->getCreatedAtColumn(), $this->getUpdatedAtColumn());
+                if ($this->getCreatedAtColumn()) {
+                    $excludedAttributes[] = $this->getCreatedAtColumn();
+                }
+                if ($this->getUpdatedAtColumn()) {
+                    $excludedAttributes[] = $this->getUpdatedAtColumn();
+                }
                 if (method_exists($this, 'getDeletedAtColumn')) {
                     $excludedAttributes[] = $this->getDeletedAtColumn();
                 }