From 657164b162e3552b25827aa8ffd6eb6eed7615ed Mon Sep 17 00:00:00 2001 From: Jan Klan <5463371+janklan@users.noreply.github.com> Date: Tue, 8 Mar 2022 18:58:45 +1030 Subject: [PATCH] Fix incorrect dissociation array destructuring (#92) * Fix incorrect dissociation array destructuring Fixes #91 * Add missing Entity ID to a tracked dissociation event Co-authored-by: Damien Harper --- .../Doctrine/Auditing/Transaction/TransactionHydrator.php | 1 + .../Doctrine/Auditing/Transaction/TransactionProcessor.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Provider/Doctrine/Auditing/Transaction/TransactionHydrator.php b/src/Provider/Doctrine/Auditing/Transaction/TransactionHydrator.php index b2b1d3fa..014b9a45 100644 --- a/src/Provider/Doctrine/Auditing/Transaction/TransactionHydrator.php +++ b/src/Provider/Doctrine/Auditing/Transaction/TransactionHydrator.php @@ -102,6 +102,7 @@ private function hydrateWithScheduledCollectionUpdates(Transaction $transaction, $transaction->trackAuditEvent(Transaction::DISSOCIATE, [ $collection->getOwner(), $entity, + $this->id($entityManager, $entity), $mapping, ]); } diff --git a/src/Provider/Doctrine/Auditing/Transaction/TransactionProcessor.php b/src/Provider/Doctrine/Auditing/Transaction/TransactionProcessor.php index 4a9be7be..e59df227 100644 --- a/src/Provider/Doctrine/Auditing/Transaction/TransactionProcessor.php +++ b/src/Provider/Doctrine/Auditing/Transaction/TransactionProcessor.php @@ -159,7 +159,7 @@ private function processAssociations(Transaction $transaction, EntityManagerInte private function processDissociations(Transaction $transaction, EntityManagerInterface $entityManager): void { - foreach ($transaction->getDissociated() as [$source, $target, $mapping]) { + foreach ($transaction->getDissociated() as [$source, $target, $id, $mapping]) { $this->dissociate($entityManager, $source, $target, $mapping, $transaction->getTransactionHash()); } }