[GH-6394] Bugfix: BasicEntityPersister::update used wrong identifiers for version assignment.

beberlei · beberlei · commit 59dadf6d6dd9 · 2020-12-08T03:44:07.000+01:00
diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -394,7 +394,7 @@ public function update($entity)
         $this->updateTable($entity, $quotedTableName, $data, $isVersioned);
 
         if ($isVersioned) {
-            $id = $this->em->getUnitOfWork()->getEntityIdentifier($entity);
+            $id = $this->class->getIdentifierValues($entity);
 
             $this->assignDefaultVersionValue($entity, $id);
         }
diff --git a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
@@ -71,15 +71,13 @@ public function flattenIdentifier(ClassMetadata $class, array $id)
         $flatId = [];
 
         foreach ($class->identifier as $field) {
-            if (isset($class->associationMappings[$field]) && isset($id[$field])) {
+            if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
                 /* @var $targetClassMetadata ClassMetadata */
                 $targetClassMetadata = $this->metadataFactory->getMetadataFor(
                     $class->associationMappings[$field]['targetEntity']
                 );
 
-                if (!is_object($id[$field])) {
-                    $associatedId = [$id[$field]];
-                } elseif ($this->unitOfWork->isInIdentityMap($id[$field])) {
+                if ($this->unitOfWork->isInIdentityMap($id[$field])) {
                     $associatedId = $this->flattenIdentifier($targetClassMetadata, $this->unitOfWork->getEntityIdentifier($id[$field]));
                 } else {
                     $associatedId = $this->flattenIdentifier($targetClassMetadata, $targetClassMetadata->getIdentifierValues($id[$field]));

Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ public function update($entity)`
`394`	`394`	`$this->updateTable($entity, $quotedTableName, $data, $isVersioned);`
`395`	`395`
`396`	`396`	`if ($isVersioned) {`
`397`		`- $id = $this->em->getUnitOfWork()->getEntityIdentifier($entity);`
	`397`	`+ $id = $this->class->getIdentifierValues($entity);`
`398`	`398`
`399`	`399`	`$this->assignDefaultVersionValue($entity, $id);`
`400`	`400`	`}`