X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=89b102afc330ce51e9d544409d543f6207e5cdb2;hb=9414edd64a714b115780df9ef6a7375c9d69c050;hp=944fad805d18d8413d6e9a9e12837c646dbc456a;hpb=57ff3e3a079c38e66ec4991f54d209a6f524ee59;p=friendica.git diff --git a/src/DI.php b/src/DI.php index 944fad805d..89b102afc3 100644 --- a/src/DI.php +++ b/src/DI.php @@ -1,6 +1,6 @@ create(App\Mode::class); } - /** - * @return App\Module - */ - public static function module() - { - return self::$dice->create(App\Module::class); - } - /** * @return App\Page */ @@ -123,6 +126,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 */ @@ -136,35 +147,35 @@ abstract class DI // /** - * @return Core\Cache\ICache + * @return Core\Cache\Capability\ICanCache */ public static function cache() { - return self::$dice->create(Core\Cache\ICache::class); + return self::$dice->create(Core\Cache\Capability\ICanCache::class); } /** - * @return Core\Config\IConfig + * @return Core\Config\Capability\IManageConfigValues */ public static function config() { - return self::$dice->create(Core\Config\IConfig::class); + return self::$dice->create(Core\Config\Capability\IManageConfigValues::class); } /** - * @return Core\PConfig\IPConfig + * @return Core\PConfig\Capability\IManagePersonalConfigValues */ public static function pConfig() { - return self::$dice->create(Core\PConfig\IPConfig::class); + return self::$dice->create(Core\PConfig\Capability\IManagePersonalConfigValues::class); } /** - * @return Core\Lock\ILock + * @return Core\Lock\Capability\ICanLock */ public static function lock() { - return self::$dice->create(Core\Lock\ILock::class); + return self::$dice->create(Core\Lock\Capability\ICanLock::class); } /** @@ -176,33 +187,53 @@ 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\ISession + * @return Core\Session\Capability\IHandleSessions */ public static function session() { - return self::$dice->create(Core\Session\ISession::class); + return self::$dice->create(Core\Session\Capability\IHandleSessions::class); } /** - * @return Core\StorageManager + * @return \Friendica\Core\Storage\Repository\StorageManager */ public static function storageManager() { - return self::$dice->create(Core\StorageManager::class); + return self::$dice->create(Core\Storage\Repository\StorageManager::class); + } + + /** + * @return \Friendica\Core\System + */ + public static function system() + { + return self::$dice->create(Core\System::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 */ @@ -224,13 +255,21 @@ abstract class DI */ public static function workerLogger() { - return self::$dice->create(Util\Logger\WorkerLogger::class); + return self::$dice->create(Core\Logger\Type\WorkerLogger::class); } // // "Factory" namespace instances // + /** + * @return Factory\Api\Friendica\Activities + */ + public static function friendicaActivities() + { + return self::$dice->create(Factory\Api\Friendica\Activities::class); + } + /** * @return Factory\Api\Mastodon\Account */ @@ -287,14 +326,6 @@ abstract class DI return self::$dice->create(Factory\Api\Mastodon\Error::class); } - /** - * @return Factory\Api\Mastodon\Field - */ - public static function mstdnField() - { - return self::$dice->create(Factory\Api\Mastodon\Field::class); - } - /** * @return Factory\Api\Mastodon\FollowRequest */ @@ -320,19 +351,27 @@ abstract class DI } /** - * @return Factory\Api\Mastodon\ListEntity + * @return Factory\Api\Mastodon\ScheduledStatus */ - public static function mstdnList() + public static function mstdnScheduledStatus() { - return self::$dice->create(Factory\Api\Mastodon\ListEntity::class); + return self::$dice->create(Factory\Api\Mastodon\ScheduledStatus::class); } /** - * @return Factory\Api\Mastodon\Mention + * @return Factory\Api\Mastodon\Subscription */ - public static function mstdnMention() + public static function mstdnSubscription() { - return self::$dice->create(Factory\Api\Mastodon\Mention::class); + return self::$dice->create(Factory\Api\Mastodon\Subscription::class); + } + + /** + * @return Factory\Api\Mastodon\ListEntity + */ + public static function mstdnList() + { + return self::$dice->create(Factory\Api\Mastodon\ListEntity::class); } /** @@ -344,11 +383,11 @@ abstract class DI } /** - * @return Factory\Api\Mastodon\Tag + * @return Factory\Api\Twitter\Status */ - public static function mstdnTag() + public static function twitterStatus() { - return self::$dice->create(Factory\Api\Mastodon\Tag::class); + return self::$dice->create(Factory\Api\Twitter\Status::class); } /** @@ -359,31 +398,20 @@ abstract class DI return self::$dice->create(Factory\Api\Twitter\User::class); } - /** - * @return Factory\Notification\Notification - */ - public static function notification() - { - return self::$dice->create(Factory\Notification\Notification::class); - } - - /** - * @return Factory\Notification\Introduction - */ - public static function notificationIntro() + 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); } // // "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); } /** @@ -395,11 +423,28 @@ abstract class DI } /** - * @return Model\Storage\IStorage + * @return Core\Storage\Capability\ICanWriteToStorage */ public static function storage() { - return self::$dice->create(Model\Storage\IStorage::class); + return self::$dice->create(Core\Storage\Capability\ICanWriteToStorage::class); + } + + /** + * @return Model\Log\ParsedLogIterator + */ + public static function parsedLogIterator() + { + 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); } // @@ -407,11 +452,11 @@ abstract class DI // /** - * @return Network\IHTTPRequest + * @return Network\HTTPClient\Capability\ICanSendHttpRequests */ - public static function httpRequest() + public static function httpClient() { - return self::$dice->create(Network\IHTTPRequest::class); + return self::$dice->create(Network\HTTPClient\Capability\ICanSendHttpRequests::class); } // @@ -419,43 +464,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\Notification - */ - 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\Notification::class); + return self::$dice->create(Navigation\Notifications\Factory\FormattedNotification::class); } //