diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mb_detect_encoding with $strict = true

This commit is contained in:
Nicolas Grekas 2015-10-28 00:14:24 +01:00
parent 2d588710ff
commit e6c89f15e4
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
View File

@ -160,7 +160,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
$dbalLogger $dbalLogger
->expects($this->once()) ->expects($this->once())
->method('log') ->method('log')
->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, mb_detect_encoding($longString)).' [...]')) ->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'))
; ;
$dbalLogger->startQuery('SQL', array( $dbalLogger->startQuery('SQL', array(

4
src/Symfony/Component/Console/Application.php
View File

@ -1089,7 +1089,7 @@ class Application
return strlen($string); return strlen($string);
} }
if (false === $encoding = mb_detect_encoding($string)) { if (false === $encoding = mb_detect_encoding($string, null, true)) {
return strlen($string); return strlen($string);
} }
@ -1106,7 +1106,7 @@ class Application
return str_split($string, $width); return str_split($string, $width);
} }
if (false === $encoding = mb_detect_encoding($string)) { if (false === $encoding = mb_detect_encoding($string, null, true)) {
return str_split($string, $width); return str_split($string, $width);
} }

2
src/Symfony/Component/Console/Helper/Helper.php
View File

@ -53,7 +53,7 @@ abstract class Helper implements HelperInterface
return strlen($string); return strlen($string);
} }
if (false === $encoding = mb_detect_encoding($string)) { if (false === $encoding = mb_detect_encoding($string, null, true)) {
return strlen($string); return strlen($string);
} }

2
src/Symfony/Component/Console/Helper/TableHelper.php
View File

@ -386,7 +386,7 @@ class TableHelper extends Helper
$width = $this->getColumnWidth($column); $width = $this->getColumnWidth($column);
// str_pad won't work properly with multi-byte strings, we need to fix the padding // str_pad won't work properly with multi-byte strings, we need to fix the padding
if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) { if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell, null, true)) {
$width += strlen($cell) - mb_strwidth($cell, $encoding); $width += strlen($cell) - mb_strwidth($cell, $encoding);
} }

2
src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
View File

@ -132,7 +132,7 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like'); throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like');
} }
if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value)) { if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value, null, true)) {
$length = mb_strlen($value, $encoding); $length = mb_strlen($value, $encoding);
$remainder = mb_substr($value, $position, $length, $encoding); $remainder = mb_substr($value, $position, $length, $encoding);
} else { } else {