Fix PAT failure

Author: glo60612

app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php

@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright 2015 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\ConfigurableMaxPriceCalculator;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
@@ -54,12 +55,18 @@ class ConfigurableRegularPrice extends AbstractPrice implements
      */
     private $lowestPriceOptionsProvider;
 
+    /**
+     * @var ConfigurableMaxPriceCalculator
+     */
+    private $configurableMaxPriceCalculator;
+
     /**
      * @param \Magento\Framework\Pricing\SaleableInterface $saleableItem
      * @param float $quantity
      * @param \Magento\Framework\Pricing\Adjustment\CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param PriceResolverInterface $priceResolver
+     * @param ConfigurableMaxPriceCalculator $configurableMaxPriceCalculator
      * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
      */
     public function __construct(
@@ -68,12 +75,14 @@ public function __construct(
         \Magento\Framework\Pricing\Adjustment\CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         PriceResolverInterface $priceResolver,
+        ConfigurableMaxPriceCalculator $configurableMaxPriceCalculator,
         ?LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider = null
     ) {
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
         $this->priceResolver = $priceResolver;
         $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider ?:
             ObjectManager::getInstance()->get(LowestPriceOptionsProviderInterface::class);
+        $this->configurableMaxPriceCalculator = $configurableMaxPriceCalculator;
     }
 
     /**
@@ -187,28 +196,26 @@ public function _resetState(): void
     }
 
     /**
-     * Check whether Configurable Product has more than one child product and if their prices are equal
+     * Check whether Configurable Product have more than one children products
      *
      * @param SaleableInterface $product
      * @return bool
      */
     public function isChildProductsOfEqualPrices(SaleableInterface $product): bool
     {
-        // Get all child products of the configurable product
-        $childProducts = $product->getTypeInstance()->getUsedProducts($product);
-        if (count($childProducts) <= 1) {
-            return false; // Not more than one child product
+        $minPrice = $this->getMinRegularAmount()->getValue();
+        $final_price = $product->getFinalPrice();
+        $productId = $product->getId();
+        if ($final_price < $minPrice) {
+            return false;
         }
-
-        $prices = [];
-        foreach ($childProducts as $child) {
-            $prices[] = $child->getFinalPrice();
+        $attributes = $product->getTypeInstance()->getConfigurableAttributes($product);
+        $items = $attributes->getItems();
+        $options = reset($items);
+        $maxPrice = $this->configurableMaxPriceCalculator->getMaxPriceForConfigurableProduct($productId);
+        if ($maxPrice == 0) {
+            $maxPrice = $this->getMaxRegularAmount()->getValue();
         }
-
-        $minPrice = min($prices);
-        $maxPrice = max($prices);
-
-        // Return true only if all child prices are equal (min == max)
-        return $minPrice == $maxPrice;
+        return (count($options->getOptions()) > 1) && $minPrice == $maxPrice;
     }
 }

app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php

@@ -156,6 +156,9 @@ public function asHtml()
     public function validate(AbstractModel $model)
     {
         $subSelectConditionsFlag = true;
+        if (!$this->getConditions()) {
+            return false;
+        }
         $attr = $this->getAttribute();
         $total = 0;
         $isMultiShipping = (bool) $model->getQuote()->getIsMultiShipping();

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/Product/SubselectTest.php

@@ -412,7 +412,7 @@ public static function dataProviderForFixedBundleProduct(): array
                         'baseRowTotal' => 100,
                         'valueParsed' => 100
                     ],
-                    true,
+                    false,
                     false
                 ],
             'validate true for bundle product