Merge remote-tracking branch 'origin/AC-13338' into spartans_pr_19112025

Author: glo60612

app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php

@@ -82,9 +82,9 @@ public function mapConditionsToSearchCriteria(CombinedCondition $conditions): Se
      */
     private function mapConditionToFilterGroup(ConditionInterface $condition)
     {
-        if ($condition->getType() === CombinedCondition::class) {
+        if ($condition instanceof CombinedCondition) {
             return $this->mapCombinedConditionToFilterGroup($condition);
-        } elseif ($condition->getType() === SimpleCondition::class) {
+        } elseif ($condition instanceof SimpleCondition) {
             return $this->mapSimpleConditionToFilterGroup($condition);
         }
 

app/code/Magento/CatalogRule/Model/Rule/Condition/MappableConditionsProcessor.php

@@ -67,7 +67,7 @@ private function rebuildCombinedCondition(CombinedCondition $originalConditions)
         $invalidConditions = [];
 
         foreach ($originalConditions->getConditions() as $condition) {
-            if ($condition->getType() === CombinedCondition::class) {
+            if ($condition instanceof CombinedCondition) {
                 $rebuildSubCondition = $this->rebuildCombinedCondition($condition);
 
                 if (count($rebuildSubCondition->getConditions()) > 0) {
@@ -79,7 +79,7 @@ private function rebuildCombinedCondition(CombinedCondition $originalConditions)
                 continue;
             }
 
-            if ($condition->getType() === SimpleCondition::class) {
+            if ($condition instanceof SimpleCondition) {
                 if ($this->validateSimpleCondition($condition)) {
                     $validConditions[] = $condition;
                 } else {