ENGCOM-3688: Cleaned up PriceCurrency class #19222

 - Merge Pull Request #19222 from creaminternet/magento2-opensource:Cleanup-PriceCurrency
 - Merged commits:
   1. 252b199
   2. 7e9eb99
   3. a7df0f0
   4. be6082f

Author: magento-engcom-team

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

@@ -46,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convert($amount, $scope = null, $currency = null)
     {
@@ -58,17 +58,15 @@ public function convert($amount, $scope = null, $currency = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
-        $currentCurrency = $this->getCurrency($scope, $currency);
-        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
-        return round($convertedValue, $precision);
+        return $this->roundPrice($this->convert($amount, $scope, $currency), $precision);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function format(
         $amount,
@@ -82,7 +80,7 @@ public function format(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function convertAndFormat(
         $amount,
@@ -97,7 +95,7 @@ public function convertAndFormat(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCurrency($scope = null, $currency = null)
     {
@@ -148,13 +146,22 @@ protected function getStore($scope = null)
     }
 
     /**
-     * Round price
+     * @inheritdoc
+     */
+    public function round($price)
+    {
+        return round($price, 2);
+    }
+
+    /**
+     * Round price with precision
      *
      * @param float $price
+     * @param int $precision
      * @return float
      */
-    public function round($price)
+    public function roundPrice($price, $precision = self::DEFAULT_PRECISION)
     {
-        return round($price, 2);
+        return round($price, $precision);
     }
 }

lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php

@@ -78,6 +78,7 @@ public function convertAndFormat(
     /**
      * Round price
      *
+     * @deprecated
      * @param float $price
      * @return float
      */