RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 06:03:15 +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);
// Store ReflectionProperty of mapped field
try {
$refProp = $this->reflClass->getProperty($mapping['fieldName']);
$refProp->setAccessible(true);
$this->reflFields[$mapping['fieldName']] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
$refProp = $this->reflClass->getProperty($mapping['fieldName']);
$refProp->setAccessible(true);
$this->reflFields[$mapping['fieldName']] = $refProp;
}
/**
@ -242,14 +237,9 @@ class ClassMetadata extends ClassMetadataInfo
// Store ReflectionProperty of mapped field
$sourceFieldName = $assocMapping->sourceFieldName;
try {
$refProp = $this->reflClass->getProperty($sourceFieldName);
$refProp->setAccessible(true);
$this->reflFields[$sourceFieldName] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
$refProp = $this->reflClass->getProperty($sourceFieldName);
$refProp->setAccessible(true);
$this->reflFields[$sourceFieldName] = $refProp;
}
/**
@ -352,11 +342,9 @@ class ClassMetadata extends ClassMetadataInfo
'isVersioned',
'lifecycleCallbacks',
'name',
//'namespace',
'parentClasses',
'primaryTable',
'rootEntityName',
//'sequenceGeneratorDefinition',
'subClasses',
'versionField'
);
@ -373,33 +361,25 @@ class ClassMetadata extends ClassMetadataInfo
$this->reflClass = new \ReflectionClass($this->name);
foreach ($this->fieldMappings as $field => $mapping) {
try {
if (isset($mapping['inherited'])) {
$reflField = new \ReflectionProperty($mapping['inherited'], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
if (isset($mapping['inherited'])) {
$reflField = new \ReflectionProperty($mapping['inherited'], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
}
foreach ($this->associationMappings as $field => $mapping) {
try {
if (isset($this->inheritedAssociationFields[$field])) {
$reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
if (isset($this->inheritedAssociationFields[$field])) {
$reflField = new \ReflectionProperty($this->inheritedAssociationFields[$field], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
$reflField->setAccessible(true);
$this->reflFields[$field] = $reflField;
}
//$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
$this->_driver->loadMetadataForClass($className, $class);
try {
$this->_driver->loadMetadataForClass($className, $class);
} catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($className, $e);
}
// Verify & complete identifier mapping
if ( ! $class->identifier && ! $class->isMappedSuperclass) {