Refactor OC\Server::getIntegrityCodeChecker

Signed-off-by: Andrew Summers <[email protected]>

Author: summersab

core/Command/Upgrade.php

@@ -93,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$self = $this;
 			$updater = new Updater(
 				$this->config,
-				\OC::$server->getIntegrityCodeChecker(),
+				\OC::$server->get('IntegrityCodeChecker'),
 				$this->logger,
 				$this->installer
 			);

core/Controller/SetupController.php

@@ -102,7 +102,7 @@ private function finishSetup() {
 		if (file_exists($this->autoConfigFile)) {
 			unlink($this->autoConfigFile);
 		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+		\OC::$server->get('IntegrityCodeChecker')->runInstanceVerification();
 
 		if ($this->setupHelper->shouldRemoveCanInstallFile()) {
 			\OC_Template::printGuestPage('', 'installation_incomplete');

core/ajax/update.php

@@ -115,7 +115,7 @@ public function handleRepairFeedback(Event $event): void {
 	$config = \OC::$server->getConfig();
 	$updater = new \OC\Updater(
 		$config,
-		\OC::$server->getIntegrityCodeChecker(),
+		\OC::$server->get('IntegrityCodeChecker'),
 		$logger,
 		\OC::$server->query(\OC\Installer::class)
 	);

core/register_command.php

@@ -55,19 +55,19 @@
 $application->add(new OC\Core\Command\Check(\OC::$server->getSystemConfig()));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 $application->add(new \OC\Core\Command\Integrity\SignApp(
-	\OC::$server->getIntegrityCodeChecker(),
+	\OC::$server->get('IntegrityCodeChecker'),
 	new \OC\IntegrityCheck\Helpers\FileAccessHelper(),
 	\OC::$server->getURLGenerator()
 ));
 $application->add(new \OC\Core\Command\Integrity\SignCore(
-	\OC::$server->getIntegrityCodeChecker(),
+	\OC::$server->get('IntegrityCodeChecker'),
 	new \OC\IntegrityCheck\Helpers\FileAccessHelper()
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckApp(
-	\OC::$server->getIntegrityCodeChecker()
+	\OC::$server->get('IntegrityCodeChecker')
 ));
 $application->add(new \OC\Core\Command\Integrity\CheckCore(
-	\OC::$server->getIntegrityCodeChecker()
+	\OC::$server->get('IntegrityCodeChecker')
 ));
 
 

lib/private/Updater.php

@@ -303,7 +303,7 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
 		$this->config->setAppValue('core', 'lastupdatedat', '0');
 
 		// Check for code integrity if not disabled
-		if (\OC::$server->getIntegrityCodeChecker()->isCodeCheckEnforced()) {
+		if (\OC::$server->get('IntegrityCodeChecker')->isCodeCheckEnforced()) {
 			$this->emit('\OC\Updater', 'startCheckCodeIntegrity');
 			$this->checker->runInstanceVerification();
 			$this->emit('\OC\Updater', 'finishedCheckCodeIntegrity');