Moved acitivites

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 7e5f309b33b2f368c0c6f81f6972be55bb5ee5e9..b40222237b9c6e9498f4592e7b56cfb344f3b1f6 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -99,11 +99,11 @@ abstract class DI
        }
 
        /**
-        * @return App\Module
+        * @return App\ModuleController
         */
        public static function module()
        {
-               return self::$dice->create(App\Module::class);
+               return self::$dice->create(App\ModuleController::class);
        }
 
        /**
@@ -155,35 +155,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);
        }
 
        /**
@@ -195,33 +195,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
         */
@@ -243,13 +263,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
         */
@@ -362,6 +390,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
         */
@@ -379,11 +415,11 @@ abstract class DI
        // "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 +431,11 @@ abstract class DI
        }
 
        /**
-        * @return Model\Storage\IWritableStorage
+        * @return Core\Storage\Capability\ICanWriteToStorage
         */
        public static function storage()
        {
-               return self::$dice->create(Model\Storage\IWritableStorage::class);
+               return self::$dice->create(Core\Storage\Capability\ICanWriteToStorage::class);
        }
 
        /**
@@ -410,16 +446,25 @@ abstract class DI
                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);
+       }
+
        //
        // "Network" namespace
        //
 
        /**
-        * @return Network\IHTTPClient
+        * @return Network\HTTPClient\Capability\ICanSendHttpRequests
         */
        public static function httpClient()
        {
-               return self::$dice->create(Network\IHTTPClient::class);
+               return self::$dice->create(Network\HTTPClient\Capability\ICanSendHttpRequests::class);
        }
 
        //