From 9cd9981f67c2fbc1ba4ba3d88bb06b1b262ec81d Mon Sep 17 00:00:00 2001 From: Yung Teck Sheng Date: Sun, 2 Oct 2022 16:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20for=20cannot=20unpack=20ar?= =?UTF-8?q?ray=20with=20string=20keys?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Traits/ListenerTraits/HasData.php | 2 +- tests/Feature/UserActivityLogTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Traits/ListenerTraits/HasData.php b/src/Traits/ListenerTraits/HasData.php index 4a0d375..49ef870 100644 --- 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 index 8dfbe72..cec9e48 100644 --- 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); }