RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #392 from widop/patch-1

Browse Source 
Invalid paginator query cloning
This commit is contained in:
Benjamin Eberlei 2012-07-08 09:34:09 -07:00
commit fe292cc503
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Tools/Pagination/Paginator.php
View File

@ -208,7 +208,9 @@ class Paginator implements \Countable, \IteratorAggregate
{ {
/* @var $cloneQuery Query */ /* @var $cloneQuery Query */
$cloneQuery = clone $query; $cloneQuery = clone $query;
$cloneQuery->setParameters($query->getParameters());
$cloneQuery->setParameters(clone $query->getParameters());
foreach ($query->getHints() as $name => $value) { foreach ($query->getHints() as $name => $value) {
$cloneQuery->setHint($name, $value); $cloneQuery->setHint($name, $value);
} }

11
tests/Doctrine/Tests/ORM/Functional/PaginationTest.php
View File

@ -128,6 +128,17 @@ class PaginationTest extends \Doctrine\Tests\OrmFunctionalTestCase
count($paginator); count($paginator);
} }
public function testCloneQuery()
{
$dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u";
$query = $this->_em->createQuery($dql);
$paginator = new Paginator($query);
$paginator->getIterator();
$this->assertTrue($query->getParameters()->isEmpty());
}
public function populate() public function populate()
{ {
for ($i = 0; $i < 3; $i++) { for ($i = 0; $i < 3; $i++) {