Fix number trim in case of multibyte characters

commerceguys · Nov 21, 2018 · b7c39c4 · b7c39c4
1 parent 6514870
commit b7c39c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Formatter/CurrencyFormatter.php b/src/Formatter/CurrencyFormatter.php
@@ -117,8 +117,8 @@ public function format($number, $currencyCode, array $options = [])
             $number = str_replace('¤', $currency->getCurrencyCode(), $number);
         } else {
             // No symbol should be displayed. Remove leftover whitespace.
-            $number = str_replace('¤', '', $number);
-            $number = trim($number, " \xC2\xA0");
+            $pattern = '/^\s+|\s*¤*$/us';
+            $number = preg_replace($pattern, '', $number);
         }
 
         return $number;