Refactor OC\Server::query

console.php

@@ -94,7 +94,7 @@ function exceptionHandler($exception) {
 		\OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class),
 		\OC::$server->getRequest(),
 		\OC::$server->get(\Psr\Log\LoggerInterface::class),
-		\OC::$server->query(\OC\MemoryInfo::class)
+		\OC::$server->get(\OC\MemoryInfo::class)
 	);
 	$application->loadCommands(new ArgvInput(), new ConsoleOutput());
 	$application->run();

core/Command/App/Enable.php

@@ -101,7 +101,7 @@ private function enableApp(string $appId, array $groupIds, bool $forceEnable, Ou
 
 		try {
 			/** @var Installer $installer */
-			$installer = \OC::$server->query(Installer::class);
+			$installer = \OC::$server->get(Installer::class);
 
 			if (false === $installer->isDownloaded($appId)) {
 				$installer->downloadApp($appId);

core/Command/App/Install.php

@@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		try {
 			/** @var Installer $installer */
-			$installer = \OC::$server->query(Installer::class);
+			$installer = \OC::$server->get(Installer::class);
 			$installer->downloadApp($appId, $input->getOption('allow-unstable'));
 			$result = $installer->installApp($appId, $forceEnable);
 		} catch (\Exception $e) {

core/Command/Maintenance/Install.php

@@ -78,10 +78,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			$this->config,
 			$this->iniGetWrapper,
 			$server->getL10N('lib'),
-			$server->query(Defaults::class),
+			$server->get(Defaults::class),
 			$server->get(LoggerInterface::class),
 			$server->getSecureRandom(),
-			\OC::$server->query(Installer::class)
+			\OC::$server->get(Installer::class)
 		);
 		$sysInfo = $setupHelper->getSystemInfo(true);
 		$errors = $sysInfo['errors'];

core/ajax/update.php

@@ -117,7 +117,7 @@ public function handleRepairFeedback(Event $event): void {
 		$config,
 		\OC::$server->getIntegrityCodeChecker(),
 		$logger,
-		\OC::$server->query(\OC\Installer::class)
+		\OC::$server->get(\OC\Installer::class)
 	);
 	$incompatibleApps = [];
 

core/register_command.php

@@ -77,22 +77,22 @@
 	$application->add(new OC\Core\Command\App\Install());
 	$application->add(new OC\Core\Command\App\GetPath());
 	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->query(\OC\Installer::class), \OC::$server->get(LoggerInterface::class)));
-	$application->add(\OC::$server->query(\OC\Core\Command\App\Update::class));
+	$application->add(new OC\Core\Command\App\Remove(\OC::$server->getAppManager(), \OC::$server->get(\OC\Installer::class), \OC::$server->get(LoggerInterface::class)));
+	$application->add(\OC::$server->get(\OC\Core\Command\App\Update::class));
 
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enforce::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Enable::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\Disable::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\TwoFactorAuth\State::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\TwoFactorAuth\Cleanup::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\TwoFactorAuth\Enforce::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\TwoFactorAuth\Enable::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\TwoFactorAuth\Disable::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\TwoFactorAuth\State::class));
 
 	$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Background\Job(\OC::$server->getJobList(), \OC::$server->getLogger()));
 	$application->add(new OC\Core\Command\Background\ListCommand(\OC::$server->getJobList()));
 
-	$application->add(\OC::$server->query(\OC\Core\Command\Broadcast\Test::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\Broadcast\Test::class));
 
 	$application->add(new OC\Core\Command\Config\App\DeleteConfig(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Config\App\GetConfig(\OC::$server->getConfig()));
@@ -169,18 +169,18 @@
 	$application->add(new OC\Core\Command\Maintenance\UpdateHtaccess());
 	$application->add(new OC\Core\Command\Maintenance\UpdateTheme(\OC::$server->getMimeTypeDetector(), \OC::$server->getMemCacheFactory()));
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->query(\OC\Installer::class)));
+	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->get(\OC\Installer::class)));
 	$application->add(new OC\Core\Command\Maintenance\Repair(
 		new \OC\Repair([], \OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class), \OC::$server->get(LoggerInterface::class)),
 		\OC::$server->getConfig(),
 		\OC::$server->get(\OCP\EventDispatcher\IEventDispatcher::class),
 		\OC::$server->getAppManager()
 	));
