Skip to content

Commit e28b0c3

Browse files
authored
ENGCOM-5592: Fix unexpected diff between builds in generated/metadata directory #23325
2 parents 691f18b + cbc7c40 commit e28b0c3

File tree

1 file changed

+16
-0
lines changed
  • setup/src/Magento/Setup/Module/Di/App/Task/Operation

1 file changed

+16
-0
lines changed

setup/src/Magento/Setup/Module/Di/App/Task/Operation/Area.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ public function doOperation()
8888
}
8989
}
9090

91+
$this->sortDefinitions($definitionsCollection);
92+
9193
$areaCodes = array_merge([App\Area::AREA_GLOBAL], $this->areaList->getCodes());
9294
foreach ($areaCodes as $areaCode) {
9395
$config = $this->configReader->generateCachePerScope($definitionsCollection, $areaCode);
@@ -124,4 +126,18 @@ public function getName()
124126
{
125127
return 'Area configuration aggregation';
126128
}
129+
130+
/**
131+
* Sort definitions to make reproducible result
132+
*
133+
* @param DefinitionsCollection $definitionsCollection
134+
*/
135+
private function sortDefinitions(DefinitionsCollection $definitionsCollection): void
136+
{
137+
$definitions = $definitionsCollection->getCollection();
138+
139+
ksort($definitions);
140+
141+
$definitionsCollection->initialize($definitions);
142+
}
127143
}

0 commit comments

Comments
 (0)