RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

#6759 avoiding reuse of the $identifier variable when constructing an identifier from the owning side value

Browse Source 
Fixes #6759
This commit is contained in:
Marco Pivetta 2017-10-07 12:54:36 +02:00
parent 83e00d5010
commit dd12ba88ee
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -792,6 +792,8 @@ class BasicEntityPersister implements EntityPersister
$sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']); $sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']);
$owningAssoc = $targetClass->getAssociationMapping($assoc['mappedBy']); $owningAssoc = $targetClass->getAssociationMapping($assoc['mappedBy']);
$computedIdentifier = [];
// TRICKY: since the association is specular source and target are flipped // TRICKY: since the association is specular source and target are flipped
foreach ($owningAssoc['targetToSourceKeyColumns'] as $sourceKeyColumn => $targetKeyColumn) { foreach ($owningAssoc['targetToSourceKeyColumns'] as $sourceKeyColumn => $targetKeyColumn) {
if ( ! isset($sourceClass->fieldNames[$sourceKeyColumn])) { if ( ! isset($sourceClass->fieldNames[$sourceKeyColumn])) {
@ -802,13 +804,11 @@ class BasicEntityPersister implements EntityPersister
// unset the old value and set the new sql aliased value here. By definition // unset the old value and set the new sql aliased value here. By definition
// unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method. // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method.
$identifier[$targetClass->getFieldForColumn($targetKeyColumn)] = $computedIdentifier[$targetClass->getFieldForColumn($targetKeyColumn)] =
$sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity); $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
unset($identifier[$targetKeyColumn]);
} }
$targetEntity = $this->load($identifier, null, $assoc); $targetEntity = $this->load($computedIdentifier, null, $assoc);
if ($targetEntity !== null) { if ($targetEntity !== null) {
$targetClass->setFieldValue($targetEntity, $assoc['mappedBy'], $sourceEntity); $targetClass->setFieldValue($targetEntity, $assoc['mappedBy'], $sourceEntity);