Skip to content

Silence errors from iconv_strlen() #639

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
gsherwood merged 1 commit into from
Jul 23, 2015
Merged

Silence errors from iconv_strlen() #639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CodeSniffer/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1511,7 +1511,7 @@ private static function _createPositionMap(&$tokens, $tokenizer, $eolChar, $enco
// There are no tabs in this content, or we aren't replacing them.
if ($checkEncoding === true) {
// Not using the default encoding, so take a bit more care.
$length = iconv_strlen($tokens[$i]['content'], $encoding);
$length = @iconv_strlen($tokens[$i]['content'], $encoding);
if ($length === false) {
// String contained invalid characters, so revert to default.
$length = strlen($tokens[$i]['content']);
Expand Down