X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=8d706ed374a1ab3eb80b34280b983dcf0805dfa5;hb=89b6c4c73f372bcff10fb121fbfdbd9255bb824d;hp=e5601f64d21aea2abb33b71eb8a14d907b1039c4;hpb=513ef03421f172221fe2457b79910ea944a35375;p=friendica.git diff --git a/src/DI.php b/src/DI.php index e5601f64d2..8d706ed374 100644 --- a/src/DI.php +++ b/src/DI.php @@ -37,6 +37,15 @@ abstract class DI /** @var Dice */ private static $dice; + /** + * Initialize the singleton DI container with the Dice instance + * + * @param Dice $dice The Dice instance + * @param bool $disableDepByHand If true, the database dependencies aren't set, thus any occurrence of logging or + * profiling in database methods would lead to an error. This flag is for testing only. + * + * @return void + */ public static function init(Dice $dice, bool $disableDepByHand = false) { self::$dice = $dice; @@ -48,8 +57,9 @@ abstract class DI /** * I HATE this method, but everything else needs refactoring at the database itself + * Set the database dependencies manually, because of current, circular dependencies between the database and the config table * - * @return void + * @todo Instead of this madness, split the database in a core driver-dependent (mysql, mariadb, postgresql, ..) part without any other dependency unlike credentials and in the full-featured, driver-independent database class with all dependencies */ public static function setCompositeRootDependencyByHand() { @@ -59,7 +69,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 */ @@ -116,10 +126,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); } @@ -372,14 +379,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 */