RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-02 12:56:16 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-260] Added support for better error reporting on ClassMetadata

Browse source
This commit is contained in:
guilhermeblanco 2010-01-21 19:52:17 +00:00
parent 9cd0379f53
commit 37cb86fe81
2 changed files with 56 additions and 19 deletions

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

@ -136,15 +136,22 @@ class ClassMetadata extends ClassMetadataInfo
*
* @param array $mapping The field mapping to validated & complete.
* @return array The validated and completed field mapping.
*
* @throws MappingException
*/
protected function _validateAndCompleteFieldMapping(array &$mapping)
{
parent::_validateAndCompleteFieldMapping($mapping);
// Store ReflectionProperty of mapped field
$refProp = $this->reflClass->getProperty($mapping['fieldName']);
$refProp->setAccessible(true);
$this->reflFields[$mapping['fieldName']] = $refProp;
try {
$refProp = $this->reflClass->getProperty($mapping['fieldName']);
$refProp->setAccessible(true);
$this->reflFields[$mapping['fieldName']] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
}
/**
@ -234,9 +241,15 @@ class ClassMetadata extends ClassMetadataInfo
// Store ReflectionProperty of mapped field
$sourceFieldName = $assocMapping->sourceFieldName;
$refProp = $this->reflClass->getProperty($sourceFieldName);
$refProp->setAccessible(true);
$this->reflFields[$sourceFieldName] = $refProp;
try {
$refProp = $this->reflClass->getProperty($sourceFieldName);
$refProp->setAccessible(true);
$this->reflFields[$sourceFieldName] = $refProp;
}
catch(\ReflectionException $e) {
throw MappingException::reflectionFailure($this->name, $e);
}
}
/**
@ -358,23 +371,35 @@ class ClassMetadata extends ClassMetadataInfo
{
// Restore ReflectionClass and properties
$this->reflClass = new \ReflectionClass($this->name);
foreach ($this->fieldMappings as $field => $mapping) {
if (isset($mapping['inherited'])) {
$reflField = new \ReflectionProperty($mapping['inherited'], $field);
} else {
$reflField = $this->reflClass->getProperty($field);
try {
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) {
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;
try {
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);
}
}
//$this->prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name));

12
lib/Doctrine/ORM/Mapping/MappingException.php
View file

@ -103,4 +103,16 @@ class MappingException extends \Doctrine\Common\DoctrineException
{
return new self("The mapping of field '$fieldName' is invalid.");
}
/**
* Exception for reflection exceptions - adds the entity name,
* because there might be long classnames that will be shortened
* within the stacktrace
*
* @param string $entity The entity's name
* @param \ReflectionException $previousException
*/
public static function reflectionFailure($entity, \ReflectionException $previousException) {
return new self('An error occurred in ' . $entity, $previousException);
}
}