X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=190b46a05f4c66344de1fdf04464fd4bf6c9f4bb;hb=7488a793a89fc9f98fabb4ce9afb1f2843c41355;hp=7e5f309b33b2f368c0c6f81f6972be55bb5ee5e9;hpb=bcd3cf0bc0b173fb80a5597c88d01db5cef5b77c;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 7e5f309b33..190b46a05f 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -98,14 +98,6 @@ abstract class DI
 		return self::$dice->create(App\Mode::class);
 	}
 
-	/**
-	 * @return App\Module
-	 */
-	public static function module()
-	{
-		return self::$dice->create(App\Module::class);
-	}
-
 	/**
 	 * @return App\Page
 	 */
@@ -155,35 +147,35 @@ abstract class DI
 	//
 
 	/**
-	 * @return Core\Cache\ICache
+	 * @return Core\Cache\Capability\ICanCache
 	 */
 	public static function cache()
 	{
-		return self::$dice->create(Core\Cache\ICache::class);
+		return self::$dice->create(Core\Cache\Capability\ICanCache::class);
 	}
 
 	/**
-	 * @return Core\Config\IConfig
+	 * @return Core\Config\Capability\IManageConfigValues
 	 */
 	public static function config()
 	{
-		return self::$dice->create(Core\Config\IConfig::class);
+		return self::$dice->create(Core\Config\Capability\IManageConfigValues::class);
 	}
 
 	/**
-	 * @return Core\PConfig\IPConfig
+	 * @return Core\PConfig\Capability\IManagePersonalConfigValues
 	 */
 	public static function pConfig()
 	{
-		return self::$dice->create(Core\PConfig\IPConfig::class);
+		return self::$dice->create(Core\PConfig\Capability\IManagePersonalConfigValues::class);
 	}
 
 	/**
-	 * @return Core\Lock\ILock
+	 * @return Core\Lock\Capability\ICanLock
 	 */
 	public static function lock()
 	{
-		return self::$dice->create(Core\Lock\ILock::class);
+		return self::$dice->create(Core\Lock\Capability\ICanLock::class);
 	}
 
 	/**
@@ -195,33 +187,53 @@ abstract class DI
 	}
 
 	/**
-	 * @return Core\Process
+	 * @return Core\Worker\Repository\Process
 	 */
 	public static function process()
 	{
-		return self::$dice->create(Core\Process::class);
+		return self::$dice->create(Core\Worker\Repository\Process::class);
 	}
 
 	/**
-	 * @return Core\Session\ISession
+	 * @return Core\Session\Capability\IHandleSessions
 	 */
 	public static function session()
 	{
-		return self::$dice->create(Core\Session\ISession::class);
+		return self::$dice->create(Core\Session\Capability\IHandleSessions::class);
 	}
 
 	/**
-	 * @return Core\StorageManager
+	 * @return \Friendica\Core\Storage\Repository\StorageManager
 	 */
 	public static function storageManager()
 	{
-		return self::$dice->create(Core\StorageManager::class);
+		return self::$dice->create(Core\Storage\Repository\StorageManager::class);
+	}
+
+	/**
+	 * @return \Friendica\Core\System
+	 */
+	public static function system()
+	{
+		return self::$dice->create(Core\System::class);
 	}
 
 	//
 	// "LoggerInterface" instances
 	//
 
+	/**
+	 * Flushes the Logger instance, so the factory is called again
+	 * (creates a new id and retrieves the current PID)
+	 */
+	public static function flushLogger()
+	{
+		$flushDice = self::$dice
+			->addRule(LoggerInterface::class, self::$dice->getRule(LoggerInterface::class))
+			->addRule('$devLogger', self::$dice->getRule('$devLogger'));
+		static::init($flushDice);
+	}
+
 	/**
 	 * @return LoggerInterface
 	 */
@@ -243,13 +255,21 @@ abstract class DI
 	 */
 	public static function workerLogger()
 	{
-		return self::$dice->create(Util\Logger\WorkerLogger::class);
+		return self::$dice->create(Core\Logger\Type\WorkerLogger::class);
 	}
 
 	//
 	// "Factory" namespace instances
 	//
 
+	/**
+	 * @return Factory\Api\Friendica\Activities
+	 */
+	public static function friendicaActivities()
+	{
+		return self::$dice->create(Factory\Api\Friendica\Activities::class);
+	}
+
 	/**
 	 * @return Factory\Api\Mastodon\Account
 	 */
@@ -362,6 +382,14 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Notification::class);
 	}
 
+	/**
+	 * @return Factory\Api\Twitter\Status
+	 */
+	public static function twitterStatus()
+	{
+		return self::$dice->create(Factory\Api\Twitter\Status::class);
+	}
+
 	/**
 	 * @return Factory\Api\Twitter\User
 	 */
@@ -379,11 +407,11 @@ abstract class DI
 	// "Model" namespace instances
 	//
 	/**
-	 * @return Model\Process
+	 * @return \Friendica\Core\Worker\Repository\Process
 	 */
 	public static function modelProcess()
 	{
-		return self::$dice->create(Model\Process::class);
+		return self::$dice->create(Core\Worker\Repository\Process::class);
 	}
 
 	/**
@@ -395,11 +423,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return Model\Storage\IWritableStorage
+	 * @return Core\Storage\Capability\ICanWriteToStorage
 	 */
 	public static function storage()
 	{
-		return self::$dice->create(Model\Storage\IWritableStorage::class);
+		return self::$dice->create(Core\Storage\Capability\ICanWriteToStorage::class);
 	}
 
 	/**
@@ -410,16 +438,25 @@ abstract class DI
 		return self::$dice->create(Model\Log\ParsedLogIterator::class);
 	}
 
+	//
+	// "Module" namespace
+	//
+
+	public static function apiResponse(): Module\Api\ApiResponse
+	{
+		return self::$dice->create(Module\Api\ApiResponse::class);
+	}
+
 	//
 	// "Network" namespace
 	//
 
 	/**
-	 * @return Network\IHTTPClient
+	 * @return Network\HTTPClient\Capability\ICanSendHttpRequests
 	 */
 	public static function httpClient()
 	{
-		return self::$dice->create(Network\IHTTPClient::class);
+		return self::$dice->create(Network\HTTPClient\Capability\ICanSendHttpRequests::class);
 	}
 
 	//