X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=c62b5e8d793d814a9ed170a9651a9342860744a0;hb=e659a0314086dd700dbe5e754e383ab758725805;hp=835f1ffed72619e8412a5a32be08c94527c56475;hpb=4e45987f74ccbe61a53c711317c2e45894435ece;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 835f1ffed7..c62b5e8d79 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,11 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Core\Logger\Capabilities\ICheckLoggerSettings;
+use Friendica\Core\Logger\Util\LoggerSettingsCheck;
+use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Navigation\SystemMessages;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -34,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
 	 */
@@ -65,11 +95,27 @@ abstract class DI
 	/**
 	 * @return Database\Database
 	 */
-	public static function dba()
+	public static function dba(): Database\Database
 	{
 		return self::$dice->create(Database\Database::class);
 	}
 
+	/**
+	 * @return \Friendica\Database\Definition\DbaDefinition
+	 */
+	public static function dbaDefinition(): Database\Definition\DbaDefinition
+	{
+		return self::$dice->create(Database\Definition\DbaDefinition::class);
+	}
+
+	/**
+	 * @return \Friendica\Database\Definition\ViewDefinition
+	 */
+	public static function viewDefinition(): Database\Definition\ViewDefinition
+	{
+		return self::$dice->create(Database\Definition\ViewDefinition::class);
+	}
+
 	//
 	// "App" namespace instances
 	//
@@ -82,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);
 	}
@@ -162,6 +205,16 @@ abstract class DI
 		return self::$dice->create(Core\Config\Capability\IManageConfigValues::class);
 	}
 
+	public static function configFileManager(): Core\Config\Util\ConfigFileManager
+	{
+		return self::$dice->create(Core\Config\Util\ConfigFileManager::class);
+	}
+
+	public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs
+	{
+		return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class);
+	}
+
 	/**
 	 * @return Core\PConfig\Capability\IManagePersonalConfigValues
 	 */
@@ -194,14 +247,16 @@ abstract class DI
 		return self::$dice->create(Core\Worker\Repository\Process::class);
 	}
 
-	/**
-	 * @return Core\Session\Capability\IHandleSessions
-	 */
-	public static function session()
+	public static function session(): IHandleSessions
 	{
 		return self::$dice->create(Core\Session\Capability\IHandleSessions::class);
 	}
 
+	public static function userSession(): IHandleUserSessions
+	{
+		return self::$dice->create(Core\Session\Capability\IHandleUserSessions::class);
+	}
+
 	/**
 	 * @return \Friendica\Core\Storage\Repository\StorageManager
 	 */
@@ -218,6 +273,14 @@ abstract class DI
 		return self::$dice->create(Core\System::class);
 	}
 
+	/**
+	 * @return \Friendica\Navigation\SystemMessages
+	 */
+	public static function sysmsg()
+	{
+		return self::$dice->create(SystemMessages::class);
+	}
+
 	//
 	// "LoggerInterface" instances
 	//
@@ -234,6 +297,11 @@ abstract class DI
 		static::init($flushDice);
 	}
 
+	public static function loggCheck(): ICheckLoggerSettings
+	{
+		return self::$dice->create(LoggerSettingsCheck::class);
+	}
+
 	/**
 	 * @return LoggerInterface
 	 */
@@ -319,11 +387,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return Factory\Api\Mastodon\FollowRequest
+	 * @return Factory\Api\Mastodon\Poll
 	 */
-	public static function mstdnFollowRequest()
+	public static function mstdnPoll()
 	{
-		return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
+		return self::$dice->create(Factory\Api\Mastodon\Poll::class);
 	}
 
 	/**
@@ -342,6 +410,14 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Status::class);
 	}
 
+	/**
+	 * @return Factory\Api\Mastodon\StatusSource
+	 */
+	public static function mstdnStatusSource()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\StatusSource::class);
+	}
+
 	/**
 	 * @return Factory\Api\Mastodon\ScheduledStatus
 	 */
@@ -487,6 +563,16 @@ abstract class DI
 		return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
 	}
 
+	public static function report(): Moderation\Repository\Report
+	{
+		return self::$dice->create(Moderation\Repository\Report::class);
+	}
+
+	public static function reportFactory(): Moderation\Factory\Report
+	{
+		return self::$dice->create(Moderation\Factory\Report::class);
+	}
+
 	public static function localRelationship(): Contact\LocalRelationship\Repository\LocalRelationship
 	{
 		return self::$dice->create(Contact\LocalRelationship\Repository\LocalRelationship::class);
@@ -542,6 +628,20 @@ abstract class DI
 		return self::$dice->create(Navigation\Notifications\Factory\FormattedNavNotification::class);
 	}
 
+	//
+	// "Federation" namespace instances
+	//
+
+	public static function deliveryQueueItemFactory(): Federation\Factory\DeliveryQueueItem
+	{
+		return self::$dice->create(Federation\Factory\DeliveryQueueItem::class);
+	}
+
+	public static function deliveryQueueItemRepo(): Federation\Repository\DeliveryQueueItem
+	{
+		return self::$dice->create(Federation\Repository\DeliveryQueueItem::class);
+	}
+
 	//
 	// "Protocol" namespace instances
 	//
@@ -554,6 +654,11 @@ abstract class DI
 		return self::$dice->create(Protocol\Activity::class);
 	}
 
+	public static function dsprContact(): Protocol\Diaspora\Repository\DiasporaContact
+	{
+		return self::$dice->create(Protocol\Diaspora\Repository\DiasporaContact::class);
+	}
+
 	//
 	// "Security" namespace instances
 	//
@@ -594,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
 	 */