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

Coding style fixes.

Browse source
This commit is contained in:
Guilherme Blanco 2012-03-15 01:00:29 -04:00
parent e1704402a6
commit 666ae8f1b7
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/Doctrine/ORM/EntityRepository.php
View file

@ -110,16 +110,19 @@ class EntityRepository implements ObjectRepository
if ( ! is_array($id)) { if ( ! is_array($id)) {
$id = array($this->_class->identifier[0] => $id); $id = array($this->_class->identifier[0] => $id);
} }
$sortedId = array(); $sortedId = array();
foreach ($this->_class->identifier as $identifier) { foreach ($this->_class->identifier as $identifier) {
if (!isset($id[$identifier])) { if ( ! isset($id[$identifier])) {
throw ORMException::missingIdentifierField($this->_class->name, $identifier); throw ORMException::missingIdentifierField($this->_class->name, $identifier);
} }
$sortedId[$identifier] = $id[$identifier]; $sortedId[$identifier] = $id[$identifier];
} }
// Check identity map first // Check identity map first
if ($entity = $this->_em->getUnitOfWork()->tryGetById($sortedId, $this->_class->rootEntityName)) { if (($entity = $this->_em->getUnitOfWork()->tryGetById($sortedId, $this->_class->rootEntityName)) !== false) {
if ( ! ($entity instanceof $this->_class->name)) { if ( ! ($entity instanceof $this->_class->name)) {
return null; return null;
} }
@ -131,16 +134,18 @@ class EntityRepository implements ObjectRepository
return $entity; // Hit! return $entity; // Hit!
} }
$persister = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName);
switch ($lockMode) { switch ($lockMode) {
case LockMode::NONE: case LockMode::NONE:
return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($sortedId); return $persister->load($sortedId);
case LockMode::OPTIMISTIC: case LockMode::OPTIMISTIC:
if ( ! $this->_class->isVersioned) { if ( ! $this->_class->isVersioned) {
throw OptimisticLockException::notVersioned($this->_entityName); throw OptimisticLockException::notVersioned($this->_entityName);
} }
$entity = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($sortedId); $entity = $persister->load($sortedId);
$this->_em->getUnitOfWork()->lock($entity, $lockMode, $lockVersion); $this->_em->getUnitOfWork()->lock($entity, $lockMode, $lockVersion);
@ -151,7 +156,7 @@ class EntityRepository implements ObjectRepository
throw TransactionRequiredException::transactionRequired(); throw TransactionRequiredException::transactionRequired();
} }
return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($sortedId, null, null, array(), $lockMode); return $persister->load($sortedId, null, null, array(), $lockMode);
} }
} }
@ -176,7 +181,9 @@ class EntityRepository implements ObjectRepository
*/ */
public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null) public function findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
{ {
return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->loadAll($criteria, $orderBy, $limit, $offset); $persister = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName);
return $persister->loadAll($criteria, $orderBy, $limit, $offset);
} }
/** /**
@ -187,7 +194,9 @@ class EntityRepository implements ObjectRepository
*/ */
public function findOneBy(array $criteria) public function findOneBy(array $criteria)
{ {
return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria, null, null, array(), 0, 1); $persister = $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName);
return $persister->load($criteria, null, null, array(), 0, 1);
} }
/** /**
@ -225,15 +234,21 @@ class EntityRepository implements ObjectRepository
$fieldName = lcfirst(\Doctrine\Common\Util\Inflector::classify($by)); $fieldName = lcfirst(\Doctrine\Common\Util\Inflector::classify($by));
if ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName)) { if ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName)) {
$argumentSize = count($arguments); switch (count($arguments)) {
if ($argumentSize == 1) { case 1:
return $this->$method(array($fieldName => $arguments[0])); return $this->$method(array($fieldName => $arguments[0]));
} else if ($argumentSize == 2) {
return $this->$method(array($fieldName => $arguments[0]), $arguments[1]); case 2:
} else if ($argumentSize == 3) { return $this->$method(array($fieldName => $arguments[0]), $arguments[1]);
return $this->$method(array($fieldName => $arguments[0]), $arguments[1], $arguments[2]);
} else if ($argumentSize == 4) { case 3:
return $this->$method(array($fieldName => $arguments[0]), $arguments[1], $arguments[2], $arguments[3]); return $this->$method(array($fieldName => $arguments[0]), $arguments[1], $arguments[2]);
case 4;
return $this->$method(array($fieldName => $arguments[0]), $arguments[1], $arguments[2], $arguments[3]);
default:
// Do nothing
} }
} }