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

Author: nmalevanec

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

@@ -77,8 +77,15 @@ public function format(
         $scope = null,
         $currency = null
     ) {
-        return $this->getCurrency($scope, $currency)
-            ->formatPrecision($amount, $precision, [], $includeContainer);
+        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);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Directory/Model/PriceCurrencyTest.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Directory\Model;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests for PriceCurrency model.
+ */
+class PriceCurrencyTest extends TestCase
+{
+    /**
+     * Test subject.
+     *
+     * @var PriceCurrency
+     */
+    private $priceCurrency;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->priceCurrency = Bootstrap::getObjectManager()->get(PriceCurrency::class);
+    }
+
+    /**
+     * Check PriceCurrency::format() doesn't depend on currency rate configuration.
+     * @return void
+     */
+    public function testFormat()
+    {
+        self::assertSame(
+            '<span class="price">AFN10.00</span>',
+            $this->priceCurrency->format(10, true, 2, null, 'AFN')
+        );
+    }
+}