bug #47073 [HttpKernel] Fix non-scalar check in surrogate fragment renderer (aschempp)

nicolas-grekas · nicolas-grekas · commit 03bdaedc7713 · 2022-07-29T08:51:13.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Fix non-scalar check in surrogate fragment renderer | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46152 | License | MIT | Doc PR | - Commits ------- 6b85cfd [HttpKernel] Fix non-scalar check in surrogate fragment renderer
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -96,9 +96,11 @@ private function generateSignedFragmentUri(ControllerReference $uri, Request $re
     private function containsNonScalars(array $values): bool
     {
         foreach ($values as $value) {
-            if (\is_array($value)) {
-                return $this->containsNonScalars($value);
-            } elseif (!\is_scalar($value) && null !== $value) {
+            if (\is_scalar($value) || null === $value) {
+                continue;
+            }
+
+            if (!\is_array($value) || $this->containsNonScalars($value)) {
                 return true;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,11 @@ private function generateSignedFragmentUri(ControllerReference $uri, Request $re`
`96`	`96`	`private function containsNonScalars(array $values): bool`
`97`	`97`	`{`
`98`	`98`	`foreach ($values as $value) {`
`99`		`- if (\is_array($value)) {`
`100`		`- return $this->containsNonScalars($value);`
`101`		`- } elseif (!\is_scalar($value) && null !== $value) {`
	`99`	`+ if (\is_scalar($value) \|\| null === $value) {`
	`100`	`+ continue;`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ if (!\is_array($value) \|\| $this->containsNonScalars($value)) {`
`102`	`104`	`return true;`
`103`	`105`	`}`
`104`	`106`	`}`