Skip to content

Deprecate StringUtil::convertEncoding() #4800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TimWolla merged 3 commits into from
May 14, 2022
Merged

Deprecate StringUtil::convertEncoding() #4800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19dadec
Remove use of `utf8_encode` / `utf8_decode`
TimWolla May 13, 2022
ef47020
Deprecate StringUtil::convertEncoding()
TimWolla May 13, 2022
523c035
Stop using StringUtil::convertEncoding()
TimWolla May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions wcfsetup/install/files/lib/action/PaypalCallbackAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use wcf\data\object\type\ObjectTypeCache;
use wcf\system\io\HttpFactory;
use wcf\system\payment\type\IPaymentType;
use wcf\util\StringUtil;

/**
* Handles Paypal callbacks.
Expand Down Expand Up @@ -69,7 +68,7 @@ public function execute()
// fix encoding
if (!empty($_POST['charset']) && \strtoupper($_POST['charset']) != 'UTF-8') {
foreach ($_POST as &$value) {
$value = StringUtil::convertEncoding(\strtoupper($_POST['charset']), 'UTF-8', $value);
$value = \mb_convert_encoding($value, 'UTF-8', \strtoupper($_POST['charset']));
}
}

Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/page/AbstractPage.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public function show()
$requestURI = (!empty($_SERVER['UNENCODED_URL'])) ? $_SERVER['UNENCODED_URL'] : $_SERVER['REQUEST_URI'];

if (!StringUtil::isUTF8($requestURI)) {
$requestURI = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $requestURI);
$requestURI = \mb_convert_encoding($requestURI, 'UTF-8', 'ISO-8859-1');
}

// some webservers output lower-case encoding (e.g. %c3 instead of %C3)
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/system/bbcode/KeywordHighlighter.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ protected function parseKeywords($keywordString)
{
// convert encoding if necessary
if (!StringUtil::isUTF8($keywordString)) {
$keywordString = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $keywordString);
$keywordString = \mb_convert_encoding($keywordString, 'UTF-8', 'ISO-8859-1');
}

// remove bad wildcards
Expand Down
2 changes: 1 addition & 1 deletion wcfsetup/install/files/lib/system/message/unfurl/UnfurlResponse.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private function readBody(): void

if ($this->responseCharset !== 'UTF-8') {
try {
$this->body = StringUtil::convertEncoding($this->responseCharset, 'UTF-8', $this->body);
$this->body = \mb_convert_encoding($this->body, 'UTF-8', $this->responseCharset);
} catch (Exception | ValueError $e) {
throw new ParsingFailed(
"Could not parse body, due an invalid charset.",
Expand Down
15 changes: 1 addition & 14 deletions wcfsetup/install/files/lib/util/StringUtil.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,23 +525,10 @@ public static function escapeCDATA($string)
}

/**
* Converts a string to requested character encoding.
* @param string $inCharset
* @param string $outCharset
* @param string $string
* @return string converted string
* @see mb_convert_encoding()
*
* @deprecated 5.6 Use `\mb_convert_encoding()` directly.
*/
public static function convertEncoding($inCharset, $outCharset, $string)
{
if ($inCharset == 'ISO-8859-1' && $outCharset == 'UTF-8') {
return \utf8_encode($string);
}
if ($inCharset == 'UTF-8' && $outCharset == 'ISO-8859-1') {
return \utf8_decode($string);
}

return \mb_convert_encoding($string, $outCharset, $inCharset);
}

Expand Down
4 changes: 2 additions & 2 deletions wcfsetup/install/files/lib/util/UserUtil.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function getUserAgent()
if (isset($_SERVER['HTTP_USER_AGENT'])) {
$userAgent = $_SERVER['HTTP_USER_AGENT'];
if (!StringUtil::isUTF8($userAgent)) {
$userAgent = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $userAgent);
$userAgent = \mb_convert_encoding($userAgent, 'UTF-8', 'ISO-8859-1');
}

return \mb_substr($userAgent, 0, 191);
Expand Down Expand Up @@ -247,7 +247,7 @@ public static function getRequestURI()

// fix encoding
if (!StringUtil::isUTF8($REQUEST_URI)) {
$REQUEST_URI = StringUtil::convertEncoding('ISO-8859-1', 'UTF-8', $REQUEST_URI);
$REQUEST_URI = \mb_convert_encoding($REQUEST_URI, 'UTF-8', 'ISO-8859-1');
}

return \mb_substr(FileUtil::unifyDirSeparator($REQUEST_URI), 0, 255);
Expand Down