🐛 fix for cannot unpack array with string keys

yungts97 · Oct 2, 2022 · 9cd9981 · 9cd9981
1 parent f0518ed
commit 9cd9981
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Traits/ListenerTraits/HasData.php b/src/Traits/ListenerTraits/HasData.php
@@ -13,7 +13,7 @@ protected function getData()
 
         $mode = config("user-activity-log.mode", 'simple');
         return $this->event_name === 'edit' && $mode === 'simple' ?
-            Arr::except([...$this->event->model->getChanges(), 'id' => $this->event->model->id], $this->event->model->log_hidden ?? []) :
+            Arr::except(array_merge($this->event->model->getChanges(), ['id' => $this->event->model->id]), $this->event->model->log_hidden ?? []) :
             Arr::except($this->event->model->getRawOriginal(), $this->event->model->log_hidden ?? []);
     }
 }
diff --git a/tests/Feature/UserActivityLogTest.php b/tests/Feature/UserActivityLogTest.php
@@ -190,7 +190,7 @@ function it_can_log_on_edit_event_with_simple_mode()
 
         //since the latest log is edit type, so just simply use latest log to test
         $actualLogData = $newPost->log->data;
-        $expectedLogData = [...$newPost->getChanges(), 'id' => $newPost->id];
+        $expectedLogData = array_merge($newPost->getChanges(), ['id' => $newPost->id]);
         $this->assertTrue($expectedLogData == $actualLogData);
     }