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

DDC-546 - Fix some minor glitches in patch.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

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