Merge pull request #9 from vemaeg/feature/php-8.1-support

thirsch · web-flow · commit 6cea5a810d3e · 2022-06-10T10:04:54.000+01:00
php 8.1 compat
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
@@ -192,7 +192,7 @@ public function getContentType($trim = true)
   {
     $contentType = $this->getHttpHeader('Content-Type', null);
 
-    if ($trim && false !== $pos = strpos($contentType, ';'))
+    if ($trim && false !== $pos = strpos($contentType !== null ? $contentType : '', ';'))
     {
       $contentType = substr($contentType, 0, $pos);
     }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function getContentType($trim = true)`
`192`	`192`	`{`
`193`	`193`	`$contentType = $this->getHttpHeader('Content-Type', null);`
`194`	`194`
`195`		`- if ($trim && false !== $pos = strpos($contentType, ';'))`
	`195`	`+ if ($trim && false !== $pos = strpos($contentType !== null ? $contentType : '', ';'))`
`196`	`196`	`{`
`197`	`197`	`$contentType = substr($contentType, 0, $pos);`
`198`	`198`	`}`