upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #60957 from nextcloud/carl/simplify-di-init

Browse source 
refactor(server): Register alias when needed
This commit is contained in:
Carl Schwan 2026-06-11 13:57:35 +02:00 committed by GitHub
commit c882abff2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 95 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/config.sample.php
View file

@ -1659,15 +1659,6 @@ $CONFIG = [
*/
'comments.managerFactory' => '\OC\Comments\ManagerFactory',
/**
* Replaces the default System Tags Manager Factory. This can be utilized if an
* own or 3rd-party SystemTagsManager should be used that – for instance – uses the
* filesystem instead of the database to keep the tags.
*
* Defaults to ``\OC\SystemTag\ManagerFactory``
*/
'systemtags.managerFactory' => '\OC\SystemTag\ManagerFactory',
/**
* Maintenance
*

9
lib/private/Activity/EventMerger.php
View file

@ -10,14 +10,15 @@ namespace OC\Activity;
use OCP\Activity\IEvent;
use OCP\Activity\IEventMerger;
use OCP\IL10N;
use OCP\L10N\IFactory;
class EventMerger implements IEventMerger {
/**
* @param IL10N $l10n
*/
private readonly IL10N $l10n;
public function __construct(
protected IL10N $l10n,
IFactory $factory,
) {
$this->l10n = $factory->get('lib');
}
/**

5
lib/private/App/AppStore/Bundles/BundleFetcher.php
View file

@ -8,11 +8,14 @@
namespace OC\App\AppStore\Bundles;
use OCP\IL10N;
use OCP\L10N\IFactory;
class BundleFetcher {
private IL10N $l10n;
public function __construct(
private IL10N $l10n,
IFactory $factory,
) {
$this->l10n = $factory->get('lib');
}
/**

7
lib/private/Diagnostics/QueryLogger.php
View file

@ -8,6 +8,7 @@
namespace OC\Diagnostics;
use OC\SystemConfig;
use OCP\Cache\CappedMemoryCache;
use OCP\Diagnostics\IQueryLogger;
@ -20,7 +21,11 @@ class QueryLogger implements IQueryLogger {
/**
* QueryLogger constructor.
*/
public function __construct() {
public function __construct(SystemConfig $config) {
if ($config->getValue('debug', false)) {
// In debug mode, module is being activated by default
$this->activate();
}
$this->queries = new CappedMemoryCache(1024);
}

299
lib/private/Server.php
View file

@ -12,7 +12,6 @@ use bantu\IniGetWrapper\IniGetWrapper;
use OC\Accounts\AccountManager;
use OC\Activity\EventMerger;
use OC\App\AppManager;
use OC\App\AppStore\Bundles\BundleFetcher;
use OC\AppFramework\Http\Request;
use OC\AppFramework\Http\RequestId;
use OC\AppFramework\Services\AppConfig;
@ -79,7 +78,6 @@ use OC\Files\View;
use OC\FilesMetadata\FilesMetadataManager;
use OC\FullTextSearch\FullTextSearchManager;
use OC\Http\Client\ClientService;
use OC\Http\Client\NegativeDnsCache;
use OC\IntegrityCheck\Checker;
use OC\IntegrityCheck\Helpers\EnvironmentHelper;
use OC\IntegrityCheck\Helpers\FileAccessHelper;
@ -102,9 +100,7 @@ use OC\OCM\Model\OCMProvider;
use OC\OCM\OCMDiscoveryService;
use OC\OCS\CoreCapabilities;
use OC\OCS\DiscoveryService;
use OC\Preview\Db\PreviewMapper;
use OC\Preview\MimeIconProvider;
use OC\Preview\Watcher;
use OC\Preview\WatcherConnector;
use OC\Profile\ProfileManager;
use OC\Profiler\Profiler;
@ -278,6 +274,7 @@ use OCP\Snowflake\ISnowflakeGenerator;
use OCP\SpeechToText\ISpeechToTextManager;
use OCP\Support\Subscription\IAssertion;
use OCP\SystemTag\ISystemTagManager;
use OCP\SystemTag\ISystemTagManagerFactory;
use OCP\SystemTag\ISystemTagObjectMapper;
use OCP\Talk\IBroker;
use OCP\Teams\ITeamManager;
@ -344,124 +341,64 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerAlias(IPreview::class, PreviewManager::class);
$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
return new Watcher(
$c->get(\OC\Preview\Storage\StorageFactory::class),
$c->get(PreviewMapper::class),
$c->get(IDBConnection::class),
);
});
$this->registerService(IProfiler::class, function (Server $c) {
return new Profiler($c->get(SystemConfig::class));
});
$this->registerAlias(IProfiler::class, Profiler::class);
$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
$view = new View();
$util = new Encryption\Util(
$view,
$c->get(IUserManager::class),
$c->get(IGroupManager::class),
$c->get(IConfig::class)
);
return new Encryption\Manager(
$c->get(IConfig::class),
$c->get(LoggerInterface::class),
$c->getL10N('core'),
new View(),
$util,
$c->get(IFactory::class)->get('core'),
$c->get(View::class),
$c->get(Encryption\Util::class),
new ArrayCache()
);
});
$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
$this->registerService(IFile::class, function (ContainerInterface $c) {
$util = new Encryption\Util(
new View(),
$c->get(IUserManager::class),
$c->get(IGroupManager::class),
$c->get(IConfig::class)
);
return new File(
$util,
$c->get(IRootFolder::class),
$c->get(\OCP\Share\IManager::class)
);
});
$this->registerService(IStorage::class, function (ContainerInterface $c) {
$view = new View();
$util = new Encryption\Util(
$view,
$c->get(IUserManager::class),
$c->get(IGroupManager::class),
$c->get(IConfig::class)
);
return new Storage(
$view,
$util,
$c->get(ICrypto::class),
$c->get(IConfig::class)
);
});
$this->registerAlias(IFile::class, File::class);
$this->registerAlias(IStorage::class, Storage::class);
$this->registerAlias(ITagManager::class, TagManager::class);
$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
/** @var IConfig $config */
$config = $c->get(IConfig::class);
$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
return new $factoryClass($this);
});
$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
return $c->get('SystemTagManagerFactory')->getManager();
});
$this->registerAlias(ISystemTagManagerFactory::class, SystemTagManagerFactory::class);
/** @deprecated 35.0.0 */
$this->registerDeprecatedAlias('SystemTagManagerFactory', ISystemTagManagerFactory::class);
/** @deprecated 19.0.0 */
$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
return $c->get(ISystemTagManagerFactory::class)->getManager();
});
$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
return $c->get('SystemTagManagerFactory')->getObjectMapper();
return $c->get(ISystemTagManagerFactory::class)->getObjectMapper();
});
$this->registerAlias(IFileAccess::class, FileAccess::class);
$this->registerService('RootFolder', function (ContainerInterface $c) {
$view = new View();
/** @var IUserSession $userSession */
$userSession = $c->get(IUserSession::class);
$root = new Root(
$c->get(\OC\Files\Mount\Manager::class),
$view,
$userSession->getUser(),
$c->get(IUserMountCache::class),
$this->get(LoggerInterface::class),
$this->get(IUserManager::class),
$this->get(IEventDispatcher::class),
$this->get(ICacheFactory::class),
$this->get(IAppConfig::class),
);
$previewConnector = new WatcherConnector(
$root,
$c->get(SystemConfig::class),
$this->get(IEventDispatcher::class)
);
$previewConnector->connectWatcher();
return $root;
});
$this->registerService(HookConnector::class, function (ContainerInterface $c) {
return new HookConnector(
$c->get(IRootFolder::class),
new View(),
$c->get(IEventDispatcher::class),
$c->get(LoggerInterface::class)
);
});
/** @deprecated 35.0.0 */
$this->registerDeprecatedAlias('RootFolder', IRootFolder::class);
$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
return new LazyRoot(function () use ($c) {
return $c->get('RootFolder');
$view = new View();
/** @var IUserSession $userSession */
$userSession = $c->get(IUserSession::class);
$root = new Root(
$c->get(\OC\Files\Mount\Manager::class),
$view,
$userSession->getUser(),
$c->get(IUserMountCache::class),
$this->get(LoggerInterface::class),
$this->get(IUserManager::class),
$this->get(IEventDispatcher::class),
$this->get(ICacheFactory::class),
$this->get(IAppConfig::class),
);
$previewConnector = new WatcherConnector(
$root,
$c->get(SystemConfig::class),
$this->get(IEventDispatcher::class)
);
$previewConnector->connectWatcher();
return $root;
});
});
@ -471,16 +408,7 @@ class Server extends ServerContainer implements IServerContainer {
return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
});
$this->registerService(IGroupManager::class, function (ContainerInterface $c) {
$groupManager = new \OC\Group\Manager(
$this->get(IUserManager::class),
$this->get(IEventDispatcher::class),
$this->get(LoggerInterface::class),
$this->get(ICacheFactory::class),
$this->get(IRemoteAddress::class),
);
return $groupManager;
});
$this->registerAlias(IGroupManager::class, \OC\Group\Manager::class);
$this->registerService(Store::class, function (ContainerInterface $c) {
$session = $c->get(ISession::class);
@ -516,7 +444,7 @@ class Server extends ServerContainer implements IServerContainer {
$provider,
$c->get(IConfig::class),
$c->get(ISecureRandom::class),
$c->get('LockdownManager'),
$c->get(ILockdownManager::class),
$c->get(LoggerInterface::class),
$c->get(IEventDispatcher::class),
);
@ -609,16 +537,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerAlias(IUserConfig::class, UserConfig::class);
$this->registerAlias(IAppManager::class, AppManager::class);
$this->registerService(IFactory::class, function (Server $c) {
return new \OC\L10N\Factory(
$c->get(IConfig::class),
$c->get(IRequest::class),
$c->get(IUserSession::class),
$c->get(ICacheFactory::class),
\OC::$SERVERROOT,
$c->get(IAppManager::class),
);
});
$this->registerAlias(IFactory::class, \OC\L10N\Factory::class);
$this->registerAlias(IURLGenerator::class, URLGenerator::class);
@ -671,11 +590,7 @@ class Server extends ServerContainer implements IServerContainer {
);
});
$this->registerService(IEventMerger::class, function (Server $c) {
return new EventMerger(
$c->getL10N('lib')
);
});
$this->registerAlias(IEventMerger::class, EventMerger::class);
$this->registerAlias(IValidator::class, Validator::class);
$this->registerService(AvatarManager::class, function (Server $c) {
@ -709,10 +624,7 @@ class Server extends ServerContainer implements IServerContainer {
// PSR-3 logger
$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
$this->registerService(ILogFactory::class, function (Server $c) {
return new LogFactory($c, $this->get(SystemConfig::class));
});
$this->registerAlias(ILogFactory::class, LogFactory::class);
$this->registerAlias(IJobList::class, JobList::class);
$this->registerService(Router::class, function (Server $c) {
@ -726,7 +638,7 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerAlias(IRouter::class, Router::class);
$this->registerService(IBackend::class, function ($c) {
$this->registerService(IBackend::class, function ($c): IBackend {
$config = $c->get(IConfig::class);
if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === Redis::class) {
$backend = new MemoryCacheBackend(
@ -769,25 +681,12 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerAlias(ICertificateManager::class, CertificateManager::class);
$this->registerAlias(IClientService::class, ClientService::class);
$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
return new NegativeDnsCache(
$c->get(ICacheFactory::class),
);
});
$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
});
$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
$queryLogger = new QueryLogger();
if ($c->get(SystemConfig::class)->getValue('debug', false)) {
// In debug mode, module is being activated by default
$queryLogger->activate();
}
return $queryLogger;
});
$this->registerAlias(IQueryLogger::class, QueryLogger::class);
$this->registerAlias(ITempManager::class, TempManager::class);
$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
@ -800,14 +699,14 @@ class Server extends ServerContainer implements IServerContainer {
);
});
$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
$this->registerService(IUserMountCache::class, function (ContainerInterface $c): IUserMountCache {
$mountCache = $c->get(UserMountCache::class);
$listener = new UserMountCacheListener($mountCache);
$listener->listen($c->get(IUserManager::class));
return $mountCache;
});
$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c): IMountProviderCollection {
$loader = $c->get(IStorageFactory::class);
$mountCache = $c->get(IUserMountCache::class);
$eventLogger = $c->get(IEventLogger::class);
@ -816,7 +715,6 @@ class Server extends ServerContainer implements IServerContainer {
// builtin providers
$config = $c->get(IConfig::class);
$logger = $c->get(LoggerInterface::class);
$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
$manager->registerProvider(new CacheMountProvider($config));
$manager->registerHomeProvider(new LocalHomeMountProvider());
@ -826,7 +724,7 @@ class Server extends ServerContainer implements IServerContainer {
return $manager;
});
$this->registerService(IBus::class, function (ContainerInterface $c) {
$this->registerService(IBus::class, function (ContainerInterface $c): IBus {
$busClass = $c->get(IConfig::class)->getSystemValueString('commandbus');
if ($busClass) {
[$app, $class] = explode('::', $busClass, 2);
@ -977,11 +875,8 @@ class Server extends ServerContainer implements IServerContainer {
return new NoopLockingProvider();
});
$this->registerService(ILockManager::class, function (Server $c): LockManager {
return new LockManager();
});
$this->registerAlias(ILockManager::class, LockManager::class);
$this->registerAlias(ILockdownManager::class, 'LockdownManager');
$this->registerService(SetupManager::class, function ($c) {
// create the setupmanager through the mount manager to resolve the cyclic dependency
return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
@ -998,9 +893,6 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerAlias(IMimeTypeLoader::class, Loader::class);
$this->registerService(BundleFetcher::class, function () {
return new BundleFetcher($this->getL10N('lib'));
});
$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
@ -1105,7 +997,9 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerAlias(IEventDispatcher::class, EventDispatcher::class);
$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
/** @deprecated 35.0.0 */
$this->registerDeprecatedAlias('CryptoWrapper', CryptoWrapper::class);
$this->registerService(CryptoWrapper::class, function (ContainerInterface $c): CryptoWrapper {
// FIXME: Instantiated here due to cyclic dependency
$request = new Request(
[
@ -1129,9 +1023,6 @@ class Server extends ServerContainer implements IServerContainer {
$request
);
});
$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
return new SessionStorage($c->get(ISession::class));
});
$this->registerAlias(IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
@ -1168,45 +1059,26 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
return new \OC\Files\AppData\Factory(
$c->get(IRootFolder::class),
$c->get(SystemConfig::class)
);
});
$this->registerService('LockdownManager', function (ContainerInterface $c) {
return new LockdownManager(function () use ($c) {
return $c->get(ISession::class);
});
});
$this->registerService(IDiscoveryService::class, function (ContainerInterface $c): IDiscoveryService {
return new DiscoveryService(
$c->get(ICacheFactory::class),
$c->get(IClientService::class)
/** @deprecated 35.0.0 */
$this->registerDeprecatedAlias('LockdownManager', ILockdownManager::class);
$this->registerService(LockdownManager::class, function (ContainerInterface $c): LockdownManager {
return new LockdownManager(
function () use ($c) {
return $c->get(ISession::class);
}
);
});
$this->registerAlias(ILockdownManager::class, LockdownManager::class);
$this->registerAlias(IDiscoveryService::class, DiscoveryService::class);
$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
return new CloudIdManager(
$c->get(ICacheFactory::class),
$c->get(IEventDispatcher::class),
$c->get(\OCP\Contacts\IManager::class),
$c->get(IURLGenerator::class),
$c->get(IUserManager::class),
);
});
$this->registerAlias(ICloudIdManager::class, CloudIdManager::class);
$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
$this->registerService(ICloudFederationFactory::class, function (Server $c) {
return new CloudFederationFactory();
});
$this->registerAlias(ICloudFederationFactory::class, CloudFederationFactory::class);
$this->registerAlias(IControllerMethodReflector::class, ControllerMethodReflector::class);
$this->registerAlias(ITimeFactory::class, TimeFactory::class);
$this->registerAlias(\Psr\Clock\ClockInterface::class, ITimeFactory::class);
@ -1222,54 +1094,29 @@ class Server extends ServerContainer implements IServerContainer {
return $session->getSession();
}, false);
$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
return new ShareHelper(
$c->get(\OCP\Share\IManager::class)
);
});
$this->registerAlias(IShareHelper::class, ShareHelper::class);
$this->registerAlias(IContactsStore::class, ContactsStore::class);
$this->registerAlias(IAccountManager::class, AccountManager::class);
$this->registerAlias(IStorageFactory::class, StorageFactory::class);
$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
$this->registerAlias(ISubAdmin::class, SubAdmin::class);
$this->registerAlias(IInitialStateService::class, InitialStateService::class);
$this->registerAlias(IEmojiHelper::class, EmojiHelper::class);
$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
$this->registerAlias(IBroker::class, Broker::class);
$this->registerAlias(IAppDataFactory::class, \OC\Files\AppData\Factory::class);
$this->registerAlias(IFilenameValidator::class, FilenameValidator::class);
$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
$this->registerAlias(IPublicShareTemplateFactory::class, PublicShareTemplateFactory::class);
$this->registerAlias(ITranslationManager::class, TranslationManager::class);
$this->registerAlias(IConversionManager::class, ConversionManager::class);
$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
$this->registerAlias(ILimiter::class, Limiter::class);
$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
// there is no reason for having OCMProvider as a Service (marked as deprecated since 32.0.0)
@ -1277,24 +1124,18 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
$this->registerAlias(IProfileManager::class, ProfileManager::class);
$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
$this->registerAlias(IRichTextFormatter::class, RichTextFormatter::class);
$this->registerAlias(ISignatureManager::class, SignatureManager::class);
$this->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
$this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
$this->registerAlias(IJobRuns::class, JobRuns::class);
$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
if (PHP_SAPI !== 'cli') {
$sequence = $c->get(APCuSequence::class);
@ -1305,8 +1146,6 @@ class Server extends ServerContainer implements IServerContainer {
return $c->get(FileSequence::class);
}, false);
$this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
$this->registerAlias(IJobRuns::class, JobRuns::class);
$this->connectDispatcher();
}

3
lib/private/legacy/OC_Util.php
View file

@ -26,6 +26,7 @@ use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Security\ISecureRandom;
use OCP\Server;
use OCP\Share\IManager;
@ -260,7 +261,7 @@ class OC_Util {
* @return array arrays with error messages and hints
*/
public static function checkServer(SystemConfig $config) {
$l = \OC::$server->getL10N('lib');
$l = \OCP\Server::get(IFactory::class)->get('lib');
$errors = [];
$CONFIG_DATADIRECTORY = $config->getValue('datadirectory', OC::$SERVERROOT . '/data');

7
tests/lib/App/AppStore/Bundles/BundleFetcherTest.php
View file

@ -17,6 +17,7 @@ use OC\App\AppStore\Bundles\HubBundle;
use OC\App\AppStore\Bundles\PublicSectorBundle;
use OC\App\AppStore\Bundles\SocialSharingBundle;
use OCP\IL10N;
use OCP\L10N\IFactory;
use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
@ -29,10 +30,10 @@ class BundleFetcherTest extends TestCase {
parent::setUp();
$this->l10n = $this->createMock(IL10N::class);
$factory = $this->createMock(IFactory::class);
$factory->method('get')->willReturn($this->l10n);
$this->bundleFetcher = new BundleFetcher(
$this->l10n
);
$this->bundleFetcher = new BundleFetcher($factory);
}
public function testGetBundles(): void {

6
tests/lib/Diagnostics/QueryLoggerTest.php
View file

@ -9,6 +9,8 @@
namespace Test\Diagnostics;
use OC\Diagnostics\QueryLogger;
use OC\SystemConfig;
use OCP\Server;
use Test\TestCase;
class QueryLoggerTest extends TestCase {
@ -18,7 +20,9 @@ class QueryLoggerTest extends TestCase {
protected function setUp(): void {
parent::setUp();
$this->logger = new QueryLogger();
$this->logger = new QueryLogger(
Server::get(SystemConfig::class)
);
}
public function testQueryLogger(): void {