upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

chore: Cleanup Server.php a bit and remove OC_App usage

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2025-03-24 17:41:39 +01:00
parent 4b099bd532
commit 0a027c3906
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/private/Server.php
View file

@ -604,13 +604,14 @@ class Server extends ServerContainer implements IServerContainer {
$config = $c->get(SystemConfig::class);
/** @var ServerVersion $serverVersion */
$serverVersion = $c->get(ServerVersion::class);
$appManager = $c->get(IAppManager::class);
if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
$logQuery = $config->getValue('log_query');
$prefixClosure = function () use ($logQuery, $serverVersion) {
$prefixClosure = function () use ($logQuery, $serverVersion, $appManager): ?string {
if (!$logQuery) {
try {
$v = \OC_App::getAppVersions();
$v = $appManager->getAppInstalledVersions();
} catch (\Doctrine\DBAL\Exception $e) {
// Database service probably unavailable
// Probably related to https://github.com/nextcloud/server/issues/37424
@ -867,15 +868,15 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
$this->registerService(Checker::class, function (ContainerInterface $c) {
// IConfig and IAppManager requires a working database. This code
// might however be called when ownCloud is not yet setup.
// IConfig requires a working database. This code
// might however be called when Nextcloud is not yet setup.
if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
$config = $c->get(\OCP\IConfig::class);
$appConfig = $c->get(\OCP\IAppConfig::class);
} else {
$config = $appConfig = $appManager = null;
$config = null;
$appConfig = null;
}
$appManager = $c->get(IAppManager::class);
return new Checker(
$c->get(ServerVersion::class),
@ -885,7 +886,7 @@ class Server extends ServerContainer implements IServerContainer {
$config,
$appConfig,
$c->get(ICacheFactory::class),
$appManager,
$c->get(IAppManager::class),
$c->get(IMimeTypeDetector::class)
);
});