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

Merge branch 'fix/#6110-collection-clear-should-also-clear-keys-2.5' into 2.5

Browse Source 
Close #6110
This commit is contained in:
Marco Pivetta 2016-11-26 06:06:11 +01:00
commit 4d699789a2
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -536,6 +536,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;
} }

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

@ -3,7 +3,6 @@
namespace Doctrine\Tests\ORM; namespace Doctrine\Tests\ORM;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\PersistentCollection;
use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\ConnectionMock;
use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\DriverMock;
@ -83,4 +82,44 @@ class PersistentCollectionTest extends OrmTestCase
$this->collection->next(); $this->collection->next();
$this->assertTrue($this->collection->isInitialized()); $this->assertTrue($this->collection->isInitialized());
} }
/**
* @group 6110
*/
public function testRemovingElementsAlsoRemovesKeys()
{
$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()));
}
/**
* @group 6110
*/
public function testClearWillAlsoClearKeys()
{
$this->setUpPersistentCollection();
$this->collection->add('dummy');
$this->collection->clear();
$this->assertEquals([], array_keys($this->collection->toArray()));
}
/**
* @group 6110
*/
public function testClearWillAlsoResetKeyPositions()
{
$this->setUpPersistentCollection();
$this->collection->add('dummy');
$this->collection->removeElement('dummy');
$this->collection->clear();
$this->collection->add('dummy');
$this->assertEquals([0], array_keys($this->collection->toArray()));
}
} }