Skip to content

Commit 2546a18

Browse files
committed
ACP2E-767: Remove Magento Catalog dependency on Magento Inventory
1 parent 4bef91a commit 2546a18

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ private function expandDependencies(array $list, string $indexerId, array $accum
348348
{
349349
$accumulated[] = $indexerId;
350350
$result = $list[$indexerId]['dependencies'] ?? [];
351+
$addedResult = [];
351352
foreach ($result as $relatedIndexerId) {
352353
if (in_array($relatedIndexerId, $accumulated)) {
353354
throw new ConfigurationMismatchException(
@@ -373,9 +374,9 @@ private function expandDependencies(array $list, string $indexerId, array $accum
373374
);
374375
}
375376
$relatedResult = $this->expandDependencies($list, $relatedIndexerId, $accumulated);
376-
// phpstan:ignore
377-
$result = array_unique(array_merge($result, $relatedResult));
377+
$addedResult[] = $relatedResult;
378378
}
379-
return $result;
379+
$result = array_merge(...$result, ...$addedResult);
380+
return array_unique($result);
380381
}
381382
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class SortingAdjustment implements SortingAdjustmentInterface
2222
{
2323
/**
24-
* @inheridoc
24+
* @inheritDoc
2525
*/
2626
public function adjust(array $indexersList): array
2727
{

0 commit comments

Comments
 (0)