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

- Use magento json serializer;

Author: adifucan

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Locale\Currency as LocaleCurrency;
 use Magento\Framework\Locale\ResolverInterface as LocalResolverInterface;
 use Magento\Framework\NumberFormatterFactory;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Currency model
@@ -94,6 +95,11 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      */
     private $numberFormatterCache;
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -108,6 +114,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * @param CurrencyConfig|null $currencyConfig
      * @param LocalResolverInterface|null $localeResolver
      * @param NumberFormatterFactory|null $numberFormatterFactory
+     * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -123,7 +130,8 @@ public function __construct(
         array $data = [],
         CurrencyConfig $currencyConfig = null,
         LocalResolverInterface $localeResolver = null,
-        \Magento\Framework\NumberFormatterFactory $numberFormatterFactory = null
+        \Magento\Framework\NumberFormatterFactory $numberFormatterFactory = null,
+        Json $serializer = null
     ) {
         parent::__construct(
             $context,
@@ -140,6 +148,7 @@ public function __construct(
         $this->currencyConfig = $currencyConfig ?: ObjectManager::getInstance()->get(CurrencyConfig::class);
         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(LocalResolverInterface::class);
         $this->numberFormatterFactory = $numberFormatterFactory ?: ObjectManager::getInstance()->get(NumberFormatterFactory::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -356,7 +365,7 @@ public function formatTxt($price, $options = [])
          */
         $price = sprintf("%F", $price);
 
-        if ($this->useNumberFormatter($options)) {
+        if ($this->canUseNumberFormatter($options)) {
             return $this->formatCurrency($price, $options);
         }
 
@@ -369,7 +378,7 @@ public function formatTxt($price, $options = [])
      * @param array $options
      * @return bool
      */
-    private function useNumberFormatter(array $options): bool
+    private function canUseNumberFormatter(array $options): bool
     {
         $allowedOptions = [
             'precision',
@@ -435,7 +444,7 @@ private function formatCurrency(string $price, array $options): string
      */
     private function getNumberFormatter(array $options): \Magento\Framework\NumberFormatter
     {
-        $key = 'currency_' . md5($this->localeResolver->getLocale() . serialize($options));
+        $key = 'currency_' . md5($this->localeResolver->getLocale() . $this->serializer->serialize($options));
         if (!isset($this->numberFormatterCache[$key])) {
             $this->numberFormatter = $this->numberFormatterFactory->create(
                 ['locale' => $this->localeResolver->getLocale(), 'style' => \NumberFormatter::CURRENCY]

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

@@ -11,6 +11,7 @@
 use Magento\Framework\Locale\CurrencyInterface;
 use Magento\Framework\Locale\ResolverInterface as LocalResolverInterface;
 use Magento\Framework\NumberFormatterFactory;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -39,6 +40,11 @@ class CurrencyTest extends TestCase
      */
     private $numberFormatterFactory;
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
     protected function setUp(): void
     {
         $this->localeCurrencyMock = $this->getMockForAbstractClass(CurrencyInterface::class);
@@ -51,6 +57,9 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
+        $this->serializer = $this->getMockBuilder(Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $objectManager = new ObjectManager($this);
         $this->currency = $objectManager->getObject(
@@ -60,6 +69,7 @@ protected function setUp(): void
                 'currencyFilterFactory' => $currencyFilterFactory,
                 'localeResolver' => $this->localeResolver,
                 'numberFormatterFactory' => $this->numberFormatterFactory,
+                'serializer' => $this->serializer,
                 'data' => [
                     'currency_code' => $this->currencyCode,
                 ]
@@ -97,6 +107,12 @@ public function testGetOutputFormat($expected, $locale): void
             ->method('create')
             ->with(['locale' => $locale, 'style' => 2])
             ->willReturn(new \Magento\Framework\NumberFormatter($locale, 2));
+        $this->serializer->method('serialize')->willReturnMap(
+            [
+                [[], '[]'],
+                [['display' => 1], '{"display":1}']
+            ]
+        );
         self::assertEquals($expected, $this->currency->getOutputFormat());
     }
 
@@ -138,6 +154,11 @@ public function testFormatTxtWithNumberFormatter(
             ->method('create')
             ->with(['locale' => $locale, 'style' => 2])
             ->willReturn(new \Magento\Framework\NumberFormatter($locale, 2));
+        $this->serializer->method('serialize')->willReturnMap(
+            [
+                [[], '[]']
+            ]
+        );
 
         self::assertEquals($expected, $this->currency->formatTxt($price, $options));
     }
@@ -179,6 +200,11 @@ public function testFormatTxtWithZendCurrency(string $price, array $options, str
             ->method('getCurrency')
             ->with($this->currencyCode)
             ->willReturn(new \Zend_Currency($options, 'en_US'));
+        $this->serializer->method('serialize')->willReturnMap(
+            [
+                [[], '[]']
+            ]
+        );
 
         self::assertEquals($expected, $this->currency->formatTxt($price, $options));
     }