bug #16359 Use mb_detect_encoding with $strict = true (nicolas-grekas)

fabpot · fabpot · commit c7e772c8d8ea · 2015-10-27T19:13:23.000-07:00
This PR was merged into the 2.3 branch. Discussion ---------- Use mb_detect_encoding with $strict = true | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Otherwise, UTF-8 can be returned for non-UTF8 strings... See e.g. https://3v4l.org/oMMnX Commits ------- e6c89f1 Use mb_detect_encoding with $strict = true
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -160,7 +160,7 @@ public function testLogUTF8LongString()
         $dbalLogger
             ->expects($this->once())
             ->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(
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1089,7 +1089,7 @@ private function stringWidth($string)
             return strlen($string);
         }
 
-        if (false === $encoding = mb_detect_encoding($string)) {
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return strlen($string);
         }
 
@@ -1106,7 +1106,7 @@ private function splitStringByWidth($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);
         }
 
diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
@@ -53,7 +53,7 @@ protected function strlen($string)
             return strlen($string);
         }
 
-        if (false === $encoding = mb_detect_encoding($string)) {
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return strlen($string);
         }
 
diff --git a/src/Symfony/Component/Console/Helper/TableHelper.php b/src/Symfony/Component/Console/Helper/TableHelper.php
@@ -386,7 +386,7 @@ private function renderCell(array $row, $column, $cellFormat)
         $width = $this->getColumnWidth($column);
 
         // 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);
         }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -132,7 +132,7 @@ public function reverseTransform($value)
             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);
             $remainder = mb_substr($value, $position, $length, $encoding);
         } else {

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function testLogUTF8LongString()`
`160`	`160`	`$dbalLogger`
`161`	`161`	`->expects($this->once())`
`162`	`162`	`->method('log')`
`163`		`- ->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, mb_detect_encoding($longString)).' [...]'))`
	`163`	`+ ->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'))`
`164`	`164`	`;`
`165`	`165`
`166`	`166`	`$dbalLogger->startQuery('SQL', array(`
Original file line number	Diff line number	Diff line change
`@@ -1089,7 +1089,7 @@ private function stringWidth($string)`
`1089`	`1089`	`return strlen($string);`
`1090`	`1090`	`}`
`1091`	`1091`
`1092`		`- if (false === $encoding = mb_detect_encoding($string)) {`
	`1092`	`+ if (false === $encoding = mb_detect_encoding($string, null, true)) {`
`1093`	`1093`	`return strlen($string);`
`1094`	`1094`	`}`
`1095`	`1095`
`@@ -1106,7 +1106,7 @@ private function splitStringByWidth($string, $width)`
`1106`	`1106`	`return str_split($string, $width);`
`1107`	`1107`	`}`
`1108`	`1108`
`1109`		`- if (false === $encoding = mb_detect_encoding($string)) {`
	`1109`	`+ if (false === $encoding = mb_detect_encoding($string, null, true)) {`
`1110`	`1110`	`return str_split($string, $width);`
`1111`	`1111`	`}`
`1112`	`1112`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function strlen($string)`
`53`	`53`	`return strlen($string);`
`54`	`54`	`}`
`55`	`55`
`56`		`- if (false === $encoding = mb_detect_encoding($string)) {`
	`56`	`+ if (false === $encoding = mb_detect_encoding($string, null, true)) {`
`57`	`57`	`return strlen($string);`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ private function renderCell(array $row, $column, $cellFormat)`
`386`	`386`	`$width = $this->getColumnWidth($column);`
`387`	`387`
`388`	`388`	`// str_pad won't work properly with multi-byte strings, we need to fix the padding`
`389`		`- if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) {`
	`389`	`+ if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell, null, true)) {`
`390`	`390`	`$width += strlen($cell) - mb_strwidth($cell, $encoding);`
`391`	`391`	`}`
`392`	`392`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function reverseTransform($value)`
`132`	`132`	`throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like');`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value)) {`
	`135`	`+ if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value, null, true)) {`
`136`	`136`	`$length = mb_strlen($value, $encoding);`
`137`	`137`	`$remainder = mb_substr($value, $position, $length, $encoding);`
`138`	`138`	`} else {`