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

#6303 #6304 removing += operator usage on arrays (scary\!), CS (alignment)

Browse Source
This commit is contained in:
Marco Pivetta 2017-08-19 16:02:30 +02:00
parent 7e7921e32f
commit c503b81421
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,22 +385,24 @@ abstract class AbstractHydrator
$fieldName = $this->_rsm->fieldMappings[$key]; $fieldName = $this->_rsm->fieldMappings[$key];
$fieldMapping = $classMetadata->fieldMappings[$fieldName]; $fieldMapping = $classMetadata->fieldMappings[$fieldName];
$ownerMap = $this->_rsm->columnOwnerMap[$key]; $ownerMap = $this->_rsm->columnOwnerMap[$key];
$columnInfo = [
$returnArray = [ 'isIdentifier' => \in_array($fieldName, $classMetadata->identifier, true),
'isIdentifier' => in_array($fieldName, $classMetadata->identifier), 'fieldName' => $fieldName,
'fieldName' => $fieldName, 'type' => Type::getType($fieldMapping['type']),
'type' => Type::getType($fieldMapping['type']), 'dqlAlias' => $ownerMap,
'dqlAlias' => $ownerMap,
]; ];
if( !empty($classMetadata->parentClasses) && isset($this->_rsm->discriminatorColumns[$ownerMap])){
$returnArray += [ if($classMetadata->parentClasses && isset($this->_rsm->discriminatorColumns[$ownerMap])) {
'discriminatorColumn' => $this->_rsm->discriminatorColumns[$ownerMap], return $this->_cache[$key] = \array_merge(
'discriminatorValue' => $classMetadata->discriminatorValue $columnInfo,
]; [
'discriminatorColumn' => $this->_rsm->discriminatorColumns[$ownerMap],
'discriminatorValue' => $classMetadata->discriminatorValue
]
);
} }
return $this->_cache[$key] = $returnArray; return $this->_cache[$key] = $columnInfo;
case (isset($this->_rsm->newObjectMappings[$key])): case (isset($this->_rsm->newObjectMappings[$key])):
// WARNING: A NEW object is also a scalar, so it must be declared before! // WARNING: A NEW object is also a scalar, so it must be declared before!