MCP-288: [Load Cart Section] Replace Zend_Currency component with Intl NumberFormatter

- Fix custom currency symbol display;

Author: adifucan

app/code/Magento/Directory/Model/Currency.php

@@ -401,7 +401,7 @@ private function formatCurrency(string $price, array $options): string
             'currency_display_options_forming',
             ['currency_options' => $customerOptions, 'base_code' => $this->getCode()]
         );
-        $options = array_merge($options, $customerOptions->toArray());
+        $options += $customerOptions->toArray();
 
         $this->numberFormatter = $this->numberFormatterFactory->create(
             ['locale' => $this->localeResolver->getLocale(), 'style' => \NumberFormatter::CURRENCY]
@@ -413,8 +413,9 @@ private function formatCurrency(string $price, array $options): string
             $price, $this->getCode() ?? $this->numberFormatter->getTextAttribute(\NumberFormatter::CURRENCY_CODE)
         );
 
-        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
-            && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL) {
+        if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
+                && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)
+            || array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)) {
             $formattedCurrency = str_replace(' ', '', $formattedCurrency);
         }
 
@@ -429,18 +430,18 @@ private function formatCurrency(string $price, array $options): string
      */
     private function setOptions(array $options): void
     {
+        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)) {
+            $this->numberFormatter->setSymbol(
+                \NumberFormatter::CURRENCY_SYMBOL, $options[LocaleCurrency::CURRENCY_OPTION_SYMBOL]
+            );
+        }
         if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
             && $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL) {
             $this->numberFormatter->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, '');
         }
         if (array_key_exists('precision', $options)) {
             $this->numberFormatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $options['precision']);
         }
-        if (array_key_exists(LocaleCurrency::CURRENCY_OPTION_SYMBOL, $options)) {
-            $this->numberFormatter->setSymbol(
-                \NumberFormatter::CURRENCY_SYMBOL, $options[LocaleCurrency::CURRENCY_OPTION_SYMBOL]
-            );
-        }
     }
 
     /**

app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php

@@ -153,7 +153,14 @@ public function getFormatTxtNumberFormatterDataProvider(): array
             ['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', ['precision' => 1], 'en_US', '$9,999.0']
+            ['9999', ['precision' => 1], 'en_US', '$9,999.0'],
+            ['9999', ['precision' => 2, 'symbol' => '#'], 'en_US', '#9,999.00'],
+            [
+                '9999.99',
+                ['precision' => 2, 'symbol' => '#', 'display' => \Magento\Framework\Currency::NO_SYMBOL],
+                'en_US',
+                '9,999.99'
+            ],
         ];
     }