X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=4645ea252db915cfe171c8cccad5771fa4f8c18d;hb=a19a7dc2a0c0a22fd306e162383ef7117c1baca2;hp=9ed0c5b24d353f5ed5c1c124c31eae1ebce86cd5;hpb=5f43f56f7205d61b5bd867ff6c984636893187f2;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 9ed0c5b24d..4645ea252d 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
 	//
@@ -63,14 +74,6 @@ abstract class DI
 	// "App" namespace instances
 	//
 
-	/**
-	 * @return App\Authentication
-	 */
-	public static function auth()
-	{
-		return self::$dice->create(App\Authentication::class);
-	}
-
 	/**
 	 * @return App\Arguments
 	 */
@@ -247,6 +250,38 @@ 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
+	 */
+	public static function mstdnAttachment()
+	{
+		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
 	 */
@@ -256,11 +291,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return Factory\Api\Mastodon\Field
+	 * @return Factory\Api\Mastodon\Error
 	 */
-	public static function mstdnField()
+	public static function mstdnError()
 	{
-		return self::$dice->create(Factory\Api\Mastodon\Field::class);
+		return self::$dice->create(Factory\Api\Mastodon\Error::class);
 	}
 
 	/**
@@ -279,6 +314,46 @@ abstract class DI
 		return self::$dice->create(Factory\Api\Mastodon\Relationship::class);
 	}
 
+	/**
+	 * @return Factory\Api\Mastodon\Status
+	 */
+	public static function mstdnStatus()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Status::class);
+	}
+
+	/**
+	 * @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 mstdnList()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\ListEntity::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Notification
+	 */
+	public static function mstdnNotification()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Notification::class);
+	}
+
 	/**
 	 * @return Factory\Api\Twitter\User
 	 */
@@ -306,6 +381,13 @@ abstract class DI
 	//
 	// "Model" namespace instances
 	//
+	/**
+	 * @return Model\Process
+	 */
+	public static function modelProcess()
+	{
+		return self::$dice->create(Model\Process::class);
+	}
 
 	/**
 	 * @return Model\User\Cookie
@@ -316,11 +398,31 @@ 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);
+	}
+
+	//
+	// "Network" namespace
+	//
+
+	/**
+	 * @return Network\IHTTPClient
+	 */
+	public static function httpClient()
+	{
+		return self::$dice->create(Network\IHTTPClient::class);
 	}
 
 	//
@@ -360,11 +462,11 @@ abstract class DI
 	}
 
 	/**
-	 * @return Repository\Notify
+	 * @return Repository\Notification
 	 */
 	public static function notify()
 	{
-		return self::$dice->create(Repository\Notify::class);
+		return self::$dice->create(Repository\Notification::class);
 	}
 
 	//
@@ -379,6 +481,18 @@ abstract class DI
 		return self::$dice->create(Protocol\Activity::class);
 	}
 
+	//
+	// "Security" namespace instances
+	//
+
+	/**
+	 * @return \Friendica\Security\Authentication
+	 */
+	public static function auth()
+	{
+		return self::$dice->create(Security\Authentication::class);
+	}
+
 	//
 	// "Util" namespace instances
 	//