Replace deprecated `log` calls

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 28ad130b4da93719beddf67b594732b38f967974..31542e3d52dd30bebd34c47c8b8e10501fac0c8f 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
         */
@@ -351,20 +370,9 @@ abstract class DI
                return self::$dice->create(Factory\Api\Twitter\User::class);
        }
 
-       /**
-        * @return Factory\Notification\Notification
-        */
-       public static function notification()
+       public static function notificationIntro(): Navigation\Notifications\Factory\Introduction
        {
-               return self::$dice->create(Factory\Notification\Notification::class);
-       }
-
-       /**
-        * @return Factory\Notification\Introduction
-        */
-       public static function notificationIntro()
-       {
-               return self::$dice->create(Factory\Notification\Introduction::class);
+               return self::$dice->create(Navigation\Notifications\Factory\Introduction::class);
        }
 
        //
@@ -394,16 +402,24 @@ abstract class DI
                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\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,28 +442,49 @@ abstract class DI
                return self::$dice->create(Repository\Introduction::class);
        }
 
-       /**
-        * @return Repository\PermissionSet
-        */
-       public static function permissionSet()
+       public static function permissionSet(): Security\PermissionSet\Depository\PermissionSet
        {
-               return self::$dice->create(Repository\PermissionSet::class);
+               return self::$dice->create(Security\PermissionSet\Depository\PermissionSet::class);
        }
 
-       /**
-        * @return Repository\ProfileField
-        */
-       public static function profileField()
+       public static function permissionSetFactory(): Security\PermissionSet\Factory\PermissionSet
        {
-               return self::$dice->create(Repository\ProfileField::class);
+               return self::$dice->create(Security\PermissionSet\Factory\PermissionSet::class);
        }
 
-       /**
-        * @return Repository\Notification
-        */
-       public static function notify()
+       public static function profileField(): Profile\ProfileField\Depository\ProfileField
+       {
+               return self::$dice->create(Profile\ProfileField\Depository\ProfileField::class);
+       }
+
+       public static function profileFieldFactory(): Profile\ProfileField\Factory\ProfileField
+       {
+               return self::$dice->create(Profile\ProfileField\Factory\ProfileField::class);
+       }
+
+       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);
        }
 
        //