Merge branch 'develop' into FearlessKiwis-MAGETWO-51732-Catalog-product-Use-default-check-problems-causing-data-loss-when-updating-product-on-non-default-site

Author: cpartica

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

@@ -330,7 +330,7 @@ public function getOutputFormat()
     {
         $formatted = $this->formatTxt(0);
         $number = $this->formatTxt(0, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
-        return str_replace($number, '%s', $formatted);
+        return str_replace($this->trimUnicodeDirectionMark($number), '%s', $formatted);
     }
 
     /**
@@ -402,4 +402,18 @@ public function saveRates($rates)
         $this->_getResource()->saveRates($rates);
         return $this;
     }
+
+    /**
+     * This method removes LRM and RLM marks from string
+     *
+     * @param string $string
+     * @return $this
+     */
+    private function trimUnicodeDirectionMark($string)
+    {
+        if (preg_match('/^(\x{200E}|\x{200F})/u', $string, $match)) {
+            $string = preg_replace('/^'.$match[1].'/u', '', $string);
+        }
+        return $string;
+    }
 }

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

@@ -52,4 +52,49 @@ public function testGetCurrencySymbol()
             ->willReturn($currencyMock);
         $this->assertEquals($currencySymbol, $this->currency->getCurrencySymbol());
     }
+
+    /**
+     * @dataProvider getOutputFormatDataProvider
+     * @param $withCurrency
+     * @param $noCurrency
+     * @param $expected
+     */
+    public function testGetOutputFormat($withCurrency, $noCurrency, $expected)
+    {
+        $currencyMock = $this->getMockBuilder('\Magento\Framework\Currency')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock->expects($this->at(0))
+            ->method('toCurrency')
+            ->willReturn($withCurrency);
+        $currencyMock->expects($this->at(1))
+            ->method('toCurrency')
+            ->willReturn($noCurrency);
+        $this->localeCurrencyMock->expects($this->atLeastOnce())
+            ->method('getCurrency')
+            ->with($this->currencyCode)
+            ->willReturn($currencyMock);
+        $this->assertEquals($expected, $this->currency->getOutputFormat());
+    }
+
+    /**
+     * Return data sets for testGetCurrencySymbol()
+     *
+     * @return array
+     */
+    public function getOutputFormatDataProvider()
+    {
+        return [
+            'no_unicode' => [
+                'withCurrency' => '$0.00',
+                'noCurrency' => '0.00',
+                'expected' => '$%s',
+            ],
+            'arabic_unicode' => [
+                'withCurrency' => json_decode('"\u200E"') . '$0.00',
+                'noCurrency' => json_decode('"\u200E"') . '0.00',
+                'expected' => json_decode('"\u200E"') . '$%s',
+            ]
+        ];
+    }
 }

app/code/Magento/Rule/Block/Editable.php

@@ -54,7 +54,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
                 '" value="' .
                 $element->getValue() .
                 '" data-form-part="' .
-                $element->getDataFormPart() .
+                $element->getData('data-form-part') .
                 '"/> ' .
                 htmlspecialchars(
                     $valueName

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -531,7 +531,7 @@ public function getAttributeElement()
                 'values' => $this->getAttributeSelectOptions(),
                 'value' => $this->getAttribute(),
                 'value_name' => $this->getAttributeName(),
-                'data_form_part' => $this->getFormName()
+                'data-form-part' => $this->getFormName()
             ]
         )->setRenderer(
             $this->_layout->getBlockSingleton('Magento\Rule\Block\Editable')

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

@@ -9,6 +9,11 @@
 
 class Format implements \Magento\Framework\Locale\FormatInterface
 {
+    /**
+     * @var string
+     */
+    private static $defaultNumberSet = 'latn';
+
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
      */
@@ -104,12 +109,18 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
             $currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
         }
         $localeData = (new DataBundle())->get($localeCode);
-        $format = $localeData['NumberElements']['latn']['patterns']['currencyFormat']
-            ?: explode(';', $localeData['NumberPatterns'][1])[0];
-        $decimalSymbol = $localeData['NumberElements']['latn']['symbols']['decimal']
-            ?: $localeData['NumberElements'][0];
-        $groupSymbol = $localeData['NumberElements']['latn']['symbols']['group']
-            ?: $localeData['NumberElements'][1];
+        $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]);
 
         $pos = strpos($format, ';');
         if ($pos !== false) {