Replace $_GET references with $request in Update classes

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 0c134f37b48cbf38c4b96cfc117469f6dc11707e..0ef18a1aa35ec3984ea3d1c62ba65cf9932efbd9 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-2023, 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\ModuleController
-        */
-       public static function module()
-       {
-               return self::$dice->create(App\ModuleController::class);
-       }
-
        /**
         * @return App\Page
         */
@@ -170,6 +181,11 @@ abstract class DI
                return self::$dice->create(Core\Config\Capability\IManageConfigValues::class);
        }
 
+       public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs
+       {
+               return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class);
+       }
+
        /**
         * @return Core\PConfig\Capability\IManagePersonalConfigValues
         */
@@ -202,14 +218,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
         */
@@ -226,6 +244,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
        //
@@ -334,6 +360,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 +384,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
         */
@@ -382,6 +424,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
         */
@@ -487,6 +537,21 @@ abstract class DI
                return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
        }
 
+       public static function report(): Moderation\Repository\Report
+       {
+               return self::$dice->create(Moderation\Repository\Report::class);
+       }
+
+       public static function reportFactory(): Moderation\Factory\Report
+       {
+               return self::$dice->create(Moderation\Factory\Report::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);
@@ -527,9 +592,28 @@ 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\FormattedNavNotification::class);
+       }
+
+       //
+       // "Federation" namespace instances
+       //
+
+       public static function deliveryQueueItemFactory(): Federation\Factory\DeliveryQueueItem
+       {
+               return self::$dice->create(Federation\Factory\DeliveryQueueItem::class);
+       }
+
+       public static function deliveryQueueItemRepo(): Federation\Repository\DeliveryQueueItem
        {
-               return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
+               return self::$dice->create(Federation\Repository\DeliveryQueueItem::class);
        }
 
        //
@@ -544,6 +628,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
        //