refactor: Extend rector to ocs/ and ocs-provider/refactor/rector-top-level

Signed-off-by: provokateurin <kate@provokateurin.de>

3 files changed, 22 insertions, 10 deletions

diff --git a/build/rector.php b/build/rector.php
index 97c0e5d399b..95fcc8d961e 100644
--- a/build/rector.php
+++ b/build/rector.php
@@ -53,6 +53,8 @@ $config = RectorConfig::configure()
 	->withPaths([
 		$nextcloudDir . '/apps',
 		$nextcloudDir . '/core',
+		$nextcloudDir . '/ocs',
+		$nextcloudDir . '/ocs-provider',
 		$nextcloudDir . '/console.php',
 		$nextcloudDir . '/cron.php',
 		$nextcloudDir . '/index.php',
@@ -63,8 +65,6 @@ $config = RectorConfig::configure()
 		$nextcloudDir . '/version.php',
 		// $nextcloudDir . '/config',
 		// $nextcloudDir . '/lib',
-		// $nextcloudDir . '/ocs',
-		// $nextcloudDir . '/ocs-provider',
 		// $nextcloudDir . '/tests',
 		// $nextcloudDir . '/themes',
 	])
diff --git a/ocs/providers.php b/ocs/providers.php
index 6333a91fdb2..b1e5224ab2a 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -1,4 +1,8 @@
 <?php
+
+use OCP\IRequest;
+use OCP\Server;
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -9,7 +13,7 @@ require_once __DIR__ . '/../lib/base.php';
 
 header('Content-type: application/xml');
 
-$request = \OC::$server->getRequest();
+$request = Server::get(IRequest::class);
 
 $url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17) . 'ocs/v1.php/';
 
diff --git a/ocs/v1.php b/ocs/v1.php
index 7205f4a26b7..3fc800e198a 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -2,6 +2,14 @@
 
 declare(strict_types=1);
 
+use OC\Route\Router;
+use OC\SystemConfig;
+use OC\User\LoginException;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IUserSession;
+use OCP\Server;
+
 /**
  * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -21,7 +29,7 @@ use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 
 if (Util::needUpgrade()
-	|| \OC::$server->getConfig()->getSystemValueBool('maintenance')) {
+	|| Server::get(IConfig::class)->getSystemValueBool('maintenance')) {
 	// since the behavior of apps or remotes are unpredictable during
 	// an upgrade, return a 503 directly
 	ApiHelper::respond(503, 'Service unavailable', ['X-Nextcloud-Maintenance-Mode' => '1'], 503);
@@ -42,11 +50,11 @@ try {
 	// side effects in existing apps
 	OC_App::loadApps();
 
-	if (!\OC::$server->getUserSession()->isLoggedIn()) {
-		OC::handleLogin(\OC::$server->getRequest());
+	if (!Server::get(IUserSession::class)->isLoggedIn()) {
+		OC::handleLogin(Server::get(IRequest::class));
 	}
 
-	OC::$server->get(\OC\Route\Router::class)->match('/ocsapp' . \OC::$server->getRequest()->getRawPathInfo());
+	Server::get(Router::class)->match('/ocsapp' . Server::get(IRequest::class)->getRawPathInfo());
 } catch (MaxDelayReached $ex) {
 	ApiHelper::respond(Http::STATUS_TOO_MANY_REQUESTS, $ex->getMessage());
 } catch (ResourceNotFoundException $e) {
@@ -56,14 +64,14 @@ try {
 } catch (MethodNotAllowedException $e) {
 	ApiHelper::setContentType();
 	http_response_code(405);
-} catch (\OC\User\LoginException $e) {
+} catch (LoginException $e) {
 	ApiHelper::respond(OCSController::RESPOND_UNAUTHORISED, 'Unauthorised');
 } catch (\Exception $e) {
-	\OCP\Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+	Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
 
 	$txt = 'Internal Server Error' . "\n";
 	try {
-		if (\OC::$server->getSystemConfig()->getValue('debug', false)) {
+		if (Server::get(SystemConfig::class)->getValue('debug', false)) {
 			$txt .= $e->getMessage();
 		}
 	} catch (\Throwable $e) {