Restructure Lock to follow new paradigm

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 7f6f28f33cb45257772361a6524a27ceb76e678d..7e5f309b33b2f368c0c6f81f6972be55bb5ee5e9 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -134,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
         */
@@ -362,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);
        }
 
        //
@@ -420,7 +417,7 @@ abstract class DI
        /**
         * @return Network\IHTTPClient
         */
-       public static function httpRequest()
+       public static function httpClient()
        {
                return self::$dice->create(Network\IHTTPClient::class);
        }
@@ -430,43 +427,80 @@ abstract class DI
        //
 
        /**
-        * @return Repository\FSuggest;
+        * @return Contact\FriendSuggest\Repository\FriendSuggest;
         */
        public static function fsuggest()
        {
-               return self::$dice->create(Repository\FSuggest::class);
+               return self::$dice->create(Contact\FriendSuggest\Repository\FriendSuggest::class);
        }
 
        /**
-        * @return Repository\Introduction
+        * @return Contact\FriendSuggest\Factory\FriendSuggest;
         */
-       public static function intro()
+       public static function fsuggestFactory()
        {
-               return self::$dice->create(Repository\Introduction::class);
+               return self::$dice->create(Contact\FriendSuggest\Factory\FriendSuggest::class);
        }
 
        /**
-        * @return Repository\PermissionSet
+        * @return Contact\Introduction\Repository\Introduction
         */
-       public static function permissionSet()
+       public static function intro()
        {
-               return self::$dice->create(Repository\PermissionSet::class);
+               return self::$dice->create(Contact\Introduction\Repository\Introduction::class);
        }
 
        /**
-        * @return Repository\ProfileField
+        * @return Contact\Introduction\Factory\Introduction
         */
-       public static function profileField()
+       public static function introFactory()
        {
-               return self::$dice->create(Repository\ProfileField::class);
+               return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
        }
 
-       /**
-        * @return Repository\Notification
-        */
-       public static function notify()
+       public static function permissionSet(): Security\PermissionSet\Repository\PermissionSet
+       {
+               return self::$dice->create(Security\PermissionSet\Repository\PermissionSet::class);
+       }
+
+       public static function permissionSetFactory(): Security\PermissionSet\Factory\PermissionSet
+       {
+               return self::$dice->create(Security\PermissionSet\Factory\PermissionSet::class);
+       }
+
+       public static function profileField(): Profile\ProfileField\Repository\ProfileField
+       {
+               return self::$dice->create(Profile\ProfileField\Repository\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\Repository\Notification
+       {
+               return self::$dice->create(Navigation\Notifications\Repository\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\Repository\Notify
+       {
+               return self::$dice->create(Navigation\Notifications\Repository\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);
        }
 
        //