Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 78981a2ffef6 · 2025-02-13T11:27:23.000+01:00
* 6.4:
  Fixes XliffFileDumperTest for 6.4
  [HttpClient] Don't send any default content-type when the body is empty
  [VarExporter] Fix lazy objects with hooked properties
  [Translation] check empty notes
  ntfy-notifier: tfix in description
diff --git a/HttpClientTrait.php b/HttpClientTrait.php
@@ -355,9 +355,11 @@ private static function normalizeBody($body, array &$normalizedHeaders = [])
                 }
             });
 
-            $body = http_build_query($body, '', '&');
+            if ('' === $body = http_build_query($body, '', '&')) {
+                return '';
+            }
 
-            if ('' === $body || !$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {
+            if (!$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {
                 if (!str_contains($normalizedHeaders['content-type'][0] ?? '', 'application/x-www-form-urlencoded')) {
                     $normalizedHeaders['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
                 }

Original file line number	Diff line number	Diff line change
`@@ -355,9 +355,11 @@ private static function normalizeBody($body, array &$normalizedHeaders = [])`
`355`	`355`	`}`
`356`	`356`	`});`
`357`	`357`
`358`		`- $body = http_build_query($body, '', '&');`
	`358`	`+ if ('' === $body = http_build_query($body, '', '&')) {`
	`359`	`+ return '';`
	`360`	`+ }`
`359`	`361`
`360`		`- if ('' === $body \|\| !$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {`
	`362`	`+ if (!$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {`
`361`	`363`	`if (!str_contains($normalizedHeaders['content-type'][0] ?? '', 'application/x-www-form-urlencoded')) {`
`362`	`364`	`$normalizedHeaders['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];`
`363`	`365`	`}`