Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 0a433d03c89e · 2022-03-24T18:11:42.000+01:00
* 5.4:
  [Serializer] Fix denormalizing union types
  bug #42637 [Security] Fixed TOCTOU in RememberMe cache token verifier
  Add missing upgrade note for ldap
  [Mailer] Preserve case of headers
diff --git a/Transport/SendgridApiTransport.php b/Transport/SendgridApiTransport.php
@@ -133,7 +133,7 @@ private function getPayload(Email $email, Envelope $envelope): array
             } elseif ($header instanceof MetadataHeader) {
                 $customArguments[$header->getKey()] = $header->getValue();
             } else {
-                $payload['headers'][$name] = $header->getBodyAsString();
+                $payload['headers'][$header->getName()] = $header->getBodyAsString();
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ private function getPayload(Email $email, Envelope $envelope): array`
`133`	`133`	`} elseif ($header instanceof MetadataHeader) {`
`134`	`134`	`$customArguments[$header->getKey()] = $header->getValue();`
`135`	`135`	`} else {`
`136`		`- $payload['headers'][$name] = $header->getBodyAsString();`
	`136`	`+ $payload['headers'][$header->getName()] = $header->getBodyAsString();`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`