X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdependencies.config.php;h=bf7b412c2ff4c198eb1157a117e7ae305afc5bf5;hb=d470a6a9818d97f5b48a4b29b0e32ba3e89a0223;hp=84344a60e28a660493540420514b6f9b60437cda;hpb=01640a7045e146759bc936dd499ac27738b78940;p=friendica.git

diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index 84344a60e2..bf7b412c2f 100644
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -44,8 +44,10 @@ use Friendica\Core\Session\ISession;
 use Friendica\Core\StorageManager;
 use Friendica\Database\Database;
 use Friendica\Factory;
-use Friendica\Model\Storage\IStorage;
+use Friendica\Model\Storage\IWritableStorage;
 use Friendica\Model\User\Cookie;
+use Friendica\Model\Log\ParsedLogIterator;
+use Friendica\Network;
 use Friendica\Util;
 use Psr\Log\LoggerInterface;
 
@@ -72,15 +74,18 @@ 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          => [
 		'instanceOf' => Factory\ConfigFactory::class,
 		'call'       => [
-			['createCache', [], Dice::CHAIN_CALL],
+			['createCache', [$_SERVER], Dice::CHAIN_CALL],
 		],
 	],
 	App\Mode::class              => [
@@ -104,7 +109,6 @@ return [
 	Database::class                         => [
 		'constructParams' => [
 			[Dice::INSTANCE => \Psr\Log\NullLogger::class],
-			$_SERVER,
 		],
 	],
 	/**
@@ -186,14 +190,14 @@ return [
 	Process::class => [
 		'constructParams' => [
 			[Dice::INSTANCE => '$basepath'],
+			getmypid(),
 		],
 	],
 	App\Router::class => [
 		'constructParams' => [
-			$_SERVER, null
-		],
-		'call' => [
-			['loadRoutes', [include __DIR__ . '/routes.config.php'], Dice::CHAIN_CALL],
+			$_SERVER,
+			__DIR__ . '/routes.config.php',
+			null
 		],
 	],
 	L10n::class => [
@@ -213,10 +217,26 @@ return [
 			$_SERVER, $_COOKIE
 		],
 	],
-	IStorage::class => [
+	IWritableStorage::class => [
 		'instanceOf' => StorageManager::class,
 		'call' => [
 			['getBackend', [], Dice::CHAIN_CALL],
 		],
 	],
+	Network\IHTTPClient::class => [
+		'instanceOf' => Factory\HTTPClientFactory::class,
+		'call'       => [
+			['createClient', [], Dice::CHAIN_CALL],
+		],
+	],
+	Factory\Api\Mastodon\Error::class => [
+		'constructParams' => [
+			$_SERVER
+		],
+	],
+	ParsedLogIterator::class => [
+		'constructParams' => [
+			[Dice::INSTANCE => Util\ReversedFileReader::class],
+		]
+	],
 ];