X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=0c134f37b48cbf38c4b96cfc117469f6dc11707e;hb=190efcefad29a5971a0cd487d2d67dab638c5a4e;hp=9025feb470983355f0c19f73ed5102b8726042a1;hpb=03164d00e8c6c36df0df6193f704393fa213beb2;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 9025feb470..0c134f37b4 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -99,11 +99,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return App\Module
+	 * @return App\ModuleController
 	 */
 	public static function module()
 	{
-		return self::$dice->create(App\Module::class);
+		return self::$dice->create(App\ModuleController::class);
 	}
 
 	/**
@@ -155,35 +155,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 +195,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,7 +263,7 @@ abstract class DI
 	 */
 	public static function workerLogger()
 	{
-		return self::$dice->create(Util\Logger\WorkerLogger::class);
+		return self::$dice->create(Core\Logger\Type\WorkerLogger::class);
 	}
 
 	//
@@ -379,11 +399,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 +415,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 +430,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);
 	}
 
 	//
@@ -427,24 +456,40 @@ abstract class DI
 	//
 
 	/**
-	 * @return Repository\FSuggest;
+	 * @return Contact\FriendSuggest\Repository\FriendSuggest;
 	 */
 	public static function fsuggest()
 	{
-		return self::$dice->create(Repository\FSuggest::class);
+		return self::$dice->create(Contact\FriendSuggest\Repository\FriendSuggest::class);
 	}
 
 	/**
-	 * @return Repository\Introduction
+	 * @return Contact\FriendSuggest\Factory\FriendSuggest;
+	 */
+	public static function fsuggestFactory()
+	{
+		return self::$dice->create(Contact\FriendSuggest\Factory\FriendSuggest::class);
+	}
+
+	/**
+	 * @return Contact\Introduction\Repository\Introduction
 	 */
 	public static function intro()
 	{
-		return self::$dice->create(Repository\Introduction::class);
+		return self::$dice->create(Contact\Introduction\Repository\Introduction::class);
 	}
 
-	public static function permissionSet(): Security\PermissionSet\Depository\PermissionSet
+	/**
+	 * @return Contact\Introduction\Factory\Introduction
+	 */
+	public static function introFactory()
 	{
-		return self::$dice->create(Security\PermissionSet\Depository\PermissionSet::class);
+		return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
+	}
+
+	public static function permissionSet(): Security\PermissionSet\Repository\PermissionSet
+	{
+		return self::$dice->create(Security\PermissionSet\Repository\PermissionSet::class);
 	}
 
 	public static function permissionSetFactory(): Security\PermissionSet\Factory\PermissionSet
@@ -452,17 +497,19 @@ abstract class DI
 		return self::$dice->create(Security\PermissionSet\Factory\PermissionSet::class);
 	}
 
-	/**
-	 * @return Repository\ProfileField
-	 */
-	public static function profileField()
+	public static function profileField(): Profile\ProfileField\Repository\ProfileField
+	{
+		return self::$dice->create(Profile\ProfileField\Repository\ProfileField::class);
+	}
+
+	public static function profileFieldFactory(): Profile\ProfileField\Factory\ProfileField
 	{
-		return self::$dice->create(Repository\ProfileField::class);
+		return self::$dice->create(Profile\ProfileField\Factory\ProfileField::class);
 	}
 
-	public static function notification(): Navigation\Notifications\Depository\Notification
+	public static function notification(): Navigation\Notifications\Repository\Notification
 	{
-		return self::$dice->create(Navigation\Notifications\Depository\Notification::class);
+		return self::$dice->create(Navigation\Notifications\Repository\Notification::class);
 	}
 
 	public static function notificationFactory(): Navigation\Notifications\Factory\Notification
@@ -470,9 +517,9 @@ abstract class DI
 		return self::$dice->create(Navigation\Notifications\Factory\Notification::class);
 	}
 
-	public static function notify(): Navigation\Notifications\Depository\Notify
+	public static function notify(): Navigation\Notifications\Repository\Notify
 	{
-		return self::$dice->create(Navigation\Notifications\Depository\Notify::class);
+		return self::$dice->create(Navigation\Notifications\Repository\Notify::class);
 	}
 
 	public static function notifyFactory(): Navigation\Notifications\Factory\Notify