Merge remote-tracking branch 'origin/MC-42158' into 2.4-develop-pr61

Author: Serhii Balko

lib/internal/Magento/Framework/Module/ModuleList/Loader.php

@@ -133,10 +133,10 @@ private function sortBySequence(array $origList): array
     {
         ksort($origList);
         $modules = $this->prearrangeModules($origList);
-
+        $sequenceCache = [];
         $expanded = [];
         foreach (array_keys($modules) as $moduleName) {
-            $sequence = $this->expandSequence($origList, $moduleName);
+            $sequence = $this->expandSequence($origList, $moduleName, $sequenceCache);
             asort($sequence);
 
             $expanded[] = [
@@ -189,27 +189,46 @@ private function prearrangeModules(array $modules): array
     /**
      * Accumulate information about all transitive "sequence" references
      *
+     * Added a sequence cache to avoid re-computing the sequences of dependencies over and over again.
+     *
      * @param array $list
      * @param string $name
+     * @param array $sequenceCache
      * @param array $accumulated
+     * @param string $parentName
      * @return array
      * @throws \Exception
      */
-    private function expandSequence($list, $name, $accumulated = [])
-    {
+    private function expandSequence(
+        array $list,
+        string $name,
+        array& $sequenceCache,
+        array $accumulated = [],
+        string $parentName = ''
+    ) {
+        // Making sure we haven't already called the method for this module higher in the stack
+        if (isset($accumulated[$name])) {
+            throw new \LogicException("Circular sequence reference from '{$parentName}' to '{$name}'.");
+        }
         $accumulated[$name] = true;
-        $result = $list[$name]['sequence'];
-        $allResults = [];
-        foreach ($result as $relatedName) {
-            if (isset($accumulated[$relatedName])) {
-                throw new \LogicException("Circular sequence reference from '{$name}' to '{$relatedName}'.");
+
+        // Checking if we already computed the full sequence for this module
+        if (!isset($sequenceCache[$name])) {
+            $sequence = $list[$name]['sequence'] ?? [];
+            $allSequences = [];
+            // Going over all immediate dependencies to gather theirs recursively
+            foreach ($sequence as $relatedName) {
+                $relatedSequence = $this->expandSequence($list, $relatedName, $sequenceCache, $accumulated, $name);
+                $allSequences[] = $relatedSequence;
             }
-            if (!isset($list[$relatedName])) {
-                continue;
+            $allSequences[] = $sequence;
+
+            // Caching the full sequence list
+            if (!empty($allSequences)) {
+                $sequenceCache[$name] = array_unique(array_merge(...$allSequences));
             }
-            $allResults[] = $this->expandSequence($list, $relatedName, $accumulated);
         }
-        $allResults[] = $result;
-        return array_unique(array_merge([], ...$allResults));
+
+        return $sequenceCache[$name] ?? [];
     }
 }