Browse Source

chore: Fix DI for integrity checker before installation

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
tags/v29.0.0beta1
Côme Chilliet 4 months ago
parent
commit
ceff16bbf9
No account linked to committer's email address
2 changed files with 6 additions and 13 deletions
  1. 4
    12
      core/register_command.php
  2. 2
    1
      lib/private/Server.php

+ 4
- 12
core/register_command.php View File

@@ -53,7 +53,6 @@ declare(strict_types=1);

use OC\Core\Command;
use OCP\IConfig;
use OCP\IURLGenerator;
use OCP\Server;
use Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand;

@@ -61,17 +60,10 @@ $application->add(new CompletionCommand());
$application->add(Server::get(Command\Status::class));
$application->add(Server::get(Command\Check::class));
$application->add(Server::get(Command\L10n\CreateJs::class));
$application->add(new \OC\Core\Command\Integrity\SignApp(
Server::get('IntegrityCodeChecker'),
new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
Server::get(IURLGenerator::class)
));
$application->add(new \OC\Core\Command\Integrity\SignCore(
Server::get('IntegrityCodeChecker'),
new \OC\IntegrityCheck\Helpers\FileAccessHelper()
));
$application->add(new \OC\Core\Command\Integrity\CheckApp(Server::get('IntegrityCodeChecker')));
$application->add(new \OC\Core\Command\Integrity\CheckCore(Server::get('IntegrityCodeChecker')));
$application->add(Server::get(Command\Integrity\SignApp::class));
$application->add(Server::get(Command\Integrity\SignCore::class));
$application->add(Server::get(Command\Integrity\CheckApp::class));
$application->add(Server::get(Command\Integrity\CheckCore::class));

$config = Server::get(IConfig::class);


+ 2
- 1
lib/private/Server.php View File

@@ -976,7 +976,8 @@ class Server extends ServerContainer implements IServerContainer {
return $backend;
});

$this->registerService('IntegrityCodeChecker', function (ContainerInterface $c) {
$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.
if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {

Loading…
Cancel
Save