Merge remote-tracking branch 'origin/MAGETWO-57070' into NORD-FIXES

Author: RuslanKostiv1

lib/internal/Magento/Framework/Locale/Format.php

@@ -5,15 +5,8 @@
  */
 namespace Magento\Framework\Locale;
 
-use Magento\Framework\Locale\Bundle\DataBundle;
-
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
-    /**
-     * @var string
-     */
-    private static $defaultNumberSet = 'latn';
-
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
      */
@@ -68,7 +61,7 @@ public function getNumber($value)
         }
 
         if (!is_string($value)) {
-            return floatval($value);
+            return (float)$value;
         }
 
         //trim spaces and apostrophes
@@ -79,16 +72,15 @@ public function getNumber($value)
 
         if ($separatorComa !== false && $separatorDot !== false) {
             if ($separatorComa > $separatorDot) {
-                $value = str_replace('.', '', $value);
-                $value = str_replace(',', '.', $value);
+                $value = str_replace(['.', ','], ['', '.'], $value);
             } else {
                 $value = str_replace(',', '', $value);
             }
         } elseif ($separatorComa !== false) {
             $value = str_replace(',', '.', $value);
         }
 
-        return floatval($value);
+        return (float)$value;
     }
 
     /**
@@ -97,8 +89,6 @@ public function getNumber($value)
      * @param string $localeCode Locale code.
      * @param string $currencyCode Currency code.
      * @return array
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getPriceFormat($localeCode = null, $currencyCode = null)
     {
@@ -108,25 +98,17 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
         } else {
             $currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
         }
-        $localeData = (new DataBundle())->get($localeCode);
-        $defaultSet = $localeData['NumberElements']['default'] ?: self::$defaultNumberSet;
-        $format = $localeData['NumberElements'][$defaultSet]['patterns']['currencyFormat']
-            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['patterns']['currencyFormat']
-                ?: explode(';', $localeData['NumberPatterns'][1])[0]);
-
-        $decimalSymbol = $localeData['NumberElements'][$defaultSet]['symbols']['decimal']
-            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['symbols']['decimal']
-                ?: $localeData['NumberElements'][0]);
 
-        $groupSymbol = $localeData['NumberElements'][$defaultSet]['symbols']['group']
-            ?: ($localeData['NumberElements'][self::$defaultNumberSet]['symbols']['group']
-                ?: $localeData['NumberElements'][1]);
+        $formatter = new \NumberFormatter($localeCode, \NumberFormatter::CURRENCY);
+        $format = $formatter->getPattern();
+        $decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
+        $groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
 
         $pos = strpos($format, ';');
         if ($pos !== false) {
             $format = substr($format, 0, $pos);
         }
-        $format = preg_replace("/[^0\#\.,]/", "", $format);
+        $format = preg_replace("/[^0\#\.,]/", '', $format);
         $totalPrecision = 0;
         $decimalPoint = strpos($format, '.');
         if ($decimalPoint !== false) {

lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Locale\Test\Unit;
+
+class FormatTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Framework\Locale\Format
+     */
+    protected $formatModel;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Locale\ResolverInterface
+     */
+    protected $localeResolver;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ScopeInterface
+     */
+    protected $scope;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\ScopeResolverInterface
+     */
+    protected $scopeResolver;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Directory\Model\Currency
+     */
+    protected $currency;
+
+    protected function setUp()
+    {
+        $this->currency = $this->getMockBuilder(\Magento\Directory\Model\Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)
+            ->setMethods(['getCurrentCurrency'])
+            ->getMockForAbstractClass();
+        $this->scope->expects($this->once())
+            ->method('getCurrentCurrency')
+            ->willReturn($this->currency);
+        $this->scopeResolver = $this->getMockBuilder(\Magento\Framework\App\ScopeResolverInterface::class)
+            ->setMethods(['getScope'])
+            ->getMockForAbstractClass();
+        $this->scopeResolver->expects($this->any())
+            ->method('getScope')
+            ->willReturn($this->scope);
+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
+            ->getMock();
+        $currencyFactory = $this->getMockBuilder(\Magento\Directory\Model\CurrencyFactory::class)
+            ->getMock();
+
+        $this->formatModel = new \Magento\Framework\Locale\Format(
+            $this->scopeResolver,
+            $this->localeResolver,
+            $currencyFactory
+        );
+    }
+
+    /**
+     * @param $localeCode
+     * @param $expectedResult
+     * @dataProvider getPriceFormatDataProvider
+     */
+    public function testGetPriceFormat($localeCode, $expectedResult)
+    {
+        $result = $this->formatModel->getPriceFormat($localeCode);
+        $intersection = array_intersect_assoc($result, $expectedResult);
+        $this->assertCount(count($expectedResult), $intersection);
+    }
+
+    /**
+     * @return array
+     */
+    public function getPriceFormatDataProvider()
+    {
+        return [
+            ['en_US', ['decimalSymbol' => '.', 'groupSymbol' => ',']],
+            ['de_DE', ['decimalSymbol' => ',', 'groupSymbol' => '.']],
+            ['de_CH', ['decimalSymbol' => '.', 'groupSymbol' => '\'']],
+            ['uk_UA', ['decimalSymbol' => ',', 'groupSymbol' => ' ']]
+        ];
+    }
+}