From ea3856673d24491828a1383fc10b345a0ac8fcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kolanowski?= Date: Thu, 27 Nov 2014 08:11:27 +0100 Subject: [PATCH] Missing doc block, removed parse() parameter. Missing doc block, removed parse() parameter. --- lib/Doctrine/ORM/Tools/Pagination/Paginator.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php index 3139ce706..9cc64c87e 100755 --- a/lib/Doctrine/ORM/Tools/Pagination/Paginator.php +++ b/lib/Doctrine/ORM/Tools/Pagination/Paginator.php @@ -119,6 +119,7 @@ class Paginator implements \Countable, \IteratorAggregate { if ($this->count === null) { $countQuery = $this->getCountQuery(); + try { $data = $countQuery->getScalarResult(); $data = array_map('current', $data); @@ -130,8 +131,13 @@ class Paginator implements \Countable, \IteratorAggregate return $this->count; } - - public function getCountQuery(){ + /** + * Returns Query prepared to count. + * + * @return Query + */ + public function getCountQuery() + { /* @var $countQuery Query */ $countQuery = $this->cloneQuery($this->query); @@ -153,10 +159,10 @@ class Paginator implements \Countable, \IteratorAggregate $countQuery->setFirstResult(null)->setMaxResults(null); $parser = new Query\Parser($countQuery); - $parameterMappings = $parser->parse($parser)->getParameterMappings(); + $parameterMappings = $parser->parse()->getParameterMappings(); $parameters = $countQuery->getParameters(); - foreach($parameters as $k=>$param){ - if(!array_key_exists($param->getName(), $parameterMappings)){ + foreach ($parameters as $k => $param){ + if( ! array_key_exists($param->getName(), $parameterMappings)) { $parameters->remove($k); } }