bug #40188 [HttpFoundation] Fix PHP 8.1 null values (kylekatarnls)

derrabus · derrabus · commit eab91556a6f7 · 2021-02-15T10:10:23.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpFoundation] Fix PHP 8.1 null values | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Both `stripos` and `preg_match` will no longer accept `null` on PHP >= 8.1 Commits ------- 419e220 Fix PHP 8.1 null values
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -1237,7 +1237,7 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void
      */
     protected function ensureIEOverSSLCompatibility(Request $request): void
     {
-        if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) && true === $request->isSecure()) {
+        if (false !== stripos($this->headers->get('Content-Disposition') ?? '', 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT') ?? '', $match) && true === $request->isSecure()) {
             if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {
                 $this->headers->remove('Cache-Control');
             }

Original file line number	Diff line number	Diff line change
`@@ -1237,7 +1237,7 @@ public static function closeOutputBuffers(int $targetLevel, bool $flush): void`
`1237`	`1237`	`*/`
`1238`	`1238`	`protected function ensureIEOverSSLCompatibility(Request $request): void`
`1239`	`1239`	`{`
`1240`		`- if (false !== stripos($this->headers->get('Content-Disposition'), 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT'), $match) && true === $request->isSecure()) {`
	`1240`	`+ if (false !== stripos($this->headers->get('Content-Disposition') ?? '', 'attachment') && 1 == preg_match('/MSIE (.*?);/i', $request->server->get('HTTP_USER_AGENT') ?? '', $match) && true === $request->isSecure()) {`
`1241`	`1241`	`if ((int) preg_replace('/(MSIE )(.*?);/', '$2', $match[0]) < 9) {`
`1242`	`1242`	`$this->headers->remove('Cache-Control');`
`1243`	`1243`	`}`