[HttpClient] Fix the CS fix

nicolas-grekas · nicolas-grekas · commit becfdfb1224f · 2022-07-27T18:59:54.000+02:00
diff --git a/HttpClientTrait.php b/HttpClientTrait.php
@@ -195,9 +195,11 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
-        foreach (self::$emptyDefaults ?? [] as $k => $v) {
-            if (!isset($options[$k])) {
-                $options[$k] = $v;
+        if (isset(self::$emptyDefaults)) {
+            foreach (self::$emptyDefaults as $k => $v) {
+                if (!isset($options[$k])) {
+                    $options[$k] = $v;
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -195,9 +195,11 @@ private static function mergeDefaultOptions(array $options, array $defaultOption`
`195`	`195`
`196`	`196`	`$options += $defaultOptions;`
`197`	`197`
`198`		`- foreach (self::$emptyDefaults ?? [] as $k => $v) {`
`199`		`- if (!isset($options[$k])) {`
`200`		`- $options[$k] = $v;`
	`198`	`+ if (isset(self::$emptyDefaults)) {`
	`199`	`+ foreach (self::$emptyDefaults as $k => $v) {`
	`200`	`+ if (!isset($options[$k])) {`
	`201`	`+ $options[$k] = $v;`
	`202`	`+ }`
`201`	`203`	`}`
`202`	`204`	`}`
`203`	`205`