MAGETWO-43291: Incl tax prices on Product and catalog pages include tax on FPT

 -- allow multiple exclusions for the Adjustment calculator

Author: Robert He

app/code/Magento/Bundle/Pricing/Adjustment/BundleCalculatorInterface.php

@@ -17,23 +17,23 @@ interface BundleCalculatorInterface extends CalculatorInterface
     /**
      * @param float|string $amount
      * @param Product $saleableItem
-     * @param null|bool $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMaxAmount($amount, Product $saleableItem, $exclude = null);
 
     /**
      * @param float|string $amount
      * @param Product $saleableItem
-     * @param null|bool $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = null);
 
     /**
      * @param float|string $amount
      * @param Product $saleableItem
-     * @param null|bool $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMinRegularAmount($amount, Product $saleableItem, $exclude = null);
@@ -42,7 +42,7 @@ public function getMinRegularAmount($amount, Product $saleableItem, $exclude = n
      * Option amount calculation for saleable item
      *
      * @param Product $saleableItem
-     * @param null|string|array $exclude
+     * @param null|bool|string|array $exclude
      * @param bool $searchMin
      * @param \Magento\Framework\Pricing\Amount\AmountInterface|null $bundleProductAmount
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
@@ -60,7 +60,7 @@ public function getOptionsAmount(
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|string|array $exclude code of adjustment that has to be excluded
+     * @param null|bool|string|array $exclude code of adjustment that has to be excluded
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude = null);

app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php

@@ -77,7 +77,7 @@ public function __construct(
      *
      * @param float|string $amount
      * @param SaleableInterface $saleableItem
-     * @param null|string|array $exclude
+     * @param null|bool|string|array $exclude
      * @param null|array $context
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -92,7 +92,7 @@ public function getAmount($amount, SaleableInterface $saleableItem, $exclude = n
      *
      * @param float $amount
      * @param Product $saleableItem
-     * @param null|string $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMinRegularAmount($amount, Product $saleableItem, $exclude = null)
@@ -105,7 +105,7 @@ public function getMinRegularAmount($amount, Product $saleableItem, $exclude = n
      *
      * @param float $amount
      * @param Product $saleableItem
-     * @param null|string $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
@@ -118,7 +118,7 @@ public function getMaxAmount($amount, Product $saleableItem, $exclude = null)
      *
      * @param float $amount
      * @param Product $saleableItem
-     * @param null|string $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = null)
@@ -130,7 +130,7 @@ public function getMaxRegularAmount($amount, Product $saleableItem, $exclude = n
      * Option amount calculation for bundle product
      *
      * @param Product $saleableItem
-     * @param null|string|array $exclude
+     * @param null|bool|string|array $exclude
      * @param bool $searchMin
      * @param float $baseAmount
      * @param bool $useRegularPrice
@@ -260,7 +260,7 @@ protected function getBundleOptions(Product $saleableItem)
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|string|array $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude = null)
@@ -278,7 +278,7 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|string|array $exclude
+     * @param null|bool|string|arrayy $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      */
     protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude)
@@ -297,7 +297,7 @@ protected function calculateFixedBundleAmount($basePriceValue, $bundleProduct, $
      * @param float $basePriceValue
      * @param Product $bundleProduct
      * @param \Magento\Bundle\Pricing\Price\BundleSelectionPrice[] $selectionPriceList
-     * @param null|string|array $exclude
+     * @param null|bool|string|array $exclude
      * @return \Magento\Framework\Pricing\Amount\AmountInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */

app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

@@ -68,7 +68,7 @@ class BundleSelectionPrice extends AbstractPrice
      * @param ManagerInterface $eventManager
      * @param DiscountCalculator $discountCalculator
      * @param bool $useRegularPrice
-     * @param string $excludeAdjustment
+     * @param array $excludeAdjustment
      */
     public function __construct(
         Product $saleableItem,

app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php

@@ -41,7 +41,7 @@ class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterf
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
-     * @param string $excludeAdjustment
+     * @param array $excludeAdjustment
      */
     public function __construct(
         SaleableInterface $saleableItem,

lib/internal/Magento/Framework/Pricing/Adjustment/Calculator.php

@@ -46,7 +46,7 @@ public function getAmount($amount, SaleableInterface $saleableItem, $exclude = n
         foreach ($saleableItem->getPriceInfo()->getAdjustments() as $adjustment) {
             $code = $adjustment->getAdjustmentCode();
             $toExclude = false;
-            if (is_array($exclude) == false) {
+            if (!is_array($exclude)) {
                 if ($exclude === true || ($exclude !== null && $code === $exclude)) {
                     $toExclude = true;
                 }