[String] improve slugger's portability accross implementations of iconv()

nicolas-grekas · nicolas-grekas · commit dfec24bcc162 · 2020-09-15T12:20:00.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -137,15 +137,15 @@ public function ascii(array $rules = []): self
                 }
             } elseif (!\function_exists('iconv')) {
                 $s = preg_replace('/[^\x00-\x7F]/u', '?', $s);
-            } elseif (\ICONV_IMPL === 'glibc') {
-                $s = iconv('UTF-8', 'ASCII//TRANSLIT', $s);
             } else {
                 $s = @preg_replace_callback('/[^\x00-\x7F]/u', static function ($c) {
-                    if ('' === $c = (string) iconv('UTF-8', 'ASCII//IGNORE//TRANSLIT', $c[0])) {
+                    $c = (string) iconv('UTF-8', 'ASCII//TRANSLIT', $c[0]);
+
+                    if ('' === $c && '2' !== iconv('UTF-8', 'ASCII//TRANSLIT', '²')) {
                         throw new \LogicException(sprintf('"%s" requires a translit-able iconv implementation, try installing "gnu-libiconv" if you\'re using Alpine Linux.', static::class));
                     }
 
-                    return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : (\strlen($c) ? $c : '?');
+                    return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : ('' !== $c ? $c : '?');
                 }, $s);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -137,15 +137,15 @@ public function ascii(array $rules = []): self`
`137`	`137`	`}`
`138`	`138`	`} elseif (!\function_exists('iconv')) {`
`139`	`139`	`$s = preg_replace('/[^\x00-\x7F]/u', '?', $s);`
`140`		`- } elseif (\ICONV_IMPL === 'glibc') {`
`141`		`- $s = iconv('UTF-8', 'ASCII//TRANSLIT', $s);`
`142`	`140`	`} else {`
`143`	`141`	`$s = @preg_replace_callback('/[^\x00-\x7F]/u', static function ($c) {`
`144`		`- if ('' === $c = (string) iconv('UTF-8', 'ASCII//IGNORE//TRANSLIT', $c[0])) {`
	`142`	`+ $c = (string) iconv('UTF-8', 'ASCII//TRANSLIT', $c[0]);`
	`143`	`+`
	`144`	`+ if ('' === $c && '2' !== iconv('UTF-8', 'ASCII//TRANSLIT', '²')) {`
`145`	`145`	`throw new \LogicException(sprintf('"%s" requires a translit-able iconv implementation, try installing "gnu-libiconv" if you\'re using Alpine Linux.', static::class));`
`146`	`146`	`}`
`147`	`147`
`148`		- return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : (\strlen($c) ? $c : '?');
	`148`	+ return 1 < \strlen($c) ? ltrim($c, '\'`"^~') : ('' !== $c ? $c : '?');
`149`	`149`	`}, $s);`
`150`	`150`	`}`
`151`	`151`	`}`