Merge pull request #12277 from nupplaphil/mod/fbrowser

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 4f950bd78eeea17db42c73b61cb35b14a7984490..3a8a9b6d2474eabea20815bed10269ba58cb5fd0 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,9 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Navigation\SystemMessages;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -65,11 +68,27 @@ abstract class DI
        /**
         * @return Database\Database
         */
-       public static function dba()
+       public static function dba(): Database\Database
        {
                return self::$dice->create(Database\Database::class);
        }
 
+       /**
+        * @return \Friendica\Database\Definition\DbaDefinition
+        */
+       public static function dbaDefinition(): Database\Definition\DbaDefinition
+       {
+               return self::$dice->create(Database\Definition\DbaDefinition::class);
+       }
+
+       /**
+        * @return \Friendica\Database\Definition\ViewDefinition
+        */
+       public static function viewDefinition(): Database\Definition\ViewDefinition
+       {
+               return self::$dice->create(Database\Definition\ViewDefinition::class);
+       }
+
        //
        // "App" namespace instances
        //
@@ -194,14 +213,16 @@ abstract class DI
                return self::$dice->create(Core\Worker\Repository\Process::class);
        }
 
-       /**
-        * @return Core\Session\Capability\IHandleSessions
-        */
-       public static function session()
+       public static function session(): IHandleSessions
        {
                return self::$dice->create(Core\Session\Capability\IHandleSessions::class);
        }
 
+       public static function userSession(): IHandleUserSessions
+       {
+               return self::$dice->create(Core\Session\Capability\IHandleUserSessions::class);
+       }
+
        /**
         * @return \Friendica\Core\Storage\Repository\StorageManager
         */
@@ -218,6 +239,14 @@ abstract class DI
                return self::$dice->create(Core\System::class);
        }
 
+       /**
+        * @return \Friendica\Navigation\SystemMessages
+        */
+       public static function sysmsg()
+       {
+               return self::$dice->create(SystemMessages::class);
+       }
+
        //
        // "LoggerInterface" instances
        //
@@ -262,14 +291,6 @@ abstract class DI
        // "Factory" namespace instances
        //
 
-       /**
-        * @return Factory\Api\Friendica\Activities
-        */
-       public static function friendicaActivities()
-       {
-               return self::$dice->create(Factory\Api\Friendica\Activities::class);
-       }
-
        /**
         * @return Factory\Api\Mastodon\Account
         */
@@ -334,6 +355,14 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
        }
 
+       /**
+        * @return Factory\Api\Mastodon\Poll
+        */
+       public static function mstdnPoll()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Poll::class);
+       }
+
        /**
         * @return Factory\Api\Mastodon\Relationship
         */
@@ -350,6 +379,14 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\Status::class);
        }
 
+       /**
+        * @return Factory\Api\Mastodon\StatusSource
+        */
+       public static function mstdnStatusSource()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\StatusSource::class);
+       }
+
        /**
         * @return Factory\Api\Mastodon\ScheduledStatus
         */
@@ -398,14 +435,6 @@ abstract class DI
                return self::$dice->create(Factory\Api\Twitter\User::class);
        }
 
-       /**
-        * @return Factory\Api\Twitter\DirectMessage
-        */
-       public static function twitterDirectMessage()
-       {
-               return self::$dice->create(Factory\Api\Twitter\DirectMessage::class);
-       }
-
        public static function notificationIntro(): Navigation\Notifications\Factory\Introduction
        {
                return self::$dice->create(Navigation\Notifications\Factory\Introduction::class);
@@ -503,6 +532,11 @@ abstract class DI
                return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
        }
 
+       public static function localRelationship(): Contact\LocalRelationship\Repository\LocalRelationship
+       {
+               return self::$dice->create(Contact\LocalRelationship\Repository\LocalRelationship::class);
+       }
+
        public static function permissionSet(): Security\PermissionSet\Repository\PermissionSet
        {
                return self::$dice->create(Security\PermissionSet\Repository\PermissionSet::class);
@@ -543,9 +577,14 @@ abstract class DI
                return self::$dice->create(Navigation\Notifications\Factory\Notify::class);
        }
 
-       public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotification
+       public static function formattedNotificationFactory(): Navigation\Notifications\Factory\FormattedNotify
+       {
+               return self::$dice->create(Navigation\Notifications\Factory\FormattedNotify::class);
+       }
+
+       public static function formattedNavNotificationFactory(): Navigation\Notifications\Factory\FormattedNavNotification
        {
-               return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
+               return self::$dice->create(Navigation\Notifications\Factory\FormattedNavNotification::class);
        }
 
        //