X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=static%2Fdependencies.config.php;h=90fa13684ca98a31e28cf4a303b872da198bbbc0;hb=8b6ace6629ab4fe229c4c35ff388efe320602a16;hp=b4fa7d247a28a5e81a3033fb29c4f24eaa0b95fe;hpb=ab8997f9db910ba70c592bf106a7f5fc41a55b2d;p=friendica.git

diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index b4fa7d247a..90fa13684c 100644
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -1,4 +1,37 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The configuration defines "complex" dependencies inside Friendica
+ * So this classes shouldn't be simple or their dependencies are already defined here.
+ *
+ * This kind of dependencies are NOT required to be defined here:
+ *   - $a = new ClassA(new ClassB());
+ *   - $a = new ClassA();
+ *   - $a = new ClassA(Configuration $configuration);
+ *
+ * This kind of dependencies SHOULD be defined here:
+ *   - $a = new ClassA();
+ *     $b = $a->create();
+ *
+ *   - $a = new ClassA($creationPassedVariable);
+ *
+ */
 
 use Dice\Dice;
 use Friendica\App;
@@ -13,25 +46,10 @@ use Friendica\Database\Database;
 use Friendica\Factory;
 use Friendica\Model\Storage\IStorage;
 use Friendica\Model\User\Cookie;
+use Friendica\Network;
 use Friendica\Util;
 use Psr\Log\LoggerInterface;
 
-/**
- * The configuration defines "complex" dependencies inside Friendica
- * So this classes shouldn't be simple or their dependencies are already defined here.
- *
- * This kind of dependencies are NOT required to be defined here:
- *   - $a = new ClassA(new ClassB());
- *   - $a = new ClassA();
- *   - $a = new ClassA(Configuration $configuration);
- *
- * This kind of dependencies SHOULD be defined here:
- *   - $a = new ClassA();
- *     $b = $a->create();
- *
- *   - $a = new ClassA($creationPassedVariable);
- *
- */
 return [
 	'*'                             => [
 		// marks all class result as shared for other creations, so there's just
@@ -48,46 +66,45 @@ return [
 			$_SERVER
 		]
 	],
-	Util\BasePath::class            => [
+	Util\BasePath::class         => [
 		'constructParams' => [
 			dirname(__FILE__, 2),
 			$_SERVER
 		]
 	],
-	Util\ConfigFileLoader::class    => [
+	Util\ConfigFileLoader::class => [
 		'shared'          => true,
 		'constructParams' => [
 			[Dice::INSTANCE => '$basepath'],
 		],
 	],
-	Config\Cache\ConfigCache::class => [
+	Config\Cache::class          => [
 		'instanceOf' => Factory\ConfigFactory::class,
 		'call'       => [
-			['createCache', [], Dice::CHAIN_CALL],
+			['createCache', [$_SERVER], Dice::CHAIN_CALL],
 		],
 	],
-	App\Mode::class                 => [
+	App\Mode::class              => [
 		'call' => [
 			['determineRunMode', [true, $_SERVER], Dice::CHAIN_CALL],
 			['determine', [], Dice::CHAIN_CALL],
 		],
 	],
-	Config\IConfiguration::class     => [
+	Config\IConfig::class                   => [
 		'instanceOf' => Factory\ConfigFactory::class,
 		'call'       => [
 			['createConfig', [], Dice::CHAIN_CALL],
 		],
 	],
-	Config\IPConfiguration::class    => [
+	\Friendica\Core\PConfig\IPConfig::class => [
 		'instanceOf' => Factory\ConfigFactory::class,
 		'call'       => [
 			['createPConfig', [], Dice::CHAIN_CALL],
 		]
 	],
-	Database::class                 => [
+	Database::class                         => [
 		'constructParams' => [
 			[Dice::INSTANCE => \Psr\Log\NullLogger::class],
-			$_SERVER,
 		],
 	],
 	/**
@@ -169,14 +186,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 => [
@@ -202,4 +219,12 @@ return [
 			['getBackend', [], Dice::CHAIN_CALL],
 		],
 	],
+	Network\IHTTPRequest::class => [
+		'instanceOf' => Network\HTTPRequest::class,
+	],
+	Factory\Api\Mastodon\Error::class => [
+		'constructParams' => [
+			$_SERVER
+		],
+	],
 ];