Skip to content

Commit 9fc1d67

Browse files
committed
Fixed static issues
1 parent ce0ac25 commit 9fc1d67

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -438,14 +438,8 @@ private function formatCurrency(string $price, array $options): string
438438
}
439439

440440
if ((array_key_exists(LocaleCurrency::CURRENCY_OPTION_DISPLAY, $options)
441-
&& $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
442-
if ($this->isArabicSymbols($formattedCurrency)) {
443-
/* Workaround. We need to provide Arabic symbols range and Unicode modifier into expression
444-
to bypass issue when preg_replace with Arabic symbol return corrupted result */
445-
$formattedCurrency = preg_replace(['/[^0-9\x{0600}-\x{06FF}.,۰٫]+/u', '/ /'], '', $formattedCurrency);
446-
} else {
447-
$formattedCurrency = preg_replace(['/[^0-9.,۰٫]+/', '/ /'], '', $formattedCurrency);
448-
}
441+
&& $options[LocaleCurrency::CURRENCY_OPTION_DISPLAY] === \Magento\Framework\Currency::NO_SYMBOL)) {
442+
$formattedCurrency = str_replace(' ', '', $formattedCurrency);
449443
}
450444

451445
return preg_replace('/^\s+|\s+$/u', '', $formattedCurrency);

lib/internal/Magento/Framework/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"laminas/laminas-stdlib": "^3.7.1",
3535
"laminas/laminas-uri": "^2.9.1",
3636
"laminas/laminas-validator": "^2.17.0",
37-
"magento/zendframework1": "1.14.6-beta2 as 1.14.6",
37+
"magento/zendframework1": "~1.15.0",
3838
"monolog/monolog": "^2.3",
3939
"ramsey/uuid": "~4.2.0",
4040
"symfony/console": "~4.4.0",

0 commit comments

Comments
 (0)