X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=430db847700642f640a1d3ea8d8de3cf0ec275bc;hb=b53f2f29339c6b839af30695c68f774de2f888c7;hp=38d000423f340c7d597f5a7166c1a0c40d0a078d;hpb=71181704d48307b14b0c78a3bfd6957d5e7bdd3c;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 38d000423f..430db84770 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -133,19 +133,19 @@ abstract class DI
 	}
 
 	/**
-	 * @return Core\Config\IConfiguration
+	 * @return Core\Config\IConfig
 	 */
 	public static function config()
 	{
-		return self::$dice->create(Core\Config\IConfiguration::class);
+		return self::$dice->create(Core\Config\IConfig::class);
 	}
 
 	/**
-	 * @return Core\Config\IPConfiguration
+	 * @return Core\PConfig\IPConfig
 	 */
 	public static function pConfig()
 	{
-		return self::$dice->create(Core\Config\IPConfiguration::class);
+		return self::$dice->create(Core\PConfig\IPConfig::class);
 	}
 
 	/**
@@ -156,9 +156,12 @@ abstract class DI
 		return self::$dice->create(Core\Lock\ILock::class);
 	}
 
+	/**
+	 * @return Core\L10n
+	 */
 	public static function l10n()
 	{
-		return self::$dice->create(Core\L10n\L10n::class);
+		return self::$dice->create(Core\L10n::class);
 	}
 
 	/**
@@ -218,27 +221,59 @@ abstract class DI
 	//
 
 	/**
-	 * @return Factory\Mastodon\Account
+	 * @return Factory\Api\Mastodon\Account
 	 */
 	public static function mstdnAccount()
 	{
-		return self::$dice->create(Factory\Mastodon\Account::class);
+		return self::$dice->create(Factory\Api\Mastodon\Account::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Emoji
+	 */
+	public static function mstdnEmoji()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Emoji::class);
 	}
 
 	/**
-	 * @return Factory\Mastodon\FollowRequest
+	 * @return Factory\Api\Mastodon\Field
+	 */
+	public static function mstdnField()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Field::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\FollowRequest
 	 */
 	public static function mstdnFollowRequest()
 	{
-		return self::$dice->create(Factory\Mastodon\FollowRequest::class);
+		return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
 	}
 
 	/**
-	 * @return Factory\Mastodon\Relationship
+	 * @return Factory\Api\Mastodon\Relationship
 	 */
 	public static function mstdnRelationship()
 	{
-		return self::$dice->create(Factory\Mastodon\Relationship::class);
+		return self::$dice->create(Factory\Api\Mastodon\Relationship::class);
+	}
+
+	/**
+	 * @return Factory\Notification\Notification
+	 */
+	public static function notification()
+	{
+		return self::$dice->create(Factory\Notification\Notification::class);
+	}
+
+	/**
+	 * @return Factory\Notification\Introduction
+	 */
+	public static function notificationIntro()
+	{
+		return self::$dice->create(Factory\Notification\Introduction::class);
 	}
 
 	//
@@ -253,14 +288,6 @@ abstract class DI
 		return self::$dice->create(Model\User\Cookie::class);
 	}
 
-	/**
-	 * @return Model\Notify
-	 */
-	public static function notify()
-	{
-		return self::$dice->create(Model\Notify::class);
-	}
-
 	/**
 	 * @return Model\Storage\IStorage
 	 */
@@ -273,6 +300,14 @@ abstract class DI
 	// "Repository" namespace
 	//
 
+	/**
+	 * @return Repository\FSuggest;
+	 */
+	public static function fsuggest()
+	{
+		return self::$dice->create(Repository\FSuggest::class);
+	}
+
 	/**
 	 * @return Repository\Introduction
 	 */
@@ -281,6 +316,30 @@ abstract class DI
 		return self::$dice->create(Repository\Introduction::class);
 	}
 
+	/**
+	 * @return Repository\PermissionSet
+	 */
+	public static function permissionSet()
+	{
+		return self::$dice->create(Repository\PermissionSet::class);
+	}
+
+	/**
+	 * @return Repository\ProfileField
+	 */
+	public static function profileField()
+	{
+		return self::$dice->create(Repository\ProfileField::class);
+	}
+
+	/**
+	 * @return Repository\Notify
+	 */
+	public static function notify()
+	{
+		return self::$dice->create(Repository\Notify::class);
+	}
+
 	//
 	// "Protocol" namespace instances
 	//
@@ -328,4 +387,12 @@ abstract class DI
 	{
 		return self::$dice->create(Util\Profiler::class);
 	}
+
+	/**
+	 * @return Util\Emailer
+	 */
+	public static function emailer()
+	{
+		return self::$dice->create(Util\Emailer::class);
+	}
 }