From 819015cc492b8e943cf05bb776d132a3b41e399b Mon Sep 17 00:00:00 2001 From: Yu Tang Date: Fri, 9 Jan 2015 09:40:24 -0600 Subject: [PATCH] MAGETWO-30415: [GITHUB] \Magento\Framework\Pricing\PriceCurrencyInterface depends on Magento application code #682 --- app/code/Magento/Directory/Model/PriceCurrency.php | 8 +------- .../Magento/Framework/Pricing/PriceCurrencyInterface.php | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php index 3cc16e54ca6e2..77e8410eb02e0 100644 --- a/app/code/Magento/Directory/Model/PriceCurrency.php +++ b/app/code/Magento/Directory/Model/PriceCurrency.php @@ -57,13 +57,7 @@ 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) { diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php index a1ec1dde8cfec..1347dd006c255 100644 --- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php +++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php @@ -29,12 +29,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