X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FDI.php;h=5ba7e88db1f00379891b1e97d33d7352a81cbd01;hb=0fe545ab172e86d394cb7c30566ab8764fe578a5;hp=9025feb470983355f0c19f73ed5102b8726042a1;hpb=6f290607de7f10cea7429aacd0b394fd3f4c4e69;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 9025feb470..5ba7e88db1 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -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);
 	}
 
 	/**
@@ -203,19 +203,19 @@ abstract class DI
 	}
 
 	/**
-	 * @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);
 	}
 
 	//
@@ -395,11 +395,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);
 	}
 
 	/**
@@ -427,24 +427,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 +468,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 +488,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