6965: #6965: \Magento\Directory\Model\PriceCurrency::format() fails without conversion rate

Author: nmalevanec

Diff for: app/code/Magento/Directory/Model/PriceCurrency.php

@@ -77,15 +77,7 @@ public function format(
         $scope = null,
         $currency = null
     ) {
-        if ($currency instanceof Currency) {
-            $currentCurrency = $currency;
-        } elseif (is_string($currency)) {
-            $currentCurrency = $this->currencyFactory->create()->load($currency);
-        } else {
-            $currentCurrency = $this->getStore($scope)->getCurrentCurrency();
-        }
-
-        return $currentCurrency->formatPrecision($amount, $precision, [], $includeContainer);
+        return $this->createCurrency($scope, $currency)->formatPrecision($amount, $precision, [], $includeContainer);
     }
 
     /**
@@ -108,20 +100,7 @@ public function convertAndFormat(
      */
     public function getCurrency($scope = null, $currency = null)
     {
-        if ($currency instanceof Currency) {
-            $currentCurrency = $currency;
-        } elseif (is_string($currency)) {
-            $currency = $this->currencyFactory->create()
-                ->load($currency);
-            $baseCurrency = $this->getStore($scope)
-                ->getBaseCurrency();
-            $currentCurrency = $baseCurrency->getRate($currency) ? $currency : $baseCurrency;
-        } else {
-            $currentCurrency = $this->getStore($scope)
-                ->getCurrentCurrency();
-        }
-
-        return $currentCurrency;
+        return $this->createCurrency($scope, $currency, true);
     }
 
     /**
@@ -164,4 +143,30 @@ public function round($price)
     {
         return round($price, 2);
     }
+
+    /**
+     * Get currency considering currency rate configuration.
+     *
+     * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
+     * @param \Magento\Framework\Model\AbstractModel|string|null $currency
+     * @param bool $includeRate
+     *
+     * @return Currency
+     */
+    private function createCurrency($scope, $currency, bool $includeRate = false)
+    {
+        if ($currency instanceof Currency) {
+            $currentCurrency = $currency;
+        } elseif (is_string($currency)) {
+            $currentCurrency = $this->currencyFactory->create()->load($currency);
+            if ($includeRate) {
+                $baseCurrency = $this->getStore($scope)->getBaseCurrency();
+                $currentCurrency = $baseCurrency->getRate($currentCurrency) ? $currentCurrency : $baseCurrency;
+            }
+        } else {
+            $currentCurrency = $this->getStore($scope)->getCurrentCurrency();
+        }
+
+        return $currentCurrency;
+    }
 }