Skip to content
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.

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

[5.4] Added second $encoding parameter to length #19047

Merged
merged 1 commit into from
May 5, 2017
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/Illuminate/Support/Str.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,12 @@ public static function kebab($value)
* Return the length of the given string.
*
* @param string $value
* @param string $encoding
* @return int
*/
public static function length($value)
public static function length($value, $encoding = null)
{
return mb_strlen($value);
return mb_strlen($value, $encoding ?: mb_internal_encoding());
}

/**
Expand Down