Remove the need for FormatterTrait::getCanonicalSymbols() by making p…

…arseNumber() smarter.
commerceguys · Oct 4, 2020 · 7ce8ba0 · 7ce8ba0
1 parent e7c1a45
commit 7ce8ba0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 50 deletions.
diff --git a/src/Formatter/CurrencyFormatter.php b/src/Formatter/CurrencyFormatter.php
@@ -252,23 +252,4 @@ protected function getLocalizedSymbols(NumberFormat $numberFormat): array
             '%' => $numberFormat->getPercentSign(),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getCanonicalSymbols(NumberFormat $numberFormat): array
-    {
-        return  [
-            $numberFormat->getGroupingCurrencySeparator() => '',
-            // Convert the localized symbols back to their original form.
-            $numberFormat->getDecimalCurrencySeparator() => '.',
-            $numberFormat->getPlusSign() => '+',
-            $numberFormat->getMinusSign() => '-',
-            $numberFormat->getPercentSign() => '%',
-
-            // Strip whitespace (spaces and non-breaking spaces).
-            ' ' => '',
-            chr(0xC2) . chr(0xA0) => '',
-        ];
-    }
 }
diff --git a/src/Formatter/FormatterTrait.php b/src/Formatter/FormatterTrait.php
@@ -143,14 +143,22 @@ protected function localizeNumber($number, NumberFormat $numberFormat)
      */
     protected function parseNumber($number, NumberFormat $numberFormat)
     {
-        $replacements = $this->getCanonicalSymbols($numberFormat);
+        // Convert localized symbols back to their original form.
+        $replacements = array_flip($this->getLocalizedSymbols($numberFormat));
+        // Strip whitespace (spaces and non-breaking spaces).
+        $replacements += [
+            ' ' => '',
+            chr(0xC2) . chr(0xA0) => '',
+        ];
         $numberingSystem = $numberFormat->getNumberingSystem();
         if (isset($this->digits[$numberingSystem])) {
             // Convert the localized digits back to latin.
             $replacements += array_flip($this->digits[$numberingSystem]);
         }
         $number = strtr($number, $replacements);
 
+        // Strip grouping separators.
+        $number = str_replace(',', '', $number);
         // Convert the accounting format for negative numbers.
         if (substr($number, 0, 1) == '(' && substr($number, -1, 1) == ')') {
             $number = '-' . str_replace(['(', ')'], '', $number);
@@ -197,20 +205,13 @@ protected function getParsedPattern(NumberFormat $numberFormat, $style)
     abstract protected function getAvailablePatterns(NumberFormat $numberFormat);
 
     /**
-     * Returns the replacements to be used for the localizeNumber method.
+     * Gets the localized symbols for the provided number format.
      *
-     * @param NumberFormat $numberFormat
+     * Used to localize the number in localizeNumber().
      *
-     * @return array
-     */
-    abstract protected function getLocalizedSymbols(NumberFormat $numberFormat): array;
-
-    /**
-     * Returns the replacements to be used for the parseNumber method.
-     *
-     * @param NumberFormat $numberFormat
+     * @param NumberFormat $numberFormat The number format.
      *
      * @return array
      */
-    abstract protected function getCanonicalSymbols(NumberFormat $numberFormat): array;
+    abstract protected function getLocalizedSymbols(NumberFormat $numberFormat): array;
 }
diff --git a/src/Formatter/NumberFormatter.php b/src/Formatter/NumberFormatter.php
@@ -174,23 +174,4 @@ protected function getLocalizedSymbols(NumberFormat $numberFormat): array
             '%' => $numberFormat->getPercentSign(),
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function getCanonicalSymbols(NumberFormat $numberFormat): array
-    {
-        return  [
-            $numberFormat->getGroupingSeparator() => '',
-            // Convert the localized symbols back to their original form.
-            $numberFormat->getDecimalSeparator() => '.',
-            $numberFormat->getPlusSign() => '+',
-            $numberFormat->getMinusSign() => '-',
-            $numberFormat->getPercentSign() => '%',
-
-            // Strip whitespace (spaces and non-breaking spaces).
-            ' ' => '',
-            chr(0xC2) . chr(0xA0) => '',
-        ];
-    }
 }