bug symfony#46282 [DoctrineBridge] Treat firstResult === 0 like null (derrabus)

nicolas-grekas · nicolas-grekas · commit df2d6746575f · 2022-05-06T16:08:03.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DoctrineBridge] Treat firstResult === 0 like null | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Doctrine ORM has changed its default value for the `firstResult` property of `Query` and `QueryBuilder` instances from `null` to `0`. Both values should be considered equal: Setting no offset or setting the offset to zero should yield the same results. This new default however confuses our `ORMQueryBuilderLoader` because it checks for `null` only. This PR intends to fix that. Commits ------- 2fef871 [DoctrineBridge] Treat firstResult === 0 like null
diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -50,7 +50,7 @@ public function getEntities()
      */
     public function getEntitiesByIds($identifier, array $values)
     {
-        if (null !== $this->queryBuilder->getMaxResults() || null !== $this->queryBuilder->getFirstResult()) {
+        if (null !== $this->queryBuilder->getMaxResults() || 0 < (int) $this->queryBuilder->getFirstResult()) {
             // an offset or a limit would apply on results including the where clause with submitted id values
             // that could make invalid choices valid
             $choices = [];

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function getEntities()`
`50`	`50`	`*/`
`51`	`51`	`public function getEntitiesByIds($identifier, array $values)`
`52`	`52`	`{`
`53`		`- if (null !== $this->queryBuilder->getMaxResults() \|\| null !== $this->queryBuilder->getFirstResult()) {`
	`53`	`+ if (null !== $this->queryBuilder->getMaxResults() \|\| 0 < (int) $this->queryBuilder->getFirstResult()) {`
`54`	`54`	`// an offset or a limit would apply on results including the where clause with submitted id values`
`55`	`55`	`// that could make invalid choices valid`
`56`	`56`	`$choices = [];`