use Friendica\App;
use Friendica\Core\Cache;
use Friendica\Core\Config;
+use Friendica\Core\PConfig;
use Friendica\Core\L10n;
-use Friendica\Core\Lock\ILock;
-use Friendica\Core\Process;
-use Friendica\Core\Session\ISession;
-use Friendica\Core\StorageManager;
+use Friendica\Core\Lock;
+use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Storage\Repository\StorageManager;
use Friendica\Database\Database;
use Friendica\Factory;
-use Friendica\Model\Storage\IWritableStorage;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
use Friendica\Model\User\Cookie;
+use Friendica\Model\Log\ParsedLogIterator;
use Friendica\Network;
use Friendica\Util;
use Psr\Log\LoggerInterface;
$_SERVER
]
],
- Util\ConfigFileLoader::class => [
- 'shared' => true,
- 'constructParams' => [
- [Dice::INSTANCE => '$basepath'],
+ Config\Util\ConfigFileLoader::class => [
+ 'instanceOf' => Config\Factory\Config::class,
+ 'call' => [
+ ['createConfigFileLoader', [
+ [Dice::INSTANCE => '$basepath'],
+ $_SERVER,
+ ], Dice::CHAIN_CALL],
],
],
- Config\Cache::class => [
- 'instanceOf' => Factory\ConfigFactory::class,
+ Config\ValueObject\Cache::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
['createCache', [$_SERVER], Dice::CHAIN_CALL],
],
['determine', [], Dice::CHAIN_CALL],
],
],
- Config\IConfig::class => [
- 'instanceOf' => Factory\ConfigFactory::class,
+ Config\Capability\IManageConfigValues::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
- ['createConfig', [], Dice::CHAIN_CALL],
+ ['create', [], Dice::CHAIN_CALL],
],
],
- \Friendica\Core\PConfig\IPConfig::class => [
- 'instanceOf' => Factory\ConfigFactory::class,
+ PConfig\Capability\IManagePersonalConfigValues::class => [
+ 'instanceOf' => PConfig\Factory\PConfig::class,
'call' => [
- ['createPConfig', [], Dice::CHAIN_CALL],
+ ['create', [], Dice::CHAIN_CALL],
]
],
Database::class => [
* and is automatically passed as an argument with the same name
*/
LoggerInterface::class => [
- 'instanceOf' => Factory\LoggerFactory::class,
+ 'instanceOf' => \Friendica\Core\Logger\Factory\Logger::class,
'constructParams' => [
'index',
],
'call' => [
- ['create', ['index'], Dice::CHAIN_CALL],
+ ['create', [], Dice::CHAIN_CALL],
],
],
'$devLogger' => [
- 'instanceOf' => Factory\LoggerFactory::class,
+ 'instanceOf' => \Friendica\Core\Logger\Factory\Logger::class,
'constructParams' => [
'dev',
],
['createDev', [], Dice::CHAIN_CALL],
]
],
- Cache\ICache::class => [
- 'instanceOf' => Factory\CacheFactory::class,
+ Cache\Capability\ICanCache::class => [
+ 'instanceOf' => Cache\Factory\Cache::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
],
],
- Cache\IMemoryCache::class => [
- 'instanceOf' => Factory\CacheFactory::class,
+ Cache\Capability\ICanCacheInMemory::class => [
+ 'instanceOf' => Cache\Factory\Cache::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
],
],
- ILock::class => [
- 'instanceOf' => Factory\LockFactory::class,
+ Lock\Capability\ICanLock::class => [
+ 'instanceOf' => Lock\Factory\Lock::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
],
['determineModule', [], Dice::CHAIN_CALL],
],
],
- Process::class => [
+ \Friendica\Core\System::class => [
'constructParams' => [
[Dice::INSTANCE => '$basepath'],
- getmypid(),
],
],
App\Router::class => [
$_SERVER, $_GET
],
],
- ISession::class => [
- 'instanceOf' => Factory\SessionFactory::class,
+ IHandleSessions::class => [
+ 'instanceOf' => \Friendica\Core\Session\Factory\Session::class,
'call' => [
['createSession', [$_SERVER], Dice::CHAIN_CALL],
['start', [], Dice::CHAIN_CALL],
$_SERVER, $_COOKIE
],
],
- IWritableStorage::class => [
+ ICanWriteToStorage::class => [
'instanceOf' => StorageManager::class,
'call' => [
['getBackend', [], Dice::CHAIN_CALL],
],
],
- Network\IHTTPRequest::class => [
- 'instanceOf' => Network\HTTPRequest::class,
+ Network\HTTPClient\Capability\ICanSendHttpRequests::class => [
+ 'instanceOf' => Network\HTTPClient\Factory\HttpClient::class,
+ 'call' => [
+ ['createClient', [], Dice::CHAIN_CALL],
+ ],
],
Factory\Api\Mastodon\Error::class => [
'constructParams' => [
$_SERVER
],
],
+ ParsedLogIterator::class => [
+ 'constructParams' => [
+ [Dice::INSTANCE => Util\ReversedFileReader::class],
+ ]
+ ],
+ \Friendica\Core\Worker\Repository\Process::class => [
+ 'constructParams' => [
+ $_SERVER
+ ],
+ ],
];