From ee3eb50dfe4645482aac07046acfab6fdee2ff1f Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Wed, 18 Mar 2020 14:46:51 +0100 Subject: [PATCH 1/5] Fix phpdoc --- lib/Doctrine/ORM/Query.php | 2 +- lib/Doctrine/ORM/QueryBuilder.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index f582d99150b..26d3815273a 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -624,7 +624,7 @@ public function contains($dql) /** * Sets the position of the first result to retrieve (the "offset"). * - * @param integer $firstResult The first result to return. + * @param integer|null $firstResult The first result to return. * * @return Query This query object. */ diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index af4d8cd2be6..228c97e0fe7 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -100,7 +100,7 @@ class QueryBuilder /** * The index of the first result to retrieve. * - * @var integer + * @var integer|null */ private $_firstResult = null; @@ -616,7 +616,7 @@ function (Query\Parameter $parameter) use ($key) : bool { /** * Sets the position of the first result to retrieve (the "offset"). * - * @param integer $firstResult The first result to return. + * @param integer|null $firstResult The first result to return. * * @return self */ @@ -631,7 +631,7 @@ public function setFirstResult($firstResult) * Gets the position of the first result the query object was set to retrieve (the "offset"). * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder. * - * @return integer The position of the first result. + * @return integer|null The position of the first result. */ public function getFirstResult() { From ebfffde83cac3f7d9cd6872f473de318e478ba09 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 19 Mar 2020 01:44:24 +0100 Subject: [PATCH 2/5] Update lib/Doctrine/ORM/Query.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Grégoire Paris --- lib/Doctrine/ORM/Query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 26d3815273a..1264997657f 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -624,7 +624,7 @@ public function contains($dql) /** * Sets the position of the first result to retrieve (the "offset"). * - * @param integer|null $firstResult The first result to return. + * @param int|null $firstResult The first result to return. * * @return Query This query object. */ From 28af8eec3e0d1617a8f12c35926550739620b8f9 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 19 Mar 2020 01:44:36 +0100 Subject: [PATCH 3/5] Update lib/Doctrine/ORM/QueryBuilder.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Grégoire Paris --- lib/Doctrine/ORM/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 228c97e0fe7..e9dcc50dfdf 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -100,7 +100,7 @@ class QueryBuilder /** * The index of the first result to retrieve. * - * @var integer|null + * @var int|null */ private $_firstResult = null; From 242909e3224b54ae5dde313a954ccf1db4124ee4 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 19 Mar 2020 01:44:43 +0100 Subject: [PATCH 4/5] Update lib/Doctrine/ORM/QueryBuilder.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Grégoire Paris --- lib/Doctrine/ORM/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index e9dcc50dfdf..5fb683176c7 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -631,7 +631,7 @@ public function setFirstResult($firstResult) * Gets the position of the first result the query object was set to retrieve (the "offset"). * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder. * - * @return integer|null The position of the first result. + * @return int|null The position of the first result. */ public function getFirstResult() { From bcc3164b89a7fe83c10b2adbc453be9ced0b3567 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 19 Mar 2020 01:44:49 +0100 Subject: [PATCH 5/5] Update lib/Doctrine/ORM/QueryBuilder.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Grégoire Paris --- lib/Doctrine/ORM/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 5fb683176c7..618a6b69216 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -616,7 +616,7 @@ function (Query\Parameter $parameter) use ($key) : bool { /** * Sets the position of the first result to retrieve (the "offset"). * - * @param integer|null $firstResult The first result to return. + * @param int|null $firstResult The first result to return. * * @return self */