Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

2021-09-13 12:31:30 +00:00 · 2021-09-13 12:31:30 +00:00 · 5abc1543fd
commit 5abc1543fd
parent 84666a314a c8344886fd
22 changed files with 4837 additions and 4275 deletions
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@ -74,9 +74,12 @@ return [
 		]
 	],
 	Util\ConfigFileLoader::class => [
-		'shared'          => true,
-		'constructParams' => [
-			[Dice::INSTANCE => '$basepath'],
+		'instanceOf' => Factory\ConfigFactory::class,
+		'call'       => [
+			['createConfigFileLoader', [
+				[Dice::INSTANCE => '$basepath'],
+				$_SERVER,
+			], Dice::CHAIN_CALL],
 		],
 	],
 	Config\Cache::class          => [