Fix number trim in case of multibyte characters

commerceguys · Nov 30, 2018 · db57e62 · db57e62
1 parent 6514870
commit db57e62
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/src/Formatter/CurrencyFormatter.php b/src/Formatter/CurrencyFormatter.php
@@ -8,6 +8,7 @@
 use CommerceGuys\Intl\Exception\UnknownCurrencyException;
 use CommerceGuys\Intl\NumberFormat\NumberFormat;
 use CommerceGuys\Intl\NumberFormat\NumberFormatRepositoryInterface;
+use CommerceGuys\Intl\Calculator;
 
 /**
  * Formats currency amounts using locale-specific patterns.
@@ -96,7 +97,7 @@ public function format($number, $currencyCode, array $options = [])
             $message = sprintf('The provided value "%s" is not a valid number or numeric string.', $number);
             throw new InvalidArgumentException($message);
         }
-
+        $negative = (Calculator::compare('0', $number, 12) == 1);
         $this->validateOptions($options);
         $options = array_replace($this->defaultOptions, $options);
         $numberFormat = $this->getNumberFormat($options['locale']);
@@ -117,8 +118,9 @@ 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");
+            $negative_sign = $negative ? $numberFormat->getMinusSign() : '';
+            $pattern = '/^' . $negative_sign . '¤*\s*(.*?)\s*¤*$/us';
+            $number = preg_replace($pattern, $negative_sign . '$1', $number);
         }
 
         return $number;

diff --git a/tests/Formatter/CurrencyFormatterTest.php b/tests/Formatter/CurrencyFormatterTest.php
@@ -8,6 +8,7 @@
 use CommerceGuys\Intl\Formatter\CurrencyFormatter;
 use CommerceGuys\Intl\NumberFormat\NumberFormat;
 use CommerceGuys\Intl\NumberFormat\NumberFormatRepository;
+use CommerceGuys\Intl\Tests\NumberFormat\CustomNumberFormatRepository;
 
 /**
  * @coversDefaultClass \CommerceGuys\Intl\Formatter\CurrencyFormatter
@@ -184,6 +185,17 @@ public function testParse($locale, $currencyCode, $number, $expectedNumber)
         $this->assertSame($expectedNumber, $parsedNumber);
     }
 
+    /**
+     * @covers ::format
+     */
+    public function testFormatUtf8()
+    {
+        include __DIR__ . '/../NumberFormat/CustomNumberFormatRepository.php';
+        $numberFormatRepository = new CustomNumberFormatRepository();
+        $formatter = new CurrencyFormatter($numberFormatRepository, new CurrencyRepository());
+        $this->assertSame('\xc2\xb1950.00', $formatter->format('-950.000000', 'USD', ['currency_display' => 'none', 'locale' => 'tst']));
+    }
+
     /**
      * Provides the number format, currency format, number style, value and expected formatted value.
      */

diff --git a/tests/NumberFormat/CustomNumberFormatRepository.php b/tests/NumberFormat/CustomNumberFormatRepository.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace CommerceGuys\Intl\Tests\NumberFormat;
+
+use CommerceGuys\Intl\NumberFormat\NumberFormatRepository;
+
+/**
+ * Provides a custom number format.
+ */
+class CustomNumberFormatRepository extends NumberFormatRepository
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function getDefinitions()
+    {
+        $return = parent::getDefinitions();
+        $return['tst'] = [
+          'minus_sign' => "\xc2\xb1",
+        ];
+        return $return;
+    }
+}