Restructure Lock to follow new paradigm

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index ea7310feedca3805eacd15e9dcb4577f2b3a8216..7e5f309b33b2f368c0c6f81f6972be55bb5ee5e9 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -427,40 +427,60 @@ 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(Contact\Introduction\Factory\Introduction::class);
+       }
+
+       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(Repository\ProfileField::class);
+               return self::$dice->create(Profile\ProfileField\Factory\ProfileField::class);
        }
 
-       public static function notification(): Navigation\Notifications\Depository\Notification
+       public static function notification(): Navigation\Notifications\Repository\Notification
        {
-               return self::$dice->create(Navigation\Notifications\Depository\Notification::class);
+               return self::$dice->create(Navigation\Notifications\Repository\Notification::class);
        }
 
        public static function notificationFactory(): Navigation\Notifications\Factory\Notification
@@ -468,9 +488,9 @@ abstract class DI
                return self::$dice->create(Navigation\Notifications\Factory\Notification::class);
        }
 
-       public static function notify(): Navigation\Notifications\Depository\Notify
+       public static function notify(): Navigation\Notifications\Repository\Notify
        {
-               return self::$dice->create(Navigation\Notifications\Depository\Notify::class);
+               return self::$dice->create(Navigation\Notifications\Repository\Notify::class);
        }
 
        public static function notifyFactory(): Navigation\Notifications\Factory\Notify