bug #42380 [HttpFoundation] Don't pass null to strpos() (derrabus)

fabpot · fabpot · commit 36ebebbce67a · 2021-08-06T11:04:48.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [HttpFoundation] Don't pass null to strpos() | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #41552 | License | MIT | Doc PR | N/A Passing `null` to `strpos()` triggers a deprecation warning in PHP 8.1. Let's not do that. Commits ------- bf9dca3 Don't pass null to strpos()
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1333,7 +1333,7 @@ public static function getMimeTypes(string $format)
     public function getFormat(?string $mimeType)
     {
         $canonicalMimeType = null;
-        if (false !== $pos = strpos($mimeType, ';')) {
+        if ($mimeType && false !== $pos = strpos($mimeType, ';')) {
             $canonicalMimeType = trim(substr($mimeType, 0, $pos));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ public static function getMimeTypes(string $format)`
`1333`	`1333`	`public function getFormat(?string $mimeType)`
`1334`	`1334`	`{`
`1335`	`1335`	`$canonicalMimeType = null;`
`1336`		`- if (false !== $pos = strpos($mimeType, ';')) {`
	`1336`	`+ if ($mimeType && false !== $pos = strpos($mimeType, ';')) {`
`1337`	`1337`	`$canonicalMimeType = trim(substr($mimeType, 0, $pos));`
`1338`	`1338`	`}`
`1339`	`1339`