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

[2.0][DDC-260] Fixed/Corrected patch.

Browse source
This commit is contained in:
romanb 2010-01-21 22:25:42 +00:00
parent 37cb86fe81
commit 572f728153
2 changed files with 25 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View file

@ -144,14 +144,9 @@ class ClassMetadata extends ClassMetadataInfo
parent::_validateAndCompleteFieldMapping($mapping); parent::_validateAndCompleteFieldMapping($mapping);
// Store ReflectionProperty of mapped field // Store ReflectionProperty of mapped field
try { $refProp = $this->reflClass->getProperty($mapping['fieldName']);
$refProp = $this->reflClass->getProperty($mapping['fieldName']); $refProp->setAccessible(true);
$refProp->setAccessible(true); $this->reflFields[$mapping['fieldName']] = $refProp;
$this->reflFields[$mapping['fieldName']] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
} }
/** /**
@ -242,14 +237,9 @@ class ClassMetadata extends ClassMetadataInfo
// Store ReflectionProperty of mapped field // Store ReflectionProperty of mapped field
$sourceFieldName = $assocMapping->sourceFieldName; $sourceFieldName = $assocMapping->sourceFieldName;
try { $refProp = $this->reflClass->getProperty($sourceFieldName);
$refProp = $this->reflClass->getProperty($sourceFieldName); $refProp->setAccessible(true);
$refProp->setAccessible(true); $this->reflFields[$sourceFieldName] = $refProp;
$this->reflFields[$sourceFieldName] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
} }
/** /**
@ -352,11 +342,9 @@ class ClassMetadata extends ClassMetadataInfo
'isVersioned', 'isVersioned',
'lifecycleCallbacks', 'lifecycleCallbacks',
'name', 'name',
//'namespace',
'parentClasses', 'parentClasses',
'primaryTable', 'primaryTable',
'rootEntityName', 'rootEntityName',
//'sequenceGeneratorDefinition',
'subClasses', 'subClasses',
'versionField' 'versionField'
); );
@ -373,33 +361,25 @@ class ClassMetadata extends ClassMetadataInfo
$this->reflClass = new \ReflectionClass($this->name); $this->reflClass = new \ReflectionClass($this->name);
foreach ($this->fieldMappings as $field => $mapping) { foreach ($this->fieldMappings as $field => $mapping) {
try { if (isset($mapping['inherited'])) {
if (isset($mapping['inherited'])) { $reflField = new \ReflectionProperty($mapping['inherited'], $field);
$reflField = new \ReflectionProperty($mapping['inherited'], $field); } else {
} else { $reflField = $this->reflClass->getProperty($field);
$reflField = $this->reflClass->getProperty($field); }
}
$reflField->setAccessible(true); $reflField->setAccessible(true);
$this->reflFields[$field] = $reflField; $this->reflFields[$field] = $reflField;
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
} }
foreach ($this->associationMappings as $field => $mapping) { foreach ($this->associationMappings as $field => $mapping) {
try { if (isset($this->inheritedAssociationFields[$field])) {
if (isset($this->inheritedAssociationFields[$field])) { $reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
$reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field); } else {
} else { $reflField = $this->reflClass->getProperty($field);
$reflField = $this->reflClass->getProperty($field); }
}
$reflField->setAccessible(true); $reflField->setAccessible(true);
$this->reflFields[$field] = $reflField; $this->reflFields[$field] = $reflField;
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
} }
//$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name)); //$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));

6
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View file

@ -222,7 +222,11 @@ class ClassMetadataFactory
} }
// Invoke driver // Invoke driver
$this->_driver->loadMetadataForClass($className, $class); try {
$this->_driver->loadMetadataForClass($className, $class);
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($className, $e);
}
// Verify & complete identifier mapping // Verify & complete identifier mapping
if ( ! $class->identifier && ! $class->isMappedSuperclass) { if ( ! $class->identifier && ! $class->isMappedSuperclass) {