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

- Fix static, functional & integration tests;

Author: adifucan

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

@@ -11,6 +11,7 @@
 use Magento\Directory\Model\Currency\Filter;
 use Magento\Framework\Locale\Currency as LocaleCurrency;
 use Magento\Framework\Locale\ResolverInterface as LocalResolverInterface;
+use Magento\Framework\NumberFormatterFactory;
 
 /**
  * Currency model
@@ -79,7 +80,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
     private $localeResolver;
 
     /**
-     * @var \Magento\Framework\NumberFormatterFactory
+     * @var NumberFormatterFactory
      */
     private $numberFormatterFactory;
 
@@ -101,7 +102,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      * @param CurrencyConfig|null $currencyConfig
      * @param LocalResolverInterface|null $localeResolver
-     * @param \Magento\Framework\NumberFormatterFactory|null $numberFormatterFactory
+     * @param NumberFormatterFactory|null $numberFormatterFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -133,7 +134,7 @@ public function __construct(
         $this->_localeCurrency = $localeCurrency;
         $this->currencyConfig = $currencyConfig ?: ObjectManager::getInstance()->get(CurrencyConfig::class);
         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(LocalResolverInterface::class);
-        $this->numberFormatterFactory = $numberFormatterFactory ?: ObjectManager::getInstance()->get(\Magento\Framework\NumberFormatterFactory::class);
+        $this->numberFormatterFactory = $numberFormatterFactory ?: ObjectManager::getInstance()->get(NumberFormatterFactory::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/MultiStoreCurrencyTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Block\Product\View;
 
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -20,13 +21,17 @@ class MultiStoreCurrencyTest extends AbstractCurrencyTest
     /** @var StoreManagerInterface */
     private $storeManager;
 
+    /** @var ResolverInterface */
+    private $localeResolver;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
 
+        $this->localeResolver = $this->objectManager->get(ResolverInterface::class);
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
     }
 
@@ -46,9 +51,12 @@ protected function setUp(): void
      */
     public function testMultiStoreRenderPrice(): void
     {
-        $this->assertProductStorePrice('simple2', 'CN¥70.00');
+        $this->localeResolver->setLocale('zh_CN');
+        $this->assertProductStorePrice('simple2', '￥70.00');
+
         $this->reloadProductPriceInfo();
-        $this->assertProductStorePrice('simple2', '₴240.00', 'fixturestore');
+        $this->localeResolver->setLocale('uk_UA');
+        $this->assertProductStorePrice('simple2', '240,00 ₴', 'fixturestore');
     }
 
     /**
@@ -67,9 +75,12 @@ public function testMultiStoreRenderPrice(): void
      */
     public function testMultiStoreRenderSpecialPrice(): void
     {
-        $this->assertProductStorePrice('simple', 'Special Price CN¥41.93 Regular Price CN¥70.00');
+        $this->localeResolver->setLocale('zh_CN');
+        $this->assertProductStorePrice('simple', 'Special Price ￥41.93 Regular Price ￥70.00');
+
         $this->reloadProductPriceInfo();
-        $this->assertProductStorePrice('simple', 'Special Price ₴143.76 Regular Price ₴240.00', 'fixturestore');
+        $this->localeResolver->setLocale('uk_UA');
+        $this->assertProductStorePrice('simple', 'Special Price 143,76 ₴ Regular Price 240,00 ₴', 'fixturestore');
     }
 
     /**
@@ -88,16 +99,19 @@ public function testMultiStoreRenderSpecialPrice(): void
      */
     public function testMultiStoreRenderTierPrice(): void
     {
+        $this->localeResolver->setLocale('zh_CN');
         $this->assertProductStorePrice(
             'simple-product-tax-none',
-            'Buy 2 for CN¥280.00 each and save 80%',
+            'Buy 2 for ￥280.00 each and save 80%',
             'default',
             self::TIER_PRICE_BLOCK_NAME
         );
+
         $this->reloadProductPriceInfo();
+        $this->localeResolver->setLocale('uk_UA');
         $this->assertProductStorePrice(
             'simple-product-tax-none',
-            'Buy 2 for ₴960.00 each and save 80%',
+            'Buy 2 for 960,00 ₴ each and save 80%',
             'fixturestore',
             self::TIER_PRICE_BLOCK_NAME
         );
@@ -125,7 +139,7 @@ private function assertProductStorePrice(
             }
 
             $actualData = $this->processPriceView($productSku, $priceBlockName);
-            $this->assertEquals($expectedData, $actualData);
+            self::assertEquals($expectedData, $actualData);
         } finally {
             if ($currentStore->getCode() !== $storeCode) {
                 $this->storeManager->setCurrentStore($currentStore);
@@ -141,7 +155,16 @@ private function assertProductStorePrice(
     private function reloadProductPriceInfo(): void
     {
         $product = $this->registry->registry('product');
-        $this->assertNotNull($product);
+        self::assertNotNull($product);
         $product->reloadPriceInfo();
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $this->localeResolver->setLocale(\Magento\Setup\Module\I18n\Locale::DEFAULT_SYSTEM_LOCALE);
+        parent::tearDown();
+    }
 }