RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

#6303 #6304 documenting why collisions in field name hydration in STI/JTI require additional information and checks in the hydration process

Browse Source
This commit is contained in:
Marco Pivetta 2017-08-19 18:30:33 +02:00
parent 4cbcdb761a
commit 44f2e22f14
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View File

@ -294,6 +294,8 @@ abstract class AbstractHydrator
$dqlAlias = $cacheKeyInfo['dqlAlias']; $dqlAlias = $cacheKeyInfo['dqlAlias'];
$type = $cacheKeyInfo['type']; $type = $cacheKeyInfo['type'];
// If there are field name collisions in the child class, then we need
// to only hydrate if we are looking at the correct discriminator value
if( if(
isset($cacheKeyInfo['discriminatorColumn']) && isset($cacheKeyInfo['discriminatorColumn']) &&
isset($data[$cacheKeyInfo['discriminatorColumn']]) && isset($data[$cacheKeyInfo['discriminatorColumn']]) &&
@ -392,7 +394,9 @@ abstract class AbstractHydrator
'dqlAlias' => $ownerMap, 'dqlAlias' => $ownerMap,
]; ];
if($classMetadata->parentClasses && isset($this->_rsm->discriminatorColumns[$ownerMap])) { // the current discriminator value must be saved in order to disambiguate fields hydration,
// should there be field name collisions
if ($classMetadata->parentClasses && isset($this->_rsm->discriminatorColumns[$ownerMap])) {
return $this->_cache[$key] = \array_merge( return $this->_cache[$key] = \array_merge(
$columnInfo, $columnInfo,
[ [