Merge branch '7.4' into 8.0

* 7.4:
  [TwigBridge] Fix Bootstrap 4 horizontal layout broken by form errors moved outside label
  [HttpKernel] Fix denormalization format detection for pre-parsed request data

Author: nicolas-grekas

Controller/ArgumentResolver/RequestPayloadValueResolver.php

@@ -223,7 +223,7 @@ private function mapRequestPayload(Request $request, ArgumentMetadata $argument,
         }
 
         if (\is_array($data)) {
-            return $this->serializer->denormalize($data, $type, 'form' === $format ? 'csv' : $format, $attribute->serializationContext + self::CONTEXT_DENORMALIZE + ('form' === $format ? ['filter_bool' => true] : []));
+            return $this->serializer->denormalize($data, $type, self::hasNonStringScalar($data) ? $format : 'csv', $attribute->serializationContext + self::CONTEXT_DENORMALIZE + ('form' === $format ? ['filter_bool' => true] : []));
         }
 
         if ('form' === $format) {
@@ -253,4 +253,21 @@ private function mapUploadedFile(Request $request, ArgumentMetadata $argument, M
 
         return 'array' === $argument->getType() ? [] : null;
     }
+
+    private static function hasNonStringScalar(array $data): bool
+    {
+        $stack = [$data];
+
+        while ($stack) {
+            foreach (array_pop($stack) as $v) {
+                if (\is_array($v)) {
+                    $stack[] = $v;
+                } elseif (!\is_string($v)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }

Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php

@@ -1057,6 +1057,32 @@ public function testMapRequestPayloadWithFormDataCoercesStringToBool()
         $this->assertInstanceOf(FormPayloadWithBool::class, $payload);
         $this->assertFalse($payload->active);
     }
+
+    public function testMapRequestPayloadWithJsonContentTypeStringValuesCoercesToBool()
+    {
+        $serializer = new Serializer(
+            [new ObjectNormalizer(null, null, null, new ReflectionExtractor())],
+            []
+        );
+
+        $resolver = new RequestPayloadValueResolver($serializer);
+
+        $argument = new ArgumentMetadata('payload', FormPayloadWithBool::class, false, false, null, false, [
+            MapRequestPayload::class => new MapRequestPayload(),
+        ]);
+        $request = new Request([], ['active' => '0'], [], [], [], ['CONTENT_TYPE' => 'application/json']);
+
+        $kernel = $this->createStub(HttpKernelInterface::class);
+        $arguments = $resolver->resolve($request, $argument);
+        $event = new ControllerArgumentsEvent($kernel, static fn () => null, $arguments, $request, HttpKernelInterface::MAIN_REQUEST);
+
+        $resolver->onKernelControllerArguments($event);
+
+        /** @var FormPayloadWithBool $payload */
+        [$payload] = $event->getArguments();
+        $this->assertInstanceOf(FormPayloadWithBool::class, $payload);
+        $this->assertFalse($payload->active);
+    }
 }
 
 class RequestPayload