RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

Fix CS

Browse Source
This commit is contained in:
Michaël Gallego 2014-01-20 09:13:41 +01:00
parent a55f2c48ca
commit 0d5de64c0f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Doctrine/ORM/PersistentCollection.php
View File

@ -871,6 +871,7 @@ final class PersistentCollection implements Collection, Selectable
if ($this->association['type'] === ClassMetadata::MANY_TO_MANY) { if ($this->association['type'] === ClassMetadata::MANY_TO_MANY) {
$persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association); $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
return new ArrayCollection($persister->loadCriteria($this, $criteria)); return new ArrayCollection($persister->loadCriteria($this, $criteria));
} }

7
lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
View File

@ -516,7 +516,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
} }
$sql = implode(' AND ', $filterClauses); $sql = implode(' AND ', $filterClauses);
return $sql ? "(" . $sql . ")" : ""; return $sql ? '(' . $sql . ')' : '';
} }
/** /**
@ -560,8 +560,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
$mapping = $coll->getMapping(); $mapping = $coll->getMapping();
$owner = $coll->getOwner(); $owner = $coll->getOwner();
$ownerMetadata = $this->em->getClassMetadata(get_class($owner)); $ownerMetadata = $this->em->getClassMetadata(get_class($owner));
$whereClauses = $params = array();
$whereClauses = $params = array();
foreach ($mapping['relationToSourceKeyColumns'] as $key => $value) { foreach ($mapping['relationToSourceKeyColumns'] as $key => $value) {
$whereClauses[] = sprintf('t.%s = ?', $key); $whereClauses[] = sprintf('t.%s = ?', $key);
@ -572,7 +571,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
foreach ($parameters as $parameter) { foreach ($parameters as $parameter) {
list($name, $value) = $parameter; list($name, $value) = $parameter;
$whereClauses[] = sprintf("te.%s = ?", $name); $whereClauses[] = sprintf('te.%s = ?', $name);
$params[] = $value; $params[] = $value;
} }