<?php
-
-use Dice\Dice;
-use Friendica\App;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
-use Friendica\Core\L10n\L10n;
-use Friendica\Core\Lock\ILock;
-use Friendica\Core\Process;
-use Friendica\Core\Session\ISession;
-use Friendica\Core\StorageManager;
-use Friendica\Database\Database;
-use Friendica\Factory;
-use Friendica\Model\Storage\IStorage;
-use Friendica\Model\User\Cookie;
-use Friendica\Util;
-use Psr\Log\LoggerInterface;
-
/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
* The configuration defines "complex" dependencies inside Friendica
* So this classes shouldn't be simple or their dependencies are already defined here.
*
* - $a = new ClassA($creationPassedVariable);
*
*/
+
+use Dice\Dice;
+use Friendica\App;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\L10n;
+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\Core\Storage\Capability\ICanWriteToStorage;
+use Friendica\Model\User\Cookie;
+use Friendica\Model\Log\ParsedLogIterator;
+use Friendica\Network;
+use Friendica\Util;
+use Psr\Log\LoggerInterface;
+
return [
'*' => [
// marks all class result as shared for other creations, so there's just
$_SERVER
]
],
- Util\BasePath::class => [
+ Util\BasePath::class => [
'constructParams' => [
dirname(__FILE__, 2),
$_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\ConfigCache::class => [
- 'instanceOf' => Factory\ConfigFactory::class,
+ Config\ValueObject\Cache::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
- ['createCache', [], Dice::CHAIN_CALL],
+ ['createCache', [$_SERVER], Dice::CHAIN_CALL],
],
],
- App\Mode::class => [
+ App\Mode::class => [
'call' => [
['determineRunMode', [true, $_SERVER], Dice::CHAIN_CALL],
['determine', [], Dice::CHAIN_CALL],
],
],
- Config\IConfiguration::class => [
- 'instanceOf' => Factory\ConfigFactory::class,
+ Config\Capability\IManageConfigValues::class => [
+ 'instanceOf' => Config\Factory\Config::class,
'call' => [
- ['createConfig', [], Dice::CHAIN_CALL],
+ ['create', [], Dice::CHAIN_CALL],
],
],
- Config\IPConfiguration::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 => [
+ Database::class => [
'constructParams' => [
[Dice::INSTANCE => \Psr\Log\NullLogger::class],
- $_SERVER,
],
],
/**
* 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'],
],
],
App\Router::class => [
'constructParams' => [
- $_SERVER, null
- ],
- 'call' => [
- ['loadRoutes', [include __DIR__ . '/routes.config.php'], Dice::CHAIN_CALL],
+ $_SERVER,
+ __DIR__ . '/routes.config.php',
+ null
],
],
L10n::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
],
],
- IStorage::class => [
+ ICanWriteToStorage::class => [
'instanceOf' => StorageManager::class,
'call' => [
['getBackend', [], Dice::CHAIN_CALL],
],
],
+ 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
+ ],
+ ],
];