Merge branch 'ACP2E-3545' of https://github.com/adobe-commerce-tier-4/magento2ce into Tier4-03-03-2025

Author: thiaramus

app/code/Magento/Rule/Model/Condition/Combine.php

@@ -1,13 +1,11 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Rule\Model\Condition;
 
 /**
- * Combine
- *
  * @api
  * @since 100.0.2
  */
@@ -227,28 +225,65 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
      * @param array $arr
      * @param string $key
      * @return $this
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function loadArray($arr, $key = 'conditions')
     {
-        $this->setAggregator(
-            isset($arr['aggregator']) ? $arr['aggregator'] : (isset($arr['attribute']) ? $arr['attribute'] : null)
-        )->setValue(
-            isset($arr['value']) ? $arr['value'] : (isset($arr['operator']) ? $arr['operator'] : null)
-        );
+        $this->setAggregatorAndValue($arr);
+        $this->loadConditions($arr[$key] ?? [], $key);
+
+        return $this;
+    }
+
+    /**
+     * Set the aggregator and value from the array.
+     *
+     * @param array $arr
+     */
+    private function setAggregatorAndValue(array $arr): void
+    {
+        $aggregator = $arr['aggregator'] ?? $arr['attribute'] ?? null;
+        $value = $arr['value'] ?? $arr['operator'] ?? null;
+
+        $this->setAggregator($aggregator)
+            ->setValue($value);
+    }
+
+    /**
+     * Load the conditions from the array.
+     *
+     * @param array $conditions
+     * @param string $key
+     */
+    private function loadConditions(array $conditions, string $key): void
+    {
+        foreach ($conditions as $conditionArr) {
+            if (!empty($conditionArr['type'])) {
+                $this->createAndAddCondition($conditionArr, $key);
+                continue;
+            }
 
-        if (!empty($arr[$key]) && is_array($arr[$key])) {
-            foreach ($arr[$key] as $conditionArr) {
-                try {
-                    $condition = $this->_conditionFactory->create($conditionArr['type']);
-                    $this->addCondition($condition);
-                    $condition->loadArray($conditionArr, $key);
-                } catch (\Exception $e) {
-                    $this->_logger->critical($e);
-                }
+            // Recursively load conditions if there are nested conditions
+            if (!empty($conditionArr[$key])) {
+                $this->loadConditions($conditionArr[$key], $key);
             }
         }
-        return $this;
+    }
+
+    /**
+     * Create and add a condition to the object.
+     *
+     * @param array $conditionArr
+     * @param string $key
+     */
+    private function createAndAddCondition(array $conditionArr, string $key): void
+    {
+        try {
+            $condition = $this->_conditionFactory->create($conditionArr['type']);
+            $this->addCondition($condition);
+            $condition->loadArray($conditionArr, $key);
+        } catch (\Exception $e) {
+            $this->_logger->critical($e);
+        }
     }
 
     /**

app/code/Magento/Rule/Test/Unit/Model/Condition/CombineTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -137,12 +137,12 @@ public function testLoadArrayLoggerCatchException()
         $this->conditionObjectMock->expects($this->never())
             ->method('loadArray');
 
-        $this->conditionFactoryMock->expects($this->once())
+        $this->conditionFactoryMock->expects($this->never())
             ->method('create')
             ->with($array['conditions'][0]['type'])
             ->willThrowException(new \Exception('everything is fine, it is test'));
 
-        $this->loggerMock->expects($this->once())
+        $this->loggerMock->expects($this->never())
             ->method('critical')
             ->with();