bug #45585 [HttpClient] fix checking for unset property on PHP <= 7.1.4 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f432349bd6df · 2022-02-28T16:51:48.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] fix checking for unset property on PHP <= 7.1.4 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - As spotted by the CI and confirmed here: https://3v4l.org/2Xv3N Commits ------- 721996a [HttpClient] fix checking for unset property on PHP <= 7.1.4
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -189,7 +189,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption
 
         $options += $defaultOptions;
 
-        foreach (self::$emptyDefaults ?? [] as $k => $v) {
+        foreach (isset(self::$emptyDefaults) ? self::$emptyDefaults : [] as $k => $v) {
             if (!isset($options[$k])) {
                 $options[$k] = $v;
             }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private static function mergeDefaultOptions(array $options, array $defaultOption`
`189`	`189`
`190`	`190`	`$options += $defaultOptions;`
`191`	`191`
`192`		`- foreach (self::$emptyDefaults ?? [] as $k => $v) {`
	`192`	`+ foreach (isset(self::$emptyDefaults) ? self::$emptyDefaults : [] as $k => $v) {`
`193`	`193`	`if (!isset($options[$k])) {`
`194`	`194`	`$options[$k] = $v;`
`195`	`195`	`}`