X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=a28eb707a4c33a8de497acc3664cb9f35fa53f4f;hb=e56e543a791289e27b5f0850a85f441773167447;hp=692d87870d0f6ce905c76cda049eeec6cbfe5940;hpb=edcfeaf66d797cc6bc9edf966b91b5eb95e5f127;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 692d87870d..a28eb707a4 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Navigation\SystemMessages;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -65,11 +66,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
 	//
@@ -98,14 +115,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
 	 */
@@ -226,6 +235,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
 	//
@@ -334,6 +351,14 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
 	}
 
+	/**
+	 * @return Factory\Api\Mastodon\Poll
+	 */
+	public static function mstdnPoll()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Poll::class);
+	}
+
 	/**
 	 * @return Factory\Api\Mastodon\Relationship
 	 */
@@ -382,6 +407,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
 	 */
@@ -430,6 +463,15 @@ 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
 	//
@@ -478,6 +520,11 @@ abstract class DI
 		return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
 	}
 
+	public static function localRelationship(): Contact\LocalRelationship\Repository\LocalRelationship
+	{
+		return self::$dice->create(Contact\LocalRelationship\Repository\LocalRelationship::class);
+	}
+
 	public static function permissionSet(): Security\PermissionSet\Repository\PermissionSet
 	{
 		return self::$dice->create(Security\PermissionSet\Repository\PermissionSet::class);
@@ -518,9 +565,14 @@ abstract class DI
 		return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
 	}
 
-	public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotification
+	public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotify
+	{
+		return self::$dice->create(Navigation\Notifications\Factory\FormattedNotify::class);
+	}
+
+	public static function formattedNavNotificationFactory(): Navigation\Notifications\Factory\FormattedNavNotification
 	{
-		return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
+		return self::$dice->create(Navigation\Notifications\Factory\FormattedNavNotification::class);
 	}
 
 	//