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

Merge pull request #6685 from votemike/update-maxresult-docblocks

Browse Source 
Updating `Query#$_maxResults` to allow for `null` (no limit)
This commit is contained in:
Marco Pivetta 2017-09-04 11:40:06 +02:00 committed by GitHub
commit 8b81691e77
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Query.php
View File

@ -163,7 +163,7 @@ final class Query extends AbstractQuery
/** /**
* The maximum number of results to return (the "limit"). * The maximum number of results to return (the "limit").
* *
* @var integer * @var integer|null
*/ */
private $_maxResults = null; private $_maxResults = null;
@ -628,7 +628,7 @@ final class Query extends AbstractQuery
/** /**
* Sets the maximum number of results to retrieve (the "limit"). * Sets the maximum number of results to retrieve (the "limit").
* *
* @param integer $maxResults * @param integer|null $maxResults
* *
* @return Query This query object. * @return Query This query object.
*/ */
@ -644,7 +644,7 @@ final class Query extends AbstractQuery
* Gets the maximum number of results the query object was set to retrieve (the "limit"). * Gets the maximum number of results the query object was set to retrieve (the "limit").
* Returns NULL if {@link setMaxResults} was not applied to this query. * Returns NULL if {@link setMaxResults} was not applied to this query.
* *
* @return integer Maximum number of results. * @return integer|null Maximum number of results.
*/ */
public function getMaxResults() public function getMaxResults()
{ {

6
lib/Doctrine/ORM/QueryBuilder.php
View File

@ -107,7 +107,7 @@ class QueryBuilder
/** /**
* The maximum number of results to retrieve. * The maximum number of results to retrieve.
* *
* @var integer * @var integer|null
*/ */
private $_maxResults = null; private $_maxResults = null;
@ -653,7 +653,7 @@ class QueryBuilder
/** /**
* Sets the maximum number of results to retrieve (the "limit"). * Sets the maximum number of results to retrieve (the "limit").
* *
* @param integer $maxResults The maximum number of results to retrieve. * @param integer|null $maxResults The maximum number of results to retrieve.
* *
* @return self * @return self
*/ */
@ -668,7 +668,7 @@ class QueryBuilder
* Gets the maximum number of results the query object was set to retrieve (the "limit"). * Gets the maximum number of results the query object was set to retrieve (the "limit").
* Returns NULL if {@link setMaxResults} was not applied to this query builder. * Returns NULL if {@link setMaxResults} was not applied to this query builder.
* *
* @return integer Maximum number of results. * @return integer|null Maximum number of results.
*/ */
public function getMaxResults() public function getMaxResults()
{ {

2
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
View File

@ -136,7 +136,7 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
$fromRoot = reset($from); $fromRoot = reset($from);
if ($query instanceof Query if ($query instanceof Query
&& $query->getMaxResults() && null !== $query->getMaxResults()
&& $AST->orderByClause && $AST->orderByClause
&& count($fromRoot->joins)) { && count($fromRoot->joins)) {
// Check each orderby item. // Check each orderby item.