upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-20 22:00:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

chore: Fix DI for integrity checker before installation

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2024-01-30 16:31:05 +01:00
parent 0e1931754a
commit ceff16bbf9
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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);

3
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)) {