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

#1188 - Simplified and optimized parameter un-setting logic

Browse Source
This commit is contained in:
Marco Pivetta 2014-11-27 18:08:11 +01:00
parent 8b5dae30a5
commit df99353f19
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,13 +258,19 @@ class Paginator implements \Countable, \IteratorAggregate
$parser = new Parser($countQuery); $parser = new Parser($countQuery);
$parameterMappings = $parser->parse()->getParameterMappings(); $parameterMappings = $parser->parse()->getParameterMappings();
$parameters = $countQuery->getParameters(); /* @var $parameters \Doctrine\Common\Collections\Collection|\Doctrine\ORM\Query\Parameter[] */
foreach ($parameters as $k => $param){ $parameters = $countQuery->getParameters();
if( ! array_key_exists($param->getName(), $parameterMappings)) {
$parameters->remove($k); foreach ($parameters as $key => $parameter) {
$parameterName = $parameter->getName();
if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
unset($parameters[$key]);
} }
} }
$countQuery->setParameters($parameters); $countQuery->setParameters($parameters);
return $countQuery; return $countQuery;
} }
} }