allow ManyToMany associations with referenced column name different from 'id'

src/AuditReader.php

@@ -1022,7 +1022,7 @@ private function createEntity($className, array $columnMap, array $data, $revisi
                     foreach (self::getRelationToSourceKeyColumns($assoc) as $sourceKeyJoinColumn => $sourceKeyColumn) {
                         $whereId[] = "{$sourceKeyJoinColumn} = ?";
 
-                        $reflField = $classMetadata->reflFields['id'];
+                        $reflField = $classMetadata->getSingleIdReflectionProperty();
                         \assert(null !== $reflField);
 
                         $values[] = $reflField->getValue($entity);
@@ -1110,7 +1110,7 @@ private function createEntity($className, array $columnMap, array $data, $revisi
                         )) {
                         foreach ($targetAssoc['relationToTargetKeyColumns'] as $targetKeyJoinColumn => $targetKeyColumn) {
                             $whereId[] = "{$targetKeyJoinColumn} = ?";
-                            $reflField = $classMetadata->reflFields['id'];
+                            $reflField = $classMetadata->getSingleIdReflectionProperty();
                             \assert(null !== $reflField);
                             $values[] = $reflField->getValue($entity);
                         }

tests/Fixtures/Relation/ManyToManyMultipleRelationshipCustomIdNamedEntity.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sonata\EntityAuditBundle\Tests\Fixtures\Relation;
+
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class ManyToManyMultipleRelationshipCustomIdNamedEntity extends ManyToManyMultipleRelationshipEntity
+{
+    /**
+     * @var int|null
+     */
+    #[ORM\Id]
+    #[ORM\Column(name: 'strange_owned_id_name', type: Types::INTEGER)]
+    #[ORM\GeneratedValue]
+    protected $id;
+}

tests/RelationTest.php

@@ -22,6 +22,7 @@
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\DataLegalEntity;
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\DataPrivateEntity;
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\FoodCategory;
+use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\ManyToManyMultipleRelationshipCustomIdNamedEntity;
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\ManyToManyMultipleRelationshipEntity;
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\ManyToManyMultipleTargetEntity;
 use Sonata\EntityAuditBundle\Tests\Fixtures\Relation\OneToOneAuditedEntity;
@@ -67,6 +68,7 @@ final class RelationTest extends BaseTest
         DataLegalEntity::class,
         DataPrivateEntity::class,
         DataContainerEntity::class,
+        ManyToManyMultipleRelationshipCustomIdNamedEntity::class,
         ManyToManyMultipleRelationshipEntity::class,
         ManyToManyMultipleTargetEntity::class,
     ];
@@ -91,6 +93,7 @@ final class RelationTest extends BaseTest
         DataLegalEntity::class,
         DataPrivateEntity::class,
         DataContainerEntity::class,
+        ManyToManyMultipleRelationshipCustomIdNamedEntity::class,
         ManyToManyMultipleRelationshipEntity::class,
         ManyToManyMultipleTargetEntity::class,
     ];
@@ -379,12 +382,24 @@ public function testManyToManyMultipleRelationshipSameTargetEntity(): void
         $manyToMany->addPrimaryTarget($targetOne);
         $manyToMany->addSecondaryTarget($targetTwo);
 
+        $targetThree = new ManyToManyMultipleTargetEntity();
+        $targetFour = new ManyToManyMultipleTargetEntity();
+
+        $manyToManyWithCustomNameOfIdColumn = new ManyToManyMultipleRelationshipCustomIdNamedEntity();
+        $manyToManyWithCustomNameOfIdColumn->setTitle('manyToMany#2');
+        $manyToManyWithCustomNameOfIdColumn->addPrimaryTarget($targetThree);
+        $manyToManyWithCustomNameOfIdColumn->addSecondaryTarget($targetFour);
+
         $em->persist($targetOne);
         $em->persist($targetTwo);
+        $em->persist($targetThree);
+        $em->persist($targetFour);
         $em->persist($manyToMany);
+        $em->persist($manyToManyWithCustomNameOfIdColumn);
 
-        $em->flush(); // #1
+        $em->flush(); // #1 + #2
 
+        // manyToMany#1
         $manyToManyId = $manyToMany->getId();
         static::assertNotNull($manyToManyId);
 
@@ -399,6 +414,26 @@ public function testManyToManyMultipleRelationshipSameTargetEntity(): void
         // ensure that there is an audited entry for the secondaryTargets property
         static::assertInstanceOf(Collection::class, $audited->getSecondaryTargets());
         static::assertCount(1, $audited->getSecondaryTargets());
+
+        // manyToMany#2
+        $manyToManyId = $manyToManyWithCustomNameOfIdColumn->getId();
+        static::assertNotNull($manyToManyId);
+
+        $audited = $auditReader->find(
+            ManyToManyMultipleRelationshipCustomIdNamedEntity::class,
+            $manyToManyId,
+            1
+        );
+
+        static::assertNotNull($audited);
+
+        // ensure that there is an audited entry for the primaryTargets property
+        static::assertInstanceOf(Collection::class, $audited->getPrimaryTargets());
+        static::assertCount(1, $audited->getPrimaryTargets());
+
+        // ensure that there is an audited entry for the secondaryTargets property
+        static::assertInstanceOf(Collection::class, $audited->getSecondaryTargets());
+        static::assertCount(1, $audited->getSecondaryTargets());
     }
 
     /**