Skip to content

Commit 3613724

Browse files
aschemppnicolas-grekas
authored andcommitted
[HttpKernel] Fix non-scalar check in surrogate fragment renderer
1 parent 2b775e2 commit 3613724

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Fragment/AbstractSurrogateFragmentRenderer.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,11 @@ private function generateSignedFragmentUri(ControllerReference $uri, Request $re
9696
private function containsNonScalars(array $values): bool
9797
{
9898
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)) {
102104
return true;
103105
}
104106
}

0 commit comments

Comments
 (0)