Merge branch 'ACP2E-508' of https://github.com/magento-l3/magento2ce into PR-2022-02-22

Anna Bukatar · Anna Bukatar · commit 031b784cb040 · 2022-02-22T18:35:30.000-08:00
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
@@ -28,11 +28,11 @@ class Currency extends \Magento\Framework\Model\AbstractModel
     /**
      * CONFIG path constants
      */
-    const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';
+    public const XML_PATH_CURRENCY_ALLOW = 'currency/options/allow';
 
-    const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';
+    public const XML_PATH_CURRENCY_DEFAULT = 'currency/options/default';
 
-    const XML_PATH_CURRENCY_BASE = 'currency/options/base';
+    public const XML_PATH_CURRENCY_BASE = 'currency/options/base';
 
     /**
      * @var Filter
@@ -439,7 +439,7 @@ private function formatCurrency(string $price, array $options): string
 
         if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
                 && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
-            $formattedCurrency = preg_replace(['/[^0-9.,۰٫]+/', '/ /'], '', $formattedCurrency);
+            $formattedCurrency = str_replace(' ', '', $formattedCurrency);
         }
 
         return preg_replace('/^\s+|\s+$/u', '', $formattedCurrency);
@@ -453,13 +453,11 @@ private function formatCurrency(string $price, array $options): string
      */
     private function getNumberFormatter(array $options): \Magento\Framework\NumberFormatter
     {
-        $key = 'currency_' . hash(
-            'sha256',
-            ($this->localeResolver->getLocale() . $this->serializer->serialize($options))
-        );
+        $locale = $this->localeResolver->getLocale() . ($this->getCode() ? '@currency=' . $this->getCode() : '');
+        $key = 'currency_' . hash('sha256', $locale . $this->serializer->serialize($options));
         if (!isset($this->numberFormatterCache[$key])) {
             $this->numberFormatter = $this->numberFormatterFactory->create(
-                ['locale' => $this->localeResolver->getLocale(), 'style' => \NumberFormatter::CURRENCY]
+                ['locale' => $locale, 'style' => \NumberFormatter::CURRENCY]
             );
 
             $this->setOptions($options);
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php b/app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php
@@ -7,7 +7,8 @@
 
 namespace Magento\Directory\Test\Unit\Model;
 
-use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\Currency as CurrencyModel;
+use Magento\Framework\Currency;
 use Magento\Framework\Locale\CurrencyInterface;
 use Magento\Framework\Locale\ResolverInterface as LocalResolverInterface;
 use Magento\Framework\NumberFormatterFactory;
@@ -19,10 +20,13 @@
 class CurrencyTest extends TestCase
 {
     /**
-     * @var Currency
+     * @var CurrencyModel
      */
     protected $currency;
 
+    /**
+     * @var string
+     */
     protected $currencyCode = 'USD';
 
     /**
@@ -63,7 +67,7 @@ protected function setUp(): void
 
         $objectManager = new ObjectManager($this);
         $this->currency = $objectManager->getObject(
-            Currency::class,
+            CurrencyModel::class,
             [
                 'localeCurrency' => $this->localeCurrencyMock,
                 'currencyFilterFactory' => $currencyFilterFactory,
@@ -81,7 +85,7 @@ public function testGetCurrencySymbol(): void
     {
         $currencySymbol = '$';
 
-        $currencyMock = $this->getMockBuilder(\Magento\Framework\Currency::class)
+        $currencyMock = $this->getMockBuilder(Currency::class)
             ->disableOriginalConstructor()
             ->getMock();
         $currencyMock->expects(self::once())
@@ -97,22 +101,31 @@ public function testGetCurrencySymbol(): void
 
     /**
      * @dataProvider getOutputFormatDataProvider
-     * @param $expected
-     * @param $locale
+     * @param string $locale
+     * @param string $currency
+     * @param string $expected
      */
-    public function testGetOutputFormat($expected, $locale): void
+    public function testGetOutputFormat(string $locale, string $currency, string $expected): void
     {
-        $this->localeResolver->method('getLocale')->willReturn($locale);
+        $this->localeResolver->expects(self::atLeastOnce())
+            ->method('getLocale')
+            ->willReturn($locale);
         $this->numberFormatterFactory
+            ->expects(self::exactly(2))
             ->method('create')
-            ->with(['locale' => $locale, 'style' => 2])
-            ->willReturn(new \Magento\Framework\NumberFormatter($locale, 2));
+            ->willReturnCallback(
+                function (array $args) {
+                    return new \Magento\Framework\NumberFormatter($args['locale'], $args['style']);
+                }
+            );
         $this->serializer->method('serialize')->willReturnMap(
             [
                 [[], '[]'],
                 [['display' => 1], '{"display":1}']
             ]
         );
+
+        $this->currency->load($currency);
         self::assertEquals($expected, $this->currency->getOutputFormat());
     }
 
@@ -124,42 +137,58 @@ public function testGetOutputFormat($expected, $locale): void
     public function getOutputFormatDataProvider(): array
     {
         return [
-            'no_unicode' => [
-                'expected' => '$%s',
-                'locale' => 'en_US'
-            ],
-            'arabic_unicode' => [
-                'expected' => json_decode('"\u200E"') . '$%s',
-                'locale' => 'fa_IR'
-            ]
+            'en_US:USD' => ['en_US', 'USD', '$%s'],
+            'en_US:PLN' => ['en_US', 'PLN', "PLN\u{00A0}%s"],
+            'en_US:PKR' => ['en_US', 'PKR', "PKR\u{00A0}%s"],
+            'af_ZA:VND' => ['af_ZA', 'VND', "\u{20AB}%s"],
+            'ar_DZ:EGP' => ['ar_DZ', 'EGP', "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s"],
+            'ar_SA:USD' => ['ar_SA', 'USD', "%s\u{00A0}US$"],
+            'ar_SA:LBP' => ['ar_SA', 'LBP', "%s\u{00A0}\u{0644}.\u{0644}.\u{200F}"],
+            'fa_IR:USD' => ['fa_IR', 'USD', "\u{200E}$%s"],
+            'ar_KW:USD' => ['ar_KW', 'USD', "%s\u{00A0}US$"],
+            'bn_BD:IQD' => ['bn_BD', 'IQD', "%s\u{00A0}IQD"],
+            'ca_ES:VND' => ['ca_ES', 'VND', "%s\u{00A0}\u{20AB}"],
+            'de_DE:USD' => ['de_DE', 'USD', "%s\u{00A0}$"],
+            'de_DE:AED' => ['de_DE', 'AED', "%s\u{00A0}AED"],
+            'es_VE:VEF' => ['es_VE', 'VEF', "Bs.\u{00A0}%s"],
+            'pl_PL:USD' => ['pl_PL', 'USD', "%s\u{00A0}USD"],
+            'pl_PL:PLN' => ['pl_PL', 'PLN', "%s\u{00A0}z\u{0142}"],
         ];
     }
 
     /**
      * @dataProvider getFormatTxtNumberFormatterDataProvider
+     * @param string $locale
+     * @param string $currency
      * @param string $price
      * @param array $options
-     * @param string $locale
      * @param string $expected
      */
     public function testFormatTxtWithNumberFormatter(
+        string $locale,
+        string $currency,
         string $price,
         array $options,
-        string $locale,
         string $expected
     ): void {
-        $this->localeResolver->expects(self::exactly(2))->method('getLocale')->willReturn($locale);
+        $this->localeResolver->expects(self::once())
+            ->method('getLocale')
+            ->willReturn($locale);
         $this->numberFormatterFactory
             ->expects(self::once())
             ->method('create')
-            ->with(['locale' => $locale, 'style' => 2])
-            ->willReturn(new \Magento\Framework\NumberFormatter($locale, 2));
+            ->willReturnCallback(
+                function (array $args) {
+                    return new \Magento\Framework\NumberFormatter($args['locale'], $args['style']);
+                }
+            );
         $this->serializer->method('serialize')->willReturnMap(
             [
                 [[], '[]']
             ]
         );
 
+        $this->currency->load($currency);
         self::assertEquals($expected, $this->currency->formatTxt($price, $options));
     }
 
@@ -171,16 +200,39 @@ public function testFormatTxtWithNumberFormatter(
     public function getFormatTxtNumberFormatterDataProvider(): array
     {
         return [
-            ['9999', [], 'en_US', '$9,999.00'],
-            ['9999', ['display' => \Magento\Framework\Currency::NO_SYMBOL, 'precision' => 2], 'en_US', '9,999.00'],
-            ['9999', ['display' => \Magento\Framework\Currency::NO_SYMBOL], 'en_US', '9,999.00'],
-            [' 9999', ['display' => \Magento\Framework\Currency::NO_SYMBOL], 'en_US', '9,999.00'],
-            ['9999', ['precision' => 1], 'en_US', '$9,999.0'],
-            ['9999', ['precision' => 2, 'symbol' => '#'], 'en_US', '#9,999.00'],
+            ['en_US', 'USD', '9999', [], '$9,999.00'],
+            ['en_US', 'EUR', '9999', [], '€9,999.00'],
+            ['en_US', 'LBP', '9999', [], "LBP\u{00A0}9,999"],
+            ['ar_AE', 'USD', '9', [], "\u{0669}\u{066B}\u{0660}\u{0660}\u{00A0}US$"],
+            ['ar_AE', 'AED', '9', [], "\u{0669}\u{066B}\u{0660}\u{0660}\u{00A0}\u{062F}.\u{0625}.\u{200F}"],
+            ['de_DE', 'USD', '9999', [], "9.999,00\u{00A0}$"],
+            ['de_DE', 'EUR', '9999', [], "9.999,00\u{00A0}€"],
+            ['en_US', 'USD', '9999', ['display' => Currency::NO_SYMBOL, 'precision' => 2], '9,999.00'],
+            ['en_US', 'USD', '9999', ['display' => Currency::NO_SYMBOL], '9,999.00'],
+            ['en_US', 'PLN', '9999', ['display' => Currency::NO_SYMBOL], '9,999.00'],
+            ['en_US', 'LBP', '9999', ['display' => Currency::NO_SYMBOL], '9,999'],
+            [
+                'ar_AE',
+                'USD',
+                '9999',
+                ['display' => Currency::NO_SYMBOL],
+                "\u{0669}\u{066C}\u{0669}\u{0669}\u{0669}\u{066B}\u{0660}\u{0660}"
+            ],
+            [
+                'ar_AE',
+                'AED',
+                '9999',
+                ['display' => Currency::NO_SYMBOL],
+                "\u{0669}\u{066C}\u{0669}\u{0669}\u{0669}\u{066B}\u{0660}\u{0660}"
+            ],
+            ['en_US', 'USD', ' 9999', ['display' => Currency::NO_SYMBOL], '9,999.00'],
+            ['en_US', 'USD', '9999', ['precision' => 1], '$9,999.0'],
+            ['en_US', 'USD', '9999', ['precision' => 2, 'symbol' => '#'], '#9,999.00'],
             [
-                '9999.99',
-                ['precision' => 2, 'symbol' => '#', 'display' => \Magento\Framework\Currency::NO_SYMBOL],
                 'en_US',
+                'USD',
+                '9999.99',
+                ['precision' => 2, 'symbol' => '#', 'display' => Currency::NO_SYMBOL],
                 '9,999.99'
             ],
         ];
@@ -217,11 +269,11 @@ public function testFormatTxtWithZendCurrency(string $price, array $options, str
     public function getFormatTxtZendCurrencyDataProvider(): array
     {
         return [
-            ['9999', ['display' => \Magento\Framework\Currency::USE_SYMBOL, 'foo' => 'bar'], '$9,999.00'],
-            ['9999', ['display' => \Magento\Framework\Currency::USE_SHORTNAME, 'foo' => 'bar'], 'USD9,999.00'],
+            ['9999', ['display' => Currency::USE_SYMBOL, 'foo' => 'bar'], '$9,999.00'],
+            ['9999', ['display' => Currency::USE_SHORTNAME, 'foo' => 'bar'], 'USD9,999.00'],
             ['9999', ['currency' => 'USD'], '$9,999.00'],
             ['9999', ['currency' => 'CNY'], 'CN¥9,999.00'],
-            ['9999', ['locale' => 'fr_FR'], '9 999,00 $']
+            ['9999', ['locale' => 'fr_FR'], "9\u{00A0}999,00\u{00A0}$"]
         ];
     }
 }
