RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Reverting BC break: PersistentConnection#__construct() now accepts null|array|Collection again

Browse Source
This commit is contained in:
Marco Pivetta 2015-04-02 23:45:46 +01:00
parent 4792b4f974
commit e8c9cb2f23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,16 +101,18 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
/** /**
* Creates a new persistent collection. * Creates a new persistent collection.
* *
* @param EntityManagerInterface $em The EntityManager the collection will be associated with. * @param EntityManagerInterface $em The EntityManager the collection will be associated with.
* @param ClassMetadata $class The class descriptor of the entity type of this collection. * @param ClassMetadata $class The class descriptor of the entity type of this collection.
* @param Collection $coll The collection elements. * @param Collection|array|null $collection The collection elements.
*/ */
public function __construct(EntityManagerInterface $em, $class, $coll) public function __construct(EntityManagerInterface $em, $class, $collection)
{ {
$this->collection = $coll;
$this->em = $em; $this->em = $em;
$this->typeClass = $class; $this->typeClass = $class;
$this->initialized = true; $this->initialized = true;
$this->collection = $collection instanceof Collection
? $collection
: new ArrayCollection((array) $collection);
} }
/** /**