Merge branch 'friendica:develop' into mastodon-api-reshare-fixes

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 24f06d2793eed7f5bd97de534434159c1233b42d..34cf1c68d55b76177610be3df682fec57db81bd3 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -22,6 +22,8 @@
 namespace Friendica;
 
 use Dice\Dice;
+use Friendica\Core\Logger\Capability\ICheckLoggerSettings;
+use Friendica\Core\Logger\Util\LoggerSettingsCheck;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Navigation\SystemMessages;
@@ -69,7 +71,7 @@ abstract class DI
 
        /**
         * Returns a clone of the current dice instance
-        * This usefull for overloading the current instance with mocked methods during tests
+        * This useful for overloading the current instance with mocked methods during tests
         *
         * @return Dice
         */
@@ -126,10 +128,7 @@ abstract class DI
                return self::$dice->create(App\Arguments::class);
        }
 
-       /**
-        * @return App\BaseURL
-        */
-       public static function baseUrl()
+       public static function baseUrl(): App\BaseURL
        {
                return self::$dice->create(App\BaseURL::class);
        }
@@ -211,9 +210,9 @@ abstract class DI
                return self::$dice->create(Core\Config\Util\ConfigFileManager::class);
        }
 
-       public static function keyValue(): Core\KeyValueStorage\Capabilities\IManageKeyValuePairs
+       public static function keyValue(): Core\KeyValueStorage\Capability\IManageKeyValuePairs
        {
-               return self::$dice->create(Core\KeyValueStorage\Capabilities\IManageKeyValuePairs::class);
+               return self::$dice->create(Core\KeyValueStorage\Capability\IManageKeyValuePairs::class);
        }
 
        /**
@@ -298,6 +297,11 @@ abstract class DI
                static::init($flushDice);
        }
 
+       public static function logCheck(): ICheckLoggerSettings
+       {
+               return self::$dice->create(LoggerSettingsCheck::class);
+       }
+
        /**
         * @return LoggerInterface
         */
@@ -382,14 +386,6 @@ abstract class DI
                return self::$dice->create(Factory\Api\Mastodon\Error::class);
        }
 
-       /**
-        * @return Factory\Api\Mastodon\FollowRequest
-        */
-       public static function mstdnFollowRequest()
-       {
-               return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
-       }
-
        /**
         * @return Factory\Api\Mastodon\Poll
         */
@@ -703,14 +699,6 @@ abstract class DI
                return self::$dice->create(Util\DateTimeFormat::class);
        }
 
-       /**
-        * @return Util\FileSystem
-        */
-       public static function fs()
-       {
-               return self::$dice->create(Util\FileSystem::class);
-       }
-
        /**
         * @return Util\Profiler
         */