1
0
mirror of synced 2025-02-20 06:03:15 +03:00

DDC-546 - Fix some minor glitches in patch.

This commit is contained in:
Benjamin Eberlei 2010-12-04 19:49:05 +01:00
parent c998797c55
commit d3d9957fd4
2 changed files with 7 additions and 3 deletions

View File

@ -61,14 +61,14 @@ final class PersistentCollection implements Collection
*
* @var array
*/
protected $association;
private $association;
/**
* The EntityManager that manages the persistence of the collection.
*
* @var Doctrine\ORM\EntityManager
*/
protected $em;
private $em;
/**
* The name of the field on the target entities that points to the owner
@ -96,7 +96,7 @@ final class PersistentCollection implements Collection
*
* @var boolean
*/
protected $initialized = true;
private $initialized = true;
/**
* The wrapped Collection instance.

View File

@ -779,11 +779,13 @@ class BasicEntityPersister
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$coll->hydrateAdd($this->_createEntity($result));
}
$stmt->closeCursor();
} else {
$entities = array();
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$entities[] = $this->_createEntity($result);
}
$stmt->closeCursor();
return $entities;
}
}
@ -1220,11 +1222,13 @@ class BasicEntityPersister
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$coll->hydrateAdd($this->_createEntity($result));
}
$stmt->closeCursor();
} else {
$entities = array();
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$entities[] = $this->_createEntity($result);
}
$stmt->closeCursor();
return $entities;
}
}