Merge pull request #271 from jtojnar/wip/jtojnar/unitrim-mbstring-depr

gRegorLove · web-flow · commit 2bbcf26840a7 · 2026-06-25T13:07:33.000-07:00
unicodeTrim: Fix PHP 8.2 deprecation
diff --git a/Mf2/Parser.php b/Mf2/Parser.php
@@ -111,10 +111,7 @@ function collapseWhitespace($str) {
 }
 
 function unicodeTrim($str) {
-	// this is cheating. TODO: find a better way if this causes any problems
-	$str = str_replace(mb_convert_encoding('&nbsp;', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);
-	$str = preg_replace('/^\s+/', '', $str);
-	return preg_replace('/\s+$/', '', $str);
+	return preg_replace('/^\s+|\s+$/u', '', $str);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,7 @@ function collapseWhitespace($str) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`function unicodeTrim($str) {`
`114`		`- // this is cheating. TODO: find a better way if this causes any problems`
`115`		`- $str = str_replace(mb_convert_encoding(' ', 'UTF-8', 'HTML-ENTITIES'), ' ', $str);`
`116`		`- $str = preg_replace('/^\s+/', '', $str);`
`117`		`- return preg_replace('/\s+$/', '', $str);`
	`114`	`+ return preg_replace('/^\s+\|\s+$/u', '', $str);`
`118`	`115`	`}`
`119`	`116`
`120`	`117`	`/**`