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:03:01 -04:00
parent 666ae8f1b7
commit 2a399312f7
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Doctrine/ORM/AbstractQuery.php
View file

@ -206,15 +206,15 @@ abstract class AbstractQuery
*/ */
public function setParameter($key, $value, $type = null) public function setParameter($key, $value, $type = null)
{ {
$key = trim($key, ':'); $key = trim($key, ':');
$value = $this->processParameterValue($value); $value = $this->processParameterValue($value);
if ($type === null) { if ($type === null) {
$type = Query\ParameterTypeInferer::inferType($value); $type = Query\ParameterTypeInferer::inferType($value);
} }
$this->_paramTypes[$key] = $type; $this->_paramTypes[$key] = $type;
$this->_params[$key] = $value; $this->_params[$key] = $value;
return $this; return $this;
} }
@ -249,18 +249,22 @@ abstract class AbstractQuery
$class = $this->_em->getClassMetadata(get_class($value)); $class = $this->_em->getClassMetadata(get_class($value));
if ($class->isIdentifierComposite) { if ($class->isIdentifierComposite) {
throw new \InvalidArgumentException("Binding an entity with a composite primary key to a query is not supported. You should split the parameter into the explicit fields and bind them seperately."); throw new \InvalidArgumentException(
"Binding an entity with a composite primary key to a query is not supported. " .
"You should split the parameter into the explicit fields and bind them seperately."
);
} }
if ($this->_em->getUnitOfWork()->getEntityState($value) === UnitOfWork::STATE_MANAGED) { $values = ($this->_em->getUnitOfWork()->getEntityState($value) === UnitOfWork::STATE_MANAGED)
$values = $this->_em->getUnitOfWork()->getEntityIdentifier($value); ? $this->_em->getUnitOfWork()->getEntityIdentifier($value)
} else { : $class->getIdentifierValues($value);
$values = $class->getIdentifierValues($value);
}
$value = $values[$class->getSingleIdentifierFieldName()]; $value = $values[$class->getSingleIdentifierFieldName()];
if (!$value) {
throw new \InvalidArgumentException("Binding entities to query parameters only allowed for entities that have an identifier."); if ( ! $value) {
throw new \InvalidArgumentException(
"Binding entities to query parameters only allowed for entities that have an identifier."
);
} }
return $value; return $value;