RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Include IDs in the exception message to ease debugging

Browse Source
This commit is contained in:
Lars Strojny 2015-01-08 15:59:17 +01:00 committed by Marco Pivetta
parent 1ac688644a
commit 8e4092750d
3 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/EntityNotFoundException.php
View File

@ -30,8 +30,14 @@ class EntityNotFoundException extends ORMException
/**
* Constructor.
*/
public function __construct($class)
public function __construct($class, array $id = array())
{
parent::__construct("Entity of type '{$class}' was not found.");
$ids = array();
foreach ($id as $key => $value) {
$ids[] = "{$key}({$value})";
}
$idsFormatted = implode(', ', $ids);
$message = "Entity of type '" . $class . "'" . ($idsFormatted ? ' for IDs ' . $idsFormatted : '') . ' was not found';
parent::__construct($message);
}
}

33
lib/Doctrine/ORM/Proxy/ProxyFactory.php
View File

@ -28,6 +28,7 @@ use Doctrine\Common\Proxy\ProxyGenerator;
use Doctrine\ORM\Persisters\EntityPersister;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityNotFoundException;
use Doctrine\ORM\Utility\IdentifierFlattener;
/**
* This factory is used to create proxy objects for entities at runtime.
@ -54,6 +55,13 @@ class ProxyFactory extends AbstractProxyFactory
*/
private $proxyNs;
/**
* The IdentifierFlattener used for manipulating identifiers
*
* @var \Doctrine\ORM\Utility\IdentifierFlattener
*/
private $identifierFlattener;
/**
* Initializes a new instance of the <tt>ProxyFactory</tt> class that is
* connected to the given <tt>EntityManager</tt>.
@ -74,7 +82,7 @@ class ProxyFactory extends AbstractProxyFactory
$this->em = $em;
$this->uow = $em->getUnitOfWork();
$this->proxyNs = $proxyNs;
$this->identifierFlattener = new IdentifierFlattener($this->uow, $em->getMetadataFactory());
}
/**
@ -115,8 +123,9 @@ class ProxyFactory extends AbstractProxyFactory
*/
private function createInitializer(ClassMetadata $classMetadata, EntityPersister $entityPersister)
{
$identifierFlattener = $this->identifierFlattener;
if ($classMetadata->getReflectionClass()->hasMethod('__wakeup')) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $identifierFlattener) {
$initializer = $proxy->__getInitializer();
$cloner = $proxy->__getCloner();
@ -138,17 +147,18 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitialized(true);
$proxy->__wakeup();
if (null === $entityPersister->loadById($classMetadata->getIdentifierValues($proxy), $proxy)) {
$id = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($id, $proxy)) {
$proxy->__setInitializer($initializer);
$proxy->__setCloner($cloner);
$proxy->__setInitialized(false);
throw new EntityNotFoundException($classMetadata->getName());
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
}
};
}
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $identifierFlattener) {
$initializer = $proxy->__getInitializer();
$cloner = $proxy->__getCloner();
@ -169,12 +179,13 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitialized(true);
if (null === $entityPersister->loadById($classMetadata->getIdentifierValues($proxy), $proxy)) {
$id = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($id, $proxy)) {
$proxy->__setInitializer($initializer);
$proxy->__setCloner($cloner);
$proxy->__setInitialized(false);
throw new EntityNotFoundException($classMetadata->getName());
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
}
};
}
@ -191,7 +202,8 @@ class ProxyFactory extends AbstractProxyFactory
*/
private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
{
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
$identifierFlattener = $this->identifierFlattener;
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $identifierFlattener) {
if ($proxy->__isInitialized()) {
return;
}
@ -200,10 +212,11 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitializer(null);
$class = $entityPersister->getClassMetadata();
$original = $entityPersister->loadById($classMetadata->getIdentifierValues($proxy));
$id = $classMetadata->getIdentifierValues($proxy);
$original = $entityPersister->loadById($id);
if (null === $original) {
throw new EntityNotFoundException($classMetadata->getName());
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
}
foreach ($class->getReflectionClass()->getProperties() as $property) {

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -1843,7 +1843,7 @@ class UnitOfWork implements PropertyChangedListener
// If the identifier is ASSIGNED, it is NEW, otherwise an error
// since the managed entity was not found.
if ( ! $class->isIdentifierNatural()) {
throw new EntityNotFoundException($class->getName());
throw new EntityNotFoundException($class->getName(), $this->identifierFlattener->flattenIdentifier($class, $id));
}
$managedCopy = $this->newInstance($class);