Convert custom profile field URL values to rel="me" links

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index ecc65bbc98e8294089de4c51c9c9c5140da8342a..59f48fcb5f1205d3a9d4087a18aa15535c24ca54 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
        //
@@ -98,14 +117,6 @@ abstract class DI
                return self::$dice->create(App\Mode::class);
        }
 
-       /**
-        * @return App\Module
-        */
-       public static function module()
-       {
-               return self::$dice->create(App\Module::class);
-       }
-
        /**
         * @return App\Page
         */
@@ -195,21 +206,23 @@ abstract class DI
        }
 
        /**
-        * @return Core\Process
+        * @return Core\Worker\Repository\Process
         */
        public static function process()
        {
-               return self::$dice->create(Core\Process::class);
+               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,10 +231,38 @@ abstract class DI
                return self::$dice->create(Core\Storage\Repository\StorageManager::class);
        }
 
+       /**
+        * @return \Friendica\Core\System
+        */
+       public static function system()
+       {
+               return self::$dice->create(Core\System::class);
+       }
+
+       /**
+        * @return \Friendica\Navigation\SystemMessages
+        */
+       public static function sysmsg()
+       {
+               return self::$dice->create(SystemMessages::class);
+       }
+
        //
        // "LoggerInterface" instances
        //
 
+       /**
+        * Flushes the Logger instance, so the factory is called again
+        * (creates a new id and retrieves the current PID)
+        */
+       public static function flushLogger()
+       {
+               $flushDice = self::$dice
+                       ->addRule(LoggerInterface::class, self::$dice->getRule(LoggerInterface::class))
+                       ->addRule('$devLogger', self::$dice->getRule('$devLogger'));
+               static::init($flushDice);
+       }
+
        /**
         * @return LoggerInterface
         */
@@ -314,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
         */
@@ -330,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
         */
@@ -362,6 +419,14 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\Notification::class);
        }
 
+       /**
+        * @return Factory\Api\Twitter\Status
+        */
+       public static function twitterStatus()
+       {
+               return self::$dice->create(Factory\Api\Twitter\Status::class);
+       }
+
        /**
         * @return Factory\Api\Twitter\User
         */
@@ -379,11 +444,11 @@ abstract class DI
        // "Model" namespace instances
        //
        /**
-        * @return Model\Process
+        * @return \Friendica\Core\Worker\Repository\Process
         */
        public static function modelProcess()
        {
-               return self::$dice->create(Model\Process::class);
+               return self::$dice->create(Core\Worker\Repository\Process::class);
        }
 
        /**
@@ -410,16 +475,25 @@ abstract class DI
                return self::$dice->create(Model\Log\ParsedLogIterator::class);
        }
 
+       //
+       // "Module" namespace
+       //
+
+       public static function apiResponse(): Module\Api\ApiResponse
+       {
+               return self::$dice->create(Module\Api\ApiResponse::class);
+       }
+
        //
        // "Network" namespace
        //
 
        /**
-        * @return Network\HTTPClient\Capability\ICanRequestPerHttp
+        * @return Network\HTTPClient\Capability\ICanSendHttpRequests
         */
        public static function httpClient()
        {
-               return self::$dice->create(Network\HTTPClient\Capability\ICanRequestPerHttp::class);
+               return self::$dice->create(Network\HTTPClient\Capability\ICanSendHttpRequests::class);
        }
 
        //
@@ -458,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);
@@ -498,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);
        }
 
        //
@@ -515,6 +599,11 @@ abstract class DI
                return self::$dice->create(Protocol\Activity::class);
        }
 
+       public static function dsprContact(): Protocol\Diaspora\Repository\DiasporaContact
+       {
+               return self::$dice->create(Protocol\Diaspora\Repository\DiasporaContact::class);
+       }
+
        //
        // "Security" namespace instances
        //