X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=ed67efe0034ceadaf0ac9c63fb5275899746ae9d;hb=42790fbc1fd581107d5f72d44be5218f8adf5585;hp=b3f00f8c99cbb02725a0659973bdc450dd72f516;hpb=38196aec674ca9acc5db7e72898b52906f0d9070;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index b3f00f8c99..ed67efe003 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -39,6 +39,17 @@ abstract class DI
 		self::$dice = $dice;
 	}
 
+	/**
+	 * Returns a clone of the current dice instance
+	 * This usefull for overloading the current instance with mocked methods during tests
+	 *
+	 * @return Dice
+	 */
+	public static function getDice()
+	{
+		return clone self::$dice;
+	}
+
 	//
 	// common instances
 	//
@@ -123,6 +134,14 @@ abstract class DI
 		return self::$dice->create(Content\Item::class);
 	}
 
+	/**
+	 * @return Content\Conversation
+	 */
+	public static function conversation()
+	{
+		return self::$dice->create(Content\Conversation::class);
+	}
+
 	/**
 	 * @return Content\Text\BBCode\Video
 	 */
@@ -239,6 +258,14 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Account::class);
 	}
 
+	/**
+	 * @return Factory\Api\Mastodon\Application
+	 */
+	public static function mstdnApplication()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Application::class);
+	}
+
 	/**
 	 * @return Factory\Api\Mastodon\Attachment
 	 */
@@ -247,6 +274,22 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Attachment::class);
 	}
 
+	/**
+	 * @return Factory\Api\Mastodon\Card
+	 */
+	public static function mstdnCard()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Card::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Conversation
+	 */
+	public static function mstdnConversation()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Conversation::class);
+	}
+
 	/**
 	 * @return Factory\Api\Mastodon\Emoji
 	 */
@@ -263,14 +306,6 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Error::class);
 	}
 
-	/**
-	 * @return Factory\Api\Mastodon\Field
-	 */
-	public static function mstdnField()
-	{
-		return self::$dice->create(Factory\Api\Mastodon\Field::class);
-	}
-
 	/**
 	 * @return Factory\Api\Mastodon\FollowRequest
 	 */
@@ -296,19 +331,35 @@ abstract class DI
 	}
 
 	/**
-	 * @return Factory\Api\Mastodon\Mention
+	 * @return Factory\Api\Mastodon\ScheduledStatus
+	 */
+	public static function mstdnScheduledStatus()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\ScheduledStatus::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Subscription
+	 */
+	public static function mstdnSubscription()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Subscription::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\ListEntity
 	 */
-	public static function mstdnMention()
+	public static function mstdnList()
 	{
-		return self::$dice->create(Factory\Api\Mastodon\Mention::class);
+		return self::$dice->create(Factory\Api\Mastodon\ListEntity::class);
 	}
 
 	/**
-	 * @return Factory\Api\Mastodon\Tag
+	 * @return Factory\Api\Mastodon\Notification
 	 */
-	public static function mstdnTag()
+	public static function mstdnNotification()
 	{
-		return self::$dice->create(Factory\Api\Mastodon\Tag::class);
+		return self::$dice->create(Factory\Api\Mastodon\Notification::class);
 	}
 
 	/**
@@ -355,11 +406,19 @@ abstract class DI
 	}
 
 	/**
-	 * @return Model\Storage\IStorage
+	 * @return Model\Storage\IWritableStorage
 	 */
 	public static function storage()
 	{
-		return self::$dice->create(Model\Storage\IStorage::class);
+		return self::$dice->create(Model\Storage\IWritableStorage::class);
+	}
+
+	/**
+	 * @return Model\Log\ParsedLogIterator
+	 */
+	public static function parsedLogIterator()
+	{
+		return self::$dice->create(Model\Log\ParsedLogIterator::class);
 	}
 
 	//
@@ -367,11 +426,11 @@ abstract class DI
 	//
 
 	/**
-	 * @return Network\IHTTPRequest
+	 * @return Network\IHTTPClient
 	 */
-	public static function httpRequest()
+	public static function httpClient()
 	{
-		return self::$dice->create(Network\IHTTPRequest::class);
+		return self::$dice->create(Network\IHTTPClient::class);
 	}
 
 	//