Merge branch 'hotfix/73'

Close #73
Fixes #72

CHANGELOG.md

@@ -36,6 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#62](https://github.com/zendframework/zend-i18n/pull/62) fixes an issue with
   how the gettext adapter resolves `PoEdit` source keywords when a text_domain is
   defined.
+- [#73](https://github.com/zendframework/zend-i18n/pull/73) provides a
+  workaround within the `CurrencyFormat` view helper for an ICU bug
+  (http://bugs.icu-project.org/trac/ticket/10997).
 
 ## 2.7.3 - 2016-06-07
 

src/View/Helper/CurrencyFormat.php

@@ -54,6 +54,16 @@ class CurrencyFormat extends AbstractHelper
      */
     protected $showDecimals = true;
 
+    /**
+     * Special condition to be checked due to ICU bug:
+     * http://bugs.icu-project.org/trac/ticket/10997
+     *
+     * @var bool
+     */
+    protected $correctionNeeded = false;
+
+
+
     /**
      * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
      */
@@ -132,11 +142,16 @@ protected function formatCurrency(
 
         if ($showDecimals) {
             $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 2);
+            $this->correctionNeeded = false;
         } else {
             $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
+            $defaultCurrencyCode = $this->formatters[$formatterId]->getTextAttribute(NumberFormatter::CURRENCY_CODE);
+            $this->correctionNeeded = $defaultCurrencyCode !== $currencyCode;
         }
 
-        return $this->formatters[$formatterId]->formatCurrency($number, $currencyCode);
+        $formattedNumber = $this->formatters[$formatterId]->formatCurrency($number, $currencyCode);
+
+        return $this->correctionNeeded ? $this->correctICUBug($formattedNumber, $this->formatters[$formatterId]) : $formattedNumber;
     }
 
     /**
@@ -230,4 +245,18 @@ public function shouldShowDecimals()
     {
         return $this->showDecimals;
     }
+
+
+
+    /**
+     * @param string $formattedNumber
+     * @param NumberFormatter $formatter
+     * @return string
+     */
+    private function correctICUBug($formattedNumber, NumberFormatter $formatter)
+    {
+        $pattern = sprintf('/\%s\d+$/', $formatter->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL));
+
+        return preg_replace($pattern, '', $formattedNumber);
+    }
 }

test/View/Helper/CurrencyFormatTest.php

@@ -64,6 +64,8 @@ public function currencyProvider()
             //array('en_US', 'EUR',     false,             1234567.891234567890000,  null, '€1,234,568'),
             //array('en_US', 'EUR',     false,             1234567.891234567890000,  null, '€1,234,568'),
             ['en_US', 'USD',       false, 1234567.891234567890000, null,                       '$1,234,568'],
+            /* @see http://bugs.icu-project.org/trac/ticket/10997 */
+            ['en_US', 'EUR',       false, 1234567.891234567890000, null,                       '€1,234,567'],
         ];
     }