X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=34cf1c68d55b76177610be3df682fec57db81bd3;hb=f879b2c9bce17350c11a128052f32eea10039401;hp=0ef18a1aa35ec3984ea3d1c62ba65cf9932efbd9;hpb=6b914ccc0f74b1829a607a50b1516558210380a4;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 0ef18a1aa3..34cf1c68d5 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -22,6 +22,8 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Core\Logger\Capability\ICheckLoggerSettings;
+use Friendica\Core\Logger\Util\LoggerSettingsCheck;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Navigation\SystemMessages;
@@ -37,14 +39,39 @@ abstract class DI
 	/** @var Dice */
 	private static $dice;
 
-	public static function init(Dice $dice)
+	/**
+	 * Initialize the singleton DI container with the Dice instance
+	 *
+	 * @param Dice $dice             The Dice instance
+	 * @param bool $disableDepByHand If true, the database dependencies aren't set, thus any occurrence of logging or
+	 *                               profiling in database methods would lead to an error. This flag is for testing only.
+	 *
+	 * @return void
+	 */
+	public static function init(Dice $dice, bool $disableDepByHand = false)
 	{
 		self::$dice = $dice;
+
+		if (!$disableDepByHand) {
+			self::setCompositeRootDependencyByHand();
+		}
+	}
+
+	/**
+	 * I HATE this method, but everything else needs refactoring at the database itself
+	 * Set the database dependencies manually, because of current, circular dependencies between the database and the config table
+	 *
+	 * @todo Instead of this madness, split the database in a core driver-dependent (mysql, mariadb, postgresql, ..) part without any other dependency unlike credentials and in the full-featured, driver-independent database class with all dependencies
+	 */
+	public static function setCompositeRootDependencyByHand()
+	{
+		$database = static::dba();
+		$database->setDependency(static::config(), static::profiler(), static::logger());
 	}
 
 	/**
 	 * Returns a clone of the current dice instance
-	 * This usefull for overloading the current instance with mocked methods during tests
+	 * This useful for overloading the current instance with mocked methods during tests
 	 *
 	 * @return Dice
 	 */
@@ -101,10 +128,7 @@ abstract class DI
 		return self::$dice->create(App\Arguments::class);
 	}
 
-	/**
-	 * @return App\BaseURL
-	 */
-	public static function baseUrl()
+	public static function baseUrl(): App\BaseURL
 	{
 		return self::$dice->create(App\BaseURL::class);
 	}
@@ -181,9 +205,14 @@ abstract class DI
 		return self::$dice->create(Core\Config\Capability\IManageConfigValues::class);
 	}
 
-	public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs
+	public static function configFileManager(): Core\Config\Util\ConfigFileManager
 	{
-		return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class);
+		return self::$dice->create(Core\Config\Util\ConfigFileManager::class);
+	}
+
+	public static function keyValue(): Core\KeyValueStorage\Capability\IManageKeyValuePairs
+	{
+		return self::$dice->create(Core\KeyValueStorage\Capability\IManageKeyValuePairs::class);
 	}
 
 	/**
@@ -268,6 +297,11 @@ abstract class DI
 		static::init($flushDice);
 	}
 
+	public static function logCheck(): ICheckLoggerSettings
+	{
+		return self::$dice->create(LoggerSettingsCheck::class);
+	}
+
 	/**
 	 * @return LoggerInterface
 	 */
@@ -352,14 +386,6 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Error::class);
 	}
 
-	/**
-	 * @return Factory\Api\Mastodon\FollowRequest
-	 */
-	public static function mstdnFollowRequest()
-	{
-		return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
-	}
-
 	/**
 	 * @return Factory\Api\Mastodon\Poll
 	 */
@@ -673,14 +699,6 @@ abstract class DI
 		return self::$dice->create(Util\DateTimeFormat::class);
 	}
 
-	/**
-	 * @return Util\FileSystem
-	 */
-	public static function fs()
-	{
-		return self::$dice->create(Util\FileSystem::class);
-	}
-
 	/**
 	 * @return Util\Profiler
 	 */