Merge pull request #181 from magento-south/BUGS

[South] Bugs fixes

Author: vpelipenko

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

@@ -82,12 +82,17 @@ public function getNumber($value)
      * Functions returns array with price formatting info
      *
      * @return array
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function getPriceFormat()
     {
-        $numberElements = (new DataBundle())->get($this->_localeResolver->getLocale())['NumberElements'];
-        $format = $numberElements['latn']['patterns']['currencyFormat'];
-        $symbols = $numberElements['latn']['symbols'];
+        $localeData = (new DataBundle())->get($this->_localeResolver->getLocale());
+        $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];
 
         $pos = strpos($format, ';');
         if ($pos !== false) {
@@ -120,8 +125,8 @@ public function getPriceFormat()
             'pattern' => $this->_scopeResolver->getScope()->getCurrentCurrency()->getOutputFormat(),
             'precision' => $totalPrecision,
             'requiredPrecision' => $requiredPrecision,
-            'decimalSymbol' => $symbols['decimal'],
-            'groupSymbol' => $symbols['group'],
+            'decimalSymbol' => $decimalSymbol,
+            'groupSymbol' => $groupSymbol,
             'groupLength' => $group,
             'integerRequired' => $integerRequired,
         ];

lib/internal/Magento/Framework/View/Template/Html/Minifier.php

@@ -122,8 +122,8 @@ public function minify($file)
                     '#(?<!' . implode('|', $this->inlineHtmlTags) . ')\> \<#',
                     '><',
                     preg_replace(
-                        '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script|style)\b))*+)'
-                        . '(?:<(?>textarea|pre|script|style)\b|\z))#',
+                        '#(?ix)(?>[^\S ]\s*|\s{2,})(?=(?:(?:[^<]++|<(?!/?(?:textarea|pre|script)\b))*+)'
+                        . '(?:<(?>textarea|pre|script)\b|\z))#',
                         ' ',
                         preg_replace(
                             '#(?<!:|\\\\)//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',