Merge branch '2.4-develop' into 04-29-24-Tier4-Bugfix-Delivery

Author: magento-devops-queue-mgr-svc

app/etc/di.xml

@@ -2006,4 +2006,5 @@
     <preference for="Magento\Framework\Filter\Input\PurifierInterface" type="Magento\Framework\Filter\Input\Purifier"/>
     <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\Framework\App\PageCache\Identifier"/>
     <preference for="Magento\Framework\App\State\ReloadProcessorInterface" type="Magento\Framework\App\State\ReloadProcessorComposite" />
+    <preference for="Magento\Framework\Indexer\Config\Converter\SortingAdjustmentInterface" type="Magento\Framework\Indexer\Config\Converter\SortingAdjustment" />
 </config>

lib/internal/Magento/Framework/Indexer/Config/Converter.php

@@ -8,9 +8,23 @@
 use Magento\Framework\Config\ConverterInterface;
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Phrase;
+use Magento\Framework\Indexer\Config\Converter\SortingAdjustmentInterface;
 
 class Converter implements ConverterInterface
 {
+    /**
+     * @var SortingAdjustmentInterface
+     */
+    private SortingAdjustmentInterface $sortingAdjustment;
+
+    /**
+     * @param SortingAdjustmentInterface $sortingAdjustment
+     */
+    public function __construct(SortingAdjustmentInterface $sortingAdjustment)
+    {
+        $this->sortingAdjustment = $sortingAdjustment;
+    }
+
     /**
      * Convert dom node tree to array
      *
@@ -47,8 +61,7 @@ public function convert($source)
             $output[$indexerId] = $data;
         }
         $output = $this->sortByDependencies($output);
-
-        return $output;
+        return $this->sortingAdjustment->adjust($output);
     }
 
     /**
@@ -239,6 +252,7 @@ protected function convertField(\DOMElement $node, $data)
      * @param \DOMNode $node
      * @return string
      * @deprecated 101.0.0
+     * @see not used anymore
      */
     protected function getTranslatedNodeValue(\DOMNode $node)
     {
@@ -334,6 +348,7 @@ private function expandDependencies(array $list, string $indexerId, array $accum
     {
         $accumulated[] = $indexerId;
         $result = $list[$indexerId]['dependencies'] ?? [];
+        $addedResult = [];
         foreach ($result as $relatedIndexerId) {
             if (in_array($relatedIndexerId, $accumulated)) {
                 throw new ConfigurationMismatchException(
@@ -359,8 +374,9 @@ private function expandDependencies(array $list, string $indexerId, array $accum
                 );
             }
             $relatedResult = $this->expandDependencies($list, $relatedIndexerId, $accumulated);
-            $result = array_unique(array_merge($result, $relatedResult));
+            $addedResult[] = $relatedResult;
         }
-        return $result;
+        $result = array_merge($result, ...$addedResult);
+        return array_unique($result);
     }
 }

lib/internal/Magento/Framework/Indexer/Config/Converter/SortingAdjustment.php

@@ -0,0 +1,30 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Config\Converter;
+
+class SortingAdjustment implements SortingAdjustmentInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function adjust(array $indexersList): array
+    {
+        return $indexersList;
+    }
+}

lib/internal/Magento/Framework/Indexer/Config/Converter/SortingAdjustmentInterface.php

@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Config\Converter;
+
+/**
+ * Interface for managing sort order of indexers
+ *
+ * Make sense for the full reindex when you need to adjust order od indexers execution
+ */
+interface SortingAdjustmentInterface
+{
+    /**
+     * Make adjustments in the indexers list
+     *
+     * @param array $indexersList
+     * @return array
+     */
+    public function adjust(array $indexersList) : array;
+}

lib/internal/Magento/Framework/Indexer/Test/Unit/Config/ConverterTest.php

@@ -9,19 +9,32 @@
 
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Indexer\Config\Converter;
+use Magento\Framework\Indexer\Config\Converter\SortingAdjustmentInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ConverterTest extends TestCase
 {
     /**
-     * @var Converter|MockObject
+     * @var Converter
      */
     protected $_model;
 
+    /**
+     * @var SortingAdjustmentInterface|MockObject
+     */
+    private $sortingAdjustment;
+
     protected function setUp(): void
     {
-        $this->_model = new Converter();
+        $this->sortingAdjustment = $this->getMockBuilder(SortingAdjustmentInterface::class)
+            ->getMockForAbstractClass();
+        $this->sortingAdjustment->method("adjust")->will(
+            $this->returnCallback(function ($arg) {
+                return $arg;
+            })
+        );
+        $this->_model = new Converter($this->sortingAdjustment);
     }
 
     public function testConvert()