-	$application->add(\OC::$server->query(OC\Core\Command\Maintenance\RepairShareOwnership::class));
+	$application->add(\OC::$server->get(OC\Core\Command\Maintenance\RepairShareOwnership::class));
 
 	$application->add(\OC::$server->get(\OC\Core\Command\Preview\Generate::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\Preview\Repair::class));
-	$application->add(\OC::$server->query(\OC\Core\Command\Preview\ResetRenderedTexts::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\Preview\Repair::class));
+	$application->add(\OC::$server->get(\OC\Core\Command\Preview\ResetRenderedTexts::class));
 
 	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));

core/routes.php

@@ -37,7 +37,7 @@
 use OC\Core\Application;
 
 /** @var Application $application */
-$application = \OC::$server->query(Application::class);
+$application = \OC::$server->get(Application::class);
 $application->registerRoutes($this, [
 	'routes' => [
 		['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],

lib/private/AppFramework/Bootstrap/Coordinator.php

@@ -130,7 +130,7 @@ private function registerApps(array $appIds): void {
 					$this->eventLogger->start("bootstrap:register_app:$appId:application", "Load `Application` instance for $appId");
 					try {
 						/** @var IBootstrap|App $application */
-						$apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
+						$apps[$appId] = $application = $this->serverContainer->get($applicationClassName);
 					} catch (QueryException $e) {
 						// Weird, but ok
 						$this->eventLogger->end("bootstrap:register_app:$appId");
@@ -193,7 +193,7 @@ public function bootApp(string $appId): void {
 		$this->eventLogger->start('bootstrap:boot_app:' . $appId, "Call `Application::boot` for $appId");
 		try {
 			/** @var App $application */
-			$application = $this->serverContainer->query($applicationClassName);
+			$application = $this->serverContainer->get($applicationClassName);
 			if ($application instanceof IBootstrap) {
 				/** @var BootContext $context */
 				$context = new BootContext($application->getContainer());

lib/private/AppFramework/DependencyInjection/DIContainer.php

@@ -145,7 +145,7 @@
 			);
 		});
 		$this->registerService(ILogger::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
+			return new OC\AppFramework\Logger($this->server->get(ILogger::class), $c->get('AppName'));
 		});
 
 		$this->registerService(IServerContainer::class, function () {
@@ -253,7 +253,7 @@
 				$c->get('AppName'),
 				$server->getUserSession()->isLoggedIn(),
 				$this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()),
-				$server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
+				$server->getUserSession()->getUser() !== null && $server->get(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
 				$server->getAppManager(),
 				$server->getL10N('lib'),
 				$c->get(AuthorizedGroupMapper::class),
@@ -262,13 +262,13 @@
 			$dispatcher->registerMiddleware($securityMiddleware);
 			$dispatcher->registerMiddleware(
 				new OC\AppFramework\Middleware\Security\CSPMiddleware(
-					$server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
-					$server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
-					$server->query(OC\Security\CSRF\CsrfTokenManager::class)
+					$server->get(OC\Security\CSP\ContentSecurityPolicyManager::class),
+					$server->get(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
+					$server->get(OC\Security\CSRF\CsrfTokenManager::class)
 				)
 			);
 			$dispatcher->registerMiddleware(
-				$server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
+				$server->get(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
 			);
 			$dispatcher->registerMiddleware(
 				new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
@@ -459,15 +459,15 @@
 
 		$isServerClass = str_starts_with($name, 'OCP\\') || str_starts_with($name, 'OC\\');
 		if ($isServerClass && !$this->has($name)) {
-			return $this->getServer()->query($name, $autoload);
+			return $this->getServer()->get($name, $autoload);
 		}
 
 		try {
 			return $this->queryNoFallback($name);
 		} catch (QueryException $firstException) {
 			try {
-				return $this->getServer()->query($name, $autoload);
+				return $this->getServer()->get($name, $autoload);
 			} catch (QueryException $secondException) {
 				if ($firstException->getCode() === 1) {
 					throw $secondException;
 				}

lib/private/Calendar/Resource/Manager.php

@@ -97,7 +97,7 @@ public function getBackends():array {
 				continue;
 			}
 
-			$this->initializedBackends[$backend] = $this->server->query($backend);
+			$this->initializedBackends[$backend] = $this->server->get($backend);
 		}
 
 		return array_values($this->initializedBackends);

lib/private/Calendar/Room/Manager.php

@@ -104,7 +104,7 @@ public function getBackends():array {
 			 * The backend might have services injected that can't be build from the
 			 * server container.
 			 */
-			$this->initializedBackends[$backend] = $this->server->query($backend);
+			$this->initializedBackends[$backend] = $this->server->get($backend);
 		}
 
 		return array_values($this->initializedBackends);

lib/private/Collaboration/Resources/ProviderManager.php

@@ -54,7 +54,7 @@ public function getResourceProviders(): array {
 		if ($this->providers !== []) {
 			foreach ($this->providers as $provider) {
 				try {
-					$this->providerInstances[] = $this->serverContainer->query($provider);
+					$this->providerInstances[] = $this->serverContainer->get($provider);
 				} catch (QueryException $e) {
 					$this->logger->error("Could not query resource provider $provider: " . $e->getMessage(), [
 						'exception' => $e,

lib/private/EventDispatcher/ServiceEventListener.php

@@ -67,7 +67,7 @@ public function __invoke(Event $event) {
 				// TODO: fetch from the app containers, otherwise any custom services,
 				//       parameters and aliases won't be resolved.
 				//       See https://github.com/nextcloud/server/issues/27793 for details.
-				$this->service = $this->container->query($this->class);
+				$this->service = $this->container->get($this->class);
 			} catch (QueryException $e) {
 				$this->logger->error(
 					sprintf(

lib/private/InitialStateService.php

@@ -118,7 +118,7 @@ private function loadLazyStates(): void {
 		$initialStates = $context->getInitialStates();
 		foreach ($initialStates as $initialState) {
 			try {
-				$provider = $this->container->query($initialState->getService());
+				$provider = $this->container->get($initialState->getService());
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.
 				$this->logger->error('Could not load initial state provider dynamically: ' . $e->getMessage(), [

lib/private/Search/SearchComposer.php

@@ -93,7 +93,7 @@ private function loadLazyProviders(): void {
 		foreach ($registrations as $registration) {
 			try {
 				/** @var IProvider $provider */
-				$provider = $this->container->query($registration->getService());
+				$provider = $this->container->get($registration->getService());
 				$this->providers[$provider->getId()] = $provider;
 			} catch (QueryException $e) {
 				// Log an continue. We can be fault tolerant here.

lib/private/Share20/ProviderFactory.php

@@ -101,7 +101,7 @@ protected function defaultShareProvider() {
 				$this->serverContainer->getGroupManager(),
 				$this->serverContainer->getLazyRootFolder(),
 				$this->serverContainer->getMailer(),
-				$this->serverContainer->query(Defaults::class),
+				$this->serverContainer->get(Defaults::class),
 				$this->serverContainer->getL10NFactory(),
 				$this->serverContainer->getURLGenerator(),
 				$this->serverContainer->getConfig()
@@ -138,11 +138,11 @@ protected function federatedShareProvider() {
 			$notifications = new Notifications(
 				$addressHandler,
 				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+				$this->serverContainer->get(\OCP\OCS\IDiscoveryService::class),
 				$this->serverContainer->getJobList(),
 				\OC::$server->getCloudFederationProviderManager(),
 				\OC::$server->getCloudFederationFactory(),
-				$this->serverContainer->query(IEventDispatcher::class),
+				$this->serverContainer->get(IEventDispatcher::class),
 				$this->serverContainer->get(LoggerInterface::class),
 			);
 			$tokenHandler = new TokenHandler(
@@ -197,7 +197,7 @@ protected function getShareByMailProvider() {
 				$this->serverContainer->getURLGenerator(),
 				$this->serverContainer->getActivityManager(),
 				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
+				$this->serverContainer->get(Defaults::class),
 				$this->serverContainer->getHasher(),
 				$this->serverContainer->get(IEventDispatcher::class),
 				$this->serverContainer->get(IManager::class)

lib/private/Streamer.php

@@ -124,7 +124,7 @@ public function addDirRecursive(string $dir, string $internalDir = ''): void {
 		$files = $dirNode->getDirectoryListing();
 
 		/** @var LoggerInterface $logger */
-		$logger = \OC::$server->query(LoggerInterface::class);
+		$logger = \OC::$server->get(LoggerInterface::class);
 		foreach ($files as $file) {
 			if ($file instanceof File) {
 				try {

lib/private/Support/CrashReport/Registry.php

@@ -119,7 +119,7 @@ private function loadLazyProviders(): void {
 		while (($class = array_shift($this->lazyReporters)) !== null) {
 			try {
 				/** @var IReporter $reporter */
-				$reporter = $this->serverContainer->query($class);
+				$reporter = $this->serverContainer->get($class);
 			} catch (QueryException $e) {
 				/*
 				 * There is a circular dependency between the logger and the registry, so

lib/private/Support/Subscription/Registry.php

@@ -76,7 +76,7 @@ public function __construct(IConfig $config,
 	private function getSubscription(): ?ISubscription {
 		if ($this->subscription === null && $this->subscriptionService !== null) {
 			try {
-				$this->subscription = $this->container->query($this->subscriptionService);
+				$this->subscription = $this->container->get($this->subscriptionService);
 			} catch (QueryException $e) {
 				// Ignore this
 			}

lib/public/AppFramework/App.php

@@ -167,8 +167,8 @@ public function registerRoutes(IRouter $router, array $routes) {
 	 *			parent::__construct('tasks', $params);
 	 *
 	 *			$this->getContainer()->registerService('PageController', function(IAppContainer $c){
-	 *				$a = $c->query('API');
-	 *				$r = $c->query('Request');
+	 *				$a = $c->get('API');
+	 *				$r = $c->get('Request');
 	 *				return new PageController($a, $r);
 	 *			});
 	 *		}

tests/lib/BackgroundJob/QueuedJobTest.php

@@ -51,7 +51,7 @@ public function testJobShouldBeRemoved() {
 	}
 
 	public function testJobShouldBeRemovedNew() {
-		$job = new TestQueuedJobNew(\OC::$server->query(ITimeFactory::class));
+		$job = new TestQueuedJobNew(\OC::$server->get(ITimeFactory::class));
 		$job->setId(42);
 		$this->jobList->add($job);
 

tests/lib/BackgroundJob/TimedJobTest.php

@@ -48,7 +48,7 @@ protected function setUp(): void {
 		parent::setUp();
 
 		$this->jobList = new DummyJobList();
-		$this->time = \OC::$server->query(ITimeFactory::class);
+		$this->time = \OC::$server->get(ITimeFactory::class);
 	}
 
 	public function testShouldRunAfterInterval() {

tests/lib/Files/EtagTest.php

@@ -70,7 +70,7 @@ public function testNewUser() {
 		$files = ['/foo.txt', '/folder/bar.txt', '/folder/subfolder', '/folder/subfolder/qwerty.txt'];
 		$originalEtags = $this->getEtags($files);
 
-		$scanner = new \OC\Files\Utils\Scanner($user1, \OC::$server->getDatabaseConnection(), \OC::$server->query(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+		$scanner = new \OC\Files\Utils\Scanner($user1, \OC::$server->getDatabaseConnection(), \OC::$server->get(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
 		$scanner->backgroundScan('/');
 
 		$newEtags = $this->getEtags($files);

tests/lib/Files/Node/HookConnectorTest.php

@@ -77,7 +77,7 @@ protected function setUp(): void {
 			$this->createMock(IUserManager::class),
 			$this->createMock(IEventDispatcher::class)
 		);
-		$this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
+		$this->eventDispatcher = \OC::$server->get(IEventDispatcher::class);
 	}
 
 	protected function tearDown(): void {

tests/lib/Files/Utils/ScannerTest.php

@@ -132,7 +132,7 @@ public function testScanSubMount() {
 		$storage->file_put_contents('foo.txt', 'qwerty');
 		$storage->file_put_contents('folder/bar.txt', 'qwerty');
 
-		$scanner = new \OC\Files\Utils\Scanner($uid, \OC::$server->getDatabaseConnection(), \OC::$server->query(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
+		$scanner = new \OC\Files\Utils\Scanner($uid, \OC::$server->getDatabaseConnection(), \OC::$server->get(IEventDispatcher::class), \OC::$server->get(LoggerInterface::class));
 
 		$this->assertFalse($cache->inCache('folder/bar.txt'));
 		$scanner->scan('/' . $uid . '/files/foo');