Merge pull request #10968 from annando/api2

[friendica.git] / static / dependencies.config.php

diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index b1a54786ac10cd68a4549fe717ef271c155db80d..57ef629bb255aa04f74365774d0471d3e3b247bb 100644 (file)
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,15 +37,16 @@ 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\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\IStorage;
+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;
@@ -72,16 +73,19 @@ return [
                        $_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', [], Dice::CHAIN_CALL],
+                       ['createCache', [$_SERVER], Dice::CHAIN_CALL],
                ],
        ],
        App\Mode::class              => [
@@ -90,22 +94,21 @@ return [
                        ['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                         => [
                'constructParams' => [
                        [Dice::INSTANCE => \Psr\Log\NullLogger::class],
-                       $_SERVER,
                ],
        ],
        /**
@@ -137,16 +140,16 @@ return [
         *    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',
                ],
@@ -154,20 +157,20 @@ return [
                        ['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],
                ],
@@ -184,10 +187,9 @@ return [
                        ['determineModule', [], Dice::CHAIN_CALL],
                ],
        ],
-       Process::class => [
+       \Friendica\Core\System::class => [
                'constructParams' => [
                        [Dice::INSTANCE => '$basepath'],
-                       getmypid(),
                ],
        ],
        App\Router::class => [
@@ -202,8 +204,8 @@ return [
                        $_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],
@@ -214,13 +216,31 @@ return [
                        $_SERVER, $_COOKIE
                ],
        ],
-       IStorage::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
+               ],
+       ],
 ];