RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 01:09:26 +03:00
Code Issues Projects Releases Wiki Activity

Clear $this->collection even when empty, to reset indexes

Browse Source
This commit is contained in:
Steevan BARBOYON 2016-10-31 12:03:19 +01:00 committed by Marco Pivetta
parent b06dcb89b3
commit fa09a95023
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,6 +542,8 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
public function clear() public function clear()
{ {
if ($this->initialized && $this->isEmpty()) { if ($this->initialized && $this->isEmpty()) {
$this->collection->clear();
return; return;
} }

25
tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
View File

@ -107,4 +107,29 @@ class PersistentCollectionTest extends OrmTestCase
$this->assertSame("dummy", $this->collection->get(2)); $this->assertSame("dummy", $this->collection->get(2));
$this->assertSame(null, $this->collection->get(3)); $this->assertSame(null, $this->collection->get(3));
} }
/**
* Test that PersistentCollection::clear() clear elements, and reset keys
*/
public function testClear()
{
$this->setUpPersistentCollection();
$this->collection->add('dummy');
$this->assertEquals([0], array_keys($this->collection->toArray()));
$this->collection->removeElement('dummy');
$this->assertEquals([], array_keys($this->collection->toArray()));
$this->collection->add('dummy');
$this->collection->clear();
$this->assertEquals([], array_keys($this->collection->toArray()));
// test fix clear doesn't reset collection keys when collection is empty
$this->collection->add('dummy');
$this->collection->removeElement('dummy');
$this->collection->clear();
$this->collection->add('dummy');
$this->assertEquals([0], array_keys($this->collection->toArray()));
}
} }