<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\PConfig;
use Friendica\Core\L10n;
use Friendica\Core\Lock;
-use Friendica\Core\Process;
-use Friendica\Core\Session\ISession;
-use Friendica\Core\StorageManager;
+use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Core\Storage\Repository\StorageManager;
use Friendica\Database\Database;
+use Friendica\Database\Definition\DbaDefinition;
+use Friendica\Database\Definition\ViewDefinition;
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;
$_SERVER
]
],
- Config\Cache\ConfigFileLoader::class => [
- 'instanceOf' => Config\Factory\ConfigFactory::class,
+ Config\Util\ConfigFileLoader::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
['createConfigFileLoader', [
[Dice::INSTANCE => '$basepath'],
], Dice::CHAIN_CALL],
],
],
- Config\Cache\Cache::class => [
- 'instanceOf' => Config\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' => Config\Factory\ConfigFactory::class,
+ Config\Capability\IManageConfigValues::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
],
],
- PConfig\IPConfig::class => [
- 'instanceOf' => PConfig\Factory\PConfigFactory::class,
+ PConfig\Capability\IManagePersonalConfigValues::class => [
+ 'instanceOf' => PConfig\Factory\PConfig::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
]
],
+ DbaDefinition::class => [
+ 'constructParams' => [
+ [Dice::INSTANCE => '$basepath'],
+ ],
+ 'call' => [
+ ['load', [false], Dice::CHAIN_CALL],
+ ],
+ ],
+ ViewDefinition::class => [
+ 'constructParams' => [
+ [Dice::INSTANCE => '$basepath'],
+ ],
+ 'call' => [
+ ['load', [false], Dice::CHAIN_CALL],
+ ],
+ ],
Database::class => [
'constructParams' => [
[Dice::INSTANCE => \Psr\Log\NullLogger::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' => Cache\Factory\CacheFactory::class,
+ Cache\Capability\ICanCache::class => [
+ 'instanceOf' => Cache\Factory\Cache::class,
'call' => [
- ['create', [], Dice::CHAIN_CALL],
+ ['createLocal', [], Dice::CHAIN_CALL],
],
],
- Cache\IMemoryCache::class => [
- 'instanceOf' => Cache\Factory\CacheFactory::class,
+ Cache\Capability\ICanCacheInMemory::class => [
+ 'instanceOf' => Cache\Factory\Cache::class,
'call' => [
- ['create', [], Dice::CHAIN_CALL],
+ ['createLocal', [], Dice::CHAIN_CALL],
],
],
- Lock\ILock::class => [
- 'instanceOf' => Lock\Factory\LockFactory::class,
+ Lock\Capability\ICanLock::class => [
+ 'instanceOf' => Lock\Factory\Lock::class,
'call' => [
['create', [], Dice::CHAIN_CALL],
],
['determine', [$_SERVER, $_GET], Dice::CHAIN_CALL],
],
],
- App\Module::class => [
- 'instanceOf' => App\Module::class,
- 'call' => [
- ['determineModule', [], Dice::CHAIN_CALL],
- ],
- ],
- Process::class => [
+ \Friendica\Core\System::class => [
'constructParams' => [
[Dice::INSTANCE => '$basepath'],
- getmypid(),
],
],
App\Router::class => [
'constructParams' => [
$_SERVER,
__DIR__ . '/routes.config.php',
+ [Dice::INSTANCE => Dice::SELF],
null
],
],
$_SERVER, $_GET
],
],
- ISession::class => [
- 'instanceOf' => \Friendica\Core\Session\Factory\SessionFactory::class,
+ IHandleSessions::class => [
+ 'instanceOf' => \Friendica\Core\Session\Factory\Session::class,
'call' => [
['createSession', [$_SERVER], Dice::CHAIN_CALL],
['start', [], Dice::CHAIN_CALL],
],
],
+ IHandleUserSessions::class => [
+ 'instanceOf' => \Friendica\Core\Session\Model\UserSession::class,
+ ],
Cookie::class => [
'constructParams' => [
- $_SERVER, $_COOKIE
+ $_COOKIE
],
],
- IWritableStorage::class => [
+ ICanWriteToStorage::class => [
'instanceOf' => StorageManager::class,
'call' => [
['getBackend', [], Dice::CHAIN_CALL],
],
],
- Network\IHTTPClient::class => [
- 'instanceOf' => Factory\HTTPClientFactory::class,
+ Network\HTTPClient\Capability\ICanSendHttpRequests::class => [
+ 'instanceOf' => Network\HTTPClient\Factory\HttpClient::class,
'call' => [
['createClient', [], Dice::CHAIN_CALL],
],
[Dice::INSTANCE => Util\ReversedFileReader::class],
]
],
+ \Friendica\Core\Worker\Repository\Process::class => [
+ 'constructParams' => [
+ $_SERVER
+ ],
+ ],
+ App\Request::class => [
+ 'constructParams' => [
+ $_SERVER
+ ],
+ ],
+ \Psr\Clock\ClockInterface::class => [
+ 'instanceOf' => Util\Clock\SystemClock::class
+ ]
];