Skip to content

Commit 7d07c0b

Browse files
author
Mike Weis
committed
Merge branch 'FearlessKiwis-MAGETWO-48449-phpdoc-comment-wrong' into develop
2 parents 3beb931 + 0999fb3 commit 7d07c0b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ $productId = $block->getSaleableItem()->getId();
1616
$finalPriceModel = $block->getPrice();
1717
$minimalPrice = $finalPriceModel->getMinimalPrice();
1818
$maximalPrice = $finalPriceModel->getMaximalPrice();
19-
/** @var \Magento\Bundle\Pricing\Price\BundleRegularPrice $regularPriceModel */
19+
/** ex: \Magento\Bundle\Pricing\Price\BundleRegularPrice */
20+
/** @var \Magento\Framework\Pricing\Price\PriceInterface $regularPriceModel */
2021
$regularPriceModel = $block->getPriceType('regular_price');
2122
$maximalRegularPrice = $regularPriceModel->getMaximalPrice();
2223
$minimalRegularPrice = $regularPriceModel->getMinimalPrice();

app/code/Magento/Catalog/view/base/templates/product/price/default.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313

1414
$productId = $block->getSaleableItem()->getId();
1515

16-
/** @var \Magento\Catalog\Pricing\Price\RegularPrice $priceModel */
16+
/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
17+
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
1718
$priceModel = $block->getPriceType('regular_price');
1819

1920
/* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [

app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313

1414
$productId = $block->getSaleableItem()->getId();
1515

16-
/** @var \Magento\Catalog\Pricing\Price\RegularPrice $priceModel */
16+
/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
17+
/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
1718
$priceModel = $block->getPriceType('regular_price');
1819

19-
/** @var \Magento\Catalog\Pricing\Price\FinalPrice $finalPriceModel */
20+
/** ex: \Magento\Catalog\Pricing\Price\FinalPrice */
21+
/** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
2022
$finalPriceModel = $block->getPriceType('final_price');
2123
$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
2224
$schema = ($block->getZone() == 'item_view') ? true : false;

0 commit comments

Comments
 (0)