Restructure Lock to follow new paradigm

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index e259c271a00ac4ef6dc82d13b4e21246b76d89eb..7e5f309b33b2f368c0c6f81f6972be55bb5ee5e9 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -39,6 +39,17 @@ abstract class DI
                self::$dice = $dice;
        }
 
+       /**
+        * Returns a clone of the current dice instance
+        * This usefull for overloading the current instance with mocked methods during tests
+        *
+        * @return Dice
+        */
+       public static function getDice()
+       {
+               return clone self::$dice;
+       }
+
        //
        // common instances
        //
@@ -123,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
         */
@@ -239,6 +258,38 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\Account::class);
        }
 
+       /**
+        * @return Factory\Api\Mastodon\Application
+        */
+       public static function mstdnApplication()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Application::class);
+       }
+
+       /**
+        * @return Factory\Api\Mastodon\Attachment
+        */
+       public static function mstdnAttachment()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Attachment::class);
+       }
+
+       /**
+        * @return Factory\Api\Mastodon\Card
+        */
+       public static function mstdnCard()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Card::class);
+       }
+
+       /**
+        * @return Factory\Api\Mastodon\Conversation
+        */
+       public static function mstdnConversation()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Conversation::class);
+       }
+
        /**
         * @return Factory\Api\Mastodon\Emoji
         */
@@ -248,11 +299,11 @@ abstract class DI
        }
 
        /**
-        * @return Factory\Api\Mastodon\Field
+        * @return Factory\Api\Mastodon\Error
         */
-       public static function mstdnField()
+       public static function mstdnError()
        {
-               return self::$dice->create(Factory\Api\Mastodon\Field::class);
+               return self::$dice->create(Factory\Api\Mastodon\Error::class);
        }
 
        /**
@@ -280,43 +331,48 @@ abstract class DI
        }
 
        /**
-        * @return Factory\Api\Mastodon\Mention
+        * @return Factory\Api\Mastodon\ScheduledStatus
         */
-       public static function mstdnMention()
+       public static function mstdnScheduledStatus()
        {
-               return self::$dice->create(Factory\Api\Mastodon\Mention::class);
+               return self::$dice->create(Factory\Api\Mastodon\ScheduledStatus::class);
        }
 
        /**
-        * @return Factory\Api\Mastodon\Tag
+        * @return Factory\Api\Mastodon\Subscription
         */
-       public static function mstdnTag()
+       public static function mstdnSubscription()
        {
-               return self::$dice->create(Factory\Api\Mastodon\Tag::class);
+               return self::$dice->create(Factory\Api\Mastodon\Subscription::class);
        }
 
        /**
-        * @return Factory\Api\Twitter\User
+        * @return Factory\Api\Mastodon\ListEntity
         */
-       public static function twitterUser()
+       public static function mstdnList()
        {
-               return self::$dice->create(Factory\Api\Twitter\User::class);
+               return self::$dice->create(Factory\Api\Mastodon\ListEntity::class);
        }
 
        /**
-        * @return Factory\Notification\Notification
+        * @return Factory\Api\Mastodon\Notification
         */
-       public static function notification()
+       public static function mstdnNotification()
        {
-               return self::$dice->create(Factory\Notification\Notification::class);
+               return self::$dice->create(Factory\Api\Mastodon\Notification::class);
        }
 
        /**
-        * @return Factory\Notification\Introduction
+        * @return Factory\Api\Twitter\User
         */
-       public static function notificationIntro()
+       public static function twitterUser()
+       {
+               return self::$dice->create(Factory\Api\Twitter\User::class);
+       }
+
+       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);
        }
 
        //
@@ -339,11 +395,19 @@ abstract class DI
        }
 
        /**
-        * @return Model\Storage\IStorage
+        * @return Model\Storage\IWritableStorage
         */
        public static function storage()
        {
-               return self::$dice->create(Model\Storage\IStorage::class);
+               return self::$dice->create(Model\Storage\IWritableStorage::class);
+       }
+
+       /**
+        * @return Model\Log\ParsedLogIterator
+        */
+       public static function parsedLogIterator()
+       {
+               return self::$dice->create(Model\Log\ParsedLogIterator::class);
        }
 
        //
@@ -351,11 +415,11 @@ abstract class DI
        //
 
        /**
-        * @return Network\IHTTPRequest
+        * @return Network\IHTTPClient
         */
-       public static function httpRequest()
+       public static function httpClient()
        {
-               return self::$dice->create(Network\IHTTPRequest::class);
+               return self::$dice->create(Network\IHTTPClient::class);
        }
 
        //
@@ -363,43 +427,80 @@ 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(Repository\ProfileField::class);
+               return self::$dice->create(Contact\Introduction\Factory\Introduction::class);
        }
 
-       /**
-        * @return Repository\Notify
-        */
-       public static function notify()
+       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(Profile\ProfileField\Factory\ProfileField::class);
+       }
+
+       public static function notification(): Navigation\Notifications\Repository\Notification
+       {
+               return self::$dice->create(Navigation\Notifications\Repository\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\Repository\Notify
+       {
+               return self::$dice->create(Navigation\Notifications\Repository\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\Notify::class);
+               return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class);
        }
 
        //