Merge branch 'FearlessKiwis-MAGETWO-30415-framework-app-dependency' into develop

Author: Yu Tang

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

@@ -58,18 +58,12 @@ public function convert($amount, $scope = null, $currency = null)
     }
 
     /**
-     * Convert and round price value for specified store or passed currency
-     *
-     * @param float $amount
-     * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @param Currency|string|null $currency
-     * @param int $precision
-     * @return float
+     * {@inheritdoc}
      */
-    public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION)
+    public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
-        $currentCurrency = $this->getCurrency($store, $currency);
-        $convertedValue = $this->getStore($store)->getBaseCurrency()->convert($amount, $currentCurrency);
+        $currentCurrency = $this->getCurrency($scope, $currency);
+        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
         return round($convertedValue, $precision);
     }
 

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

@@ -30,12 +30,12 @@ public function convert($amount, $scope = null, $currency = null);
      * Convert and round price value
      *
      * @param float $amount
-     * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @param \Magento\Directory\Model\Currency|string|null $currency
+     * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
+     * @param \Magento\Framework\Model\AbstractModel|string|null $currency
      * @param int $precision
      * @return float
      */
-    public function convertAndRound($amount, $store = null, $currency = null, $precision = self::DEFAULT_PRECISION);
+    public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION);
 
     /**
      * Format price value