replace "p" with higher level database functions

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 4645ea252db915cfe171c8cccad5771fa4f8c18d..9025feb470983355f0c19f73ed5102b8726042a1 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);
        }
 
        //
@@ -445,12 +442,14 @@ 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);
+       }
+
+       public static function permissionSetFactory(): Security\PermissionSet\Factory\PermissionSet
+       {
+               return self::$dice->create(Security\PermissionSet\Factory\PermissionSet::class);
        }
 
        /**
@@ -461,12 +460,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);
        }
 
        //