RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

drop useless support for associations

Browse source
This commit is contained in:
Fabio B. Silva 2013-06-12 10:29:17 -04:00 • committed by fabios
parent d961028b14
commit c1e688fc81
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php
View file

@ -146,8 +146,8 @@ class SimpleObjectHydrator extends AbstractHydrator
{ {
if (isset($this->_rsm->fieldMappings[$column])) { if (isset($this->_rsm->fieldMappings[$column])) {
$name = $this->_rsm->fieldMappings[$column]; $name = $this->_rsm->fieldMappings[$column];
$class = isset($this->declaringClasses[$column]) $class = isset($this->declaringClasses[$column])
? $this->declaringClasses[$column] ? $this->declaringClasses[$column]
: $this->class; : $this->class;
@ -162,21 +162,6 @@ class SimpleObjectHydrator extends AbstractHydrator
); );
} }
if (isset($this->_rsm->relationMap[$column])) {
$class = isset($this->_rsm->relationMap[$column])
? $this->_rsm->relationMap[$column]
: $this->class;
// If class is not self referencing, ignore
if ( ! ($class === $entityName || is_subclass_of($entityName, $class))) {
return null;
}
// TODO: Decide what to do with associations. It seems original code is incomplete.
// One solution is to load the association, but it might require extra efforts.
return array('name' => $column);
}
if (isset($this->_rsm->metaMappings[$column])) { if (isset($this->_rsm->metaMappings[$column])) {
return array( return array(
'name' => $this->_rsm->metaMappings[$column], 'name' => $this->_rsm->metaMappings[$column],
@ -184,6 +169,11 @@ class SimpleObjectHydrator extends AbstractHydrator
); );
} }
// An ObjectHydrator should be used instead of SimpleObjectHydrator
if (isset($this->_rsm->relationMap[$column])) {
throw new \Exception(sprintf('Unable to retrieve association information for column "%s"', $column));
}
return null; return null;
} }
} }