Skip to content

Commit 6d057c4

Browse files
committed
Fix unexpected diff between builds in generated/metadata directory
Sort all path definitions before generating config
1 parent 01a441d commit 6d057c4

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
@@ -85,6 +85,8 @@ public function doOperation()
8585
}
8686
}
8787

88+
$this->sortDefinitions($definitionsCollection);
89+
8890
$areaCodes = array_merge([App\Area::AREA_GLOBAL], $this->areaList->getCodes());
8991
foreach ($areaCodes as $areaCode) {
9092
$config = $this->configReader->generateCachePerScope($definitionsCollection, $areaCode);
@@ -121,4 +123,18 @@ public function getName()
121123
{
122124
return 'Area configuration aggregation';
123125
}
126+
127+
/**
128+
* Sort definitions to make reproducible result
129+
*
130+
* @param DefinitionsCollection $definitionsCollection
131+
*/
132+
private function sortDefinitions(DefinitionsCollection $definitionsCollection): void
133+
{
134+
$definitions = $definitionsCollection->getCollection();
135+
136+
ksort($definitions);
137+
138+
$definitionsCollection->initialize($definitions);
139+
}
124140
}

0 commit comments

Comments
 (0)