Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 5fd5b8b82025 · 2022-05-06T16:25:18.000+02:00
* 4.4:
  [DoctrineBridge] Treat firstResult === 0 like null
  [HttpKernel] Fix SessionListener without session in request #46268
diff --git a/Form/ChoiceList/ORMQueryBuilderLoader.php b/Form/ChoiceList/ORMQueryBuilderLoader.php
@@ -53,7 +53,7 @@ public function getEntities()
      */
     public function getEntitiesByIds(string $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
`@@ -53,7 +53,7 @@ public function getEntities()`
`53`	`53`	`*/`
`54`	`54`	`public function getEntitiesByIds(string $identifier, array $values)`
`55`	`55`	`{`
`56`		`- if (null !== $this->queryBuilder->getMaxResults() \|\| null !== $this->queryBuilder->getFirstResult()) {`
	`56`	`+ if (null !== $this->queryBuilder->getMaxResults() \|\| 0 < (int) $this->queryBuilder->getFirstResult()) {`
`57`	`57`	`// an offset or a limit would apply on results including the where clause with submitted id values`
`58`	`58`	`// that could make invalid choices valid`
`59`	`59`	`$choices = [];`