RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

#1240 DDC-3479 - Fixing minor CS issues (naming, alignment)

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-13 02:48:57 +01:00
parent 8e4092750d
commit 66c556fbfd
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -147,13 +147,17 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitialized(true);
$proxy->__wakeup();
$id = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($id, $proxy)) {
$identifier = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($identifier, $proxy)) {
$proxy->__setInitializer($initializer);
$proxy->__setCloner($cloner);
$proxy->__setInitialized(false);
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
throw new EntityNotFoundException(
$classMetadata->getName(),
$identifierFlattener->flattenIdentifier($classMetadata, $identifier)
);
}
};
}
@ -179,13 +183,17 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitialized(true);
$id = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($id, $proxy)) {
$identifier = $classMetadata->getIdentifierValues($proxy);
if (null === $entityPersister->loadById($identifier, $proxy)) {
$proxy->__setInitializer($initializer);
$proxy->__setCloner($cloner);
$proxy->__setInitialized(false);
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
throw new EntityNotFoundException(
$classMetadata->getName(),
$identifierFlattener->flattenIdentifier($classMetadata, $identifier)
);
}
};
}
@ -203,6 +211,7 @@ class ProxyFactory extends AbstractProxyFactory
private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
{
$identifierFlattener = $this->identifierFlattener;
return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $identifierFlattener) {
if ($proxy->__isInitialized()) {
return;
@ -211,12 +220,15 @@ class ProxyFactory extends AbstractProxyFactory
$proxy->__setInitialized(true);
$proxy->__setInitializer(null);
$class = $entityPersister->getClassMetadata();
$id = $classMetadata->getIdentifierValues($proxy);
$original = $entityPersister->loadById($id);
$class = $entityPersister->getClassMetadata();
$identifier = $classMetadata->getIdentifierValues($proxy);
$original = $entityPersister->loadById($identifier);
if (null === $original) {
throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
throw new EntityNotFoundException(
$classMetadata->getName(),
$identifierFlattener->flattenIdentifier($classMetadata, $identifier)
);
}
foreach ($class->getReflectionClass()->getProperties() as $property) {