Merge pull request #10813 from tobiasd/20211003-lengthcounter

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index d8e51b439822fcd9ca242ba59085e6f8318c02f8..ea7310feedca3805eacd15e9dcb4577f2b3a8216 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -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
         */
@@ -311,6 +330,22 @@ abstract class DI
                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
         */
@@ -335,20 +370,9 @@ abstract class DI
                return self::$dice->create(Factory\Api\Twitter\User::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()
+       public static function notificationIntro(): Navigation\Notifications\Factory\Introduction
        {
-               return self::$dice->create(Factory\Notification\Introduction::class);
+               return self::$dice->create(Navigation\Notifications\Factory\Introduction::class);
        }
 
        //
@@ -371,11 +395,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);
        }
 
        //
@@ -383,11 +415,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);
        }
 
        //
@@ -426,12 +458,29 @@ abstract class DI
                return self::$dice->create(Repository\ProfileField::class);
        }
 
-       /**
-        * @return Repository\Notification
-        */
-       public static function notify()
+       public static function notification(): Navigation\Notifications\Depository\Notification
+       {
+               return self::$dice->create(Navigation\Notifications\Depository\Notification::class);
+       }
+
+       public static function notificationFactory(): Navigation\Notifications\Factory\Notification
+       {
+               return self::$dice->create(Navigation\Notifications\Factory\Notification::class);
+       }
+
+       public static function notify(): Navigation\Notifications\Depository\Notify
+       {
+               return self::$dice->create(Navigation\Notifications\Depository\Notify::class);
+       }
+
+       public static function notifyFactory(): Navigation\Notifications\Factory\Notify
+       {
+               return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
+       }
+
+       public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotification
        {
-               return self::$dice->create(Repository\Notification::class);
+               return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
        }
 
        //