refactor(rector): Run rector on new code

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

apps/dav/appinfo/v1/carddav.php

@@ -89,7 +89,7 @@
 /** @var string $baseuri defined in remote.php */
 $server->setBaseUri($baseuri);
 // Add plugins
-$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OCP\Server::get(IL10nFactory::class)->get('dav')));
+$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), Server::get(IL10nFactory::class)->get('dav')));
 $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 $server->addPlugin(new Plugin());
 

apps/dav/lib/Connector/Sabre/Directory.php

@@ -532,7 +532,7 @@ public function getNodeForPath($path): INode {
 		}
 
 		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
+			$node = new Directory($this->fileView, $info, $this->tree, $this->shareManager);
 		} else {
 			// In case reading a directory was allowed but it turns out the node was a not a directory, reject it now.
 			if (!$this->info->isReadable()) {

apps/dav/tests/unit/CalDAV/Schedule/IMipServiceTest.php

@@ -17,6 +17,7 @@
 use OCP\IAppConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Security\ISecureRandom;
@@ -163,7 +164,7 @@ public function testGetFrom(): void {
 
 	public function testIsSystemUserWhenUserExists(): void {
 		$email = 'user@example.com';
-		$user = $this->createMock(\OCP\IUser::class);
+		$user = $this->createMock(IUser::class);
 
 		$this->userManager->expects(self::once())
 			->method('getByEmail')

apps/dav/tests/unit/Connector/Sabre/NodeTest.php

@@ -55,7 +55,7 @@ public static function davPermissionsProvider(): array {
 	public function testDavPermissions(int $permissions, string $type, bool $shared, int $shareRootPermissions, bool $mounted, string $internalPath, string $expected): void {
 		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
-			->onlyMethods(['getPermissions', 'isShared', 'isMounted', 'getType', 'getInternalPath', 'getStorage', 'getMountPoint'])
+			->onlyMethods(['getPermissions', 'isShared', 'isMounted', 'getType', 'getInternalPath', 'getStorage', 'getMountPoint', 'getPath'])
 			->getMock();
 		$info->method('getPermissions')
 			->willReturn($permissions);
@@ -65,6 +65,8 @@ public function testDavPermissions(int $permissions, string $type, bool $shared,
 			->willReturn($mounted);
 		$info->method('getType')
 			->willReturn($type);
+		$info->method('getPath')
+			->willReturn('');
 		$info->method('getInternalPath')
 			->willReturn($internalPath);
 		$info->method('getMountPoint')
@@ -160,18 +162,18 @@ public function testSharePermissions(string $type, ?string $user, int $permissio
 
 		$info = $this->getMockBuilder(FileInfo::class)
 			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions'])
+			->onlyMethods(['getStorage', 'getType', 'getMountPoint', 'getPermissions', 'getPath'])
 			->getMock();
 
 		$info->method('getStorage')->willReturn($storage);
+		$info->method('getPath')->willReturn('notMyPath');
 		$info->method('getType')->willReturn($type);
 		$info->method('getMountPoint')->willReturn($mountpoint);
 		$info->method('getPermissions')->willReturn($permissions);
 
 		$view = $this->createMock(View::class);
 
-		$node = new File($view, $info);
-		$this->invokePrivate($node, 'shareManager', [$shareManager]);
+		$node = new File($view, $info, $shareManager);
 		$this->assertEquals($expected, $node->getSharePermissions($user));
 	}
 
@@ -196,9 +198,10 @@ public function testShareAttributes(): void {
 		/** @var Folder&MockObject $info */
 		$info = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType'])
+			->onlyMethods(['getStorage', 'getType', 'getPath'])
 			->getMock();
 
+		$info->method('getPath')->willReturn('myPath');
 		$info->method('getStorage')->willReturn($storage);
 		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
 
@@ -217,9 +220,10 @@ public function testShareAttributesNonShare(): void {
 		/** @var Folder&MockObject */
 		$info = $this->getMockBuilder(Folder::class)
 			->disableOriginalConstructor()
-			->onlyMethods(['getStorage', 'getType'])
+			->onlyMethods(['getStorage', 'getType', 'getPath'])
 			->getMock();
 
+		$info->method('getPath')->willReturn('myPath');
 		$info->method('getStorage')->willReturn($storage);
 		$info->method('getType')->willReturn(FileInfo::TYPE_FOLDER);
 

apps/federatedfilesharing/lib/AppInfo/Application.php

@@ -17,6 +17,7 @@
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Federation\ICloudFederationProviderManager;
+use OCP\Server;
 
 class Application extends App implements IBootstrap {
 
@@ -41,7 +42,7 @@ private function registerCloudFederationProvider(ICloudFederationProviderManager
 			$manager->addCloudFederationProvider($type,
 				'Federated Files Sharing',
 				function (): CloudFederationProviderFiles {
-					return \OCP\Server::get(CloudFederationProviderFiles::class);
+					return Server::get(CloudFederationProviderFiles::class);
 				});
 		}
 	}

apps/federatedfilesharing/lib/Settings/Admin.php

@@ -14,6 +14,7 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IDelegatedSettings;
+use OCP\Util;
 
 class Admin implements IDelegatedSettings {
 	/**
@@ -44,8 +45,8 @@ public function getForm() {
 		$this->initialState->provideInitialState('lookupServerUploadEnabled', $this->fedShareProvider->isLookupServerUploadEnabled());
 		$this->initialState->provideInitialState('federatedTrustedShareAutoAccept', $this->fedShareProvider->isFederatedTrustedShareAutoAccept());
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings-admin');
-		\OCP\Util::addScript(Application::APP_ID, 'settings-admin');
+		Util::addStyle(Application::APP_ID, 'settings-admin');
+		Util::addScript(Application::APP_ID, 'settings-admin');
 		return new TemplateResponse(Application::APP_ID, 'settings-admin', renderAs: '');
 	}
 

apps/federatedfilesharing/lib/Settings/Personal.php

@@ -16,6 +16,7 @@
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
+use OCP\Util;
 
 class Personal implements ISettings {
 	public function __construct(
@@ -42,8 +43,8 @@ public function getForm(): TemplateResponse {
 		$this->initialState->provideInitialState('cloudId', $cloudID);
 		$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));
 
-		\OCP\Util::addStyle(Application::APP_ID, 'settings-personal');
-		\OCP\Util::addScript(Application::APP_ID, 'settings-personal');
+		Util::addStyle(Application::APP_ID, 'settings-personal');
+		Util::addScript(Application::APP_ID, 'settings-personal');
 		return new TemplateResponse(Application::APP_ID, 'settings-personal', renderAs: TemplateResponse::RENDER_AS_BLANK);
 	}
 

apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php

@@ -39,10 +39,7 @@ public function __construct(
 			]);
 	}
 
-	/**
-	 * @return void
-	 */
-	public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user = null) {
+	public function manipulateStorageConfig(StorageConfig &$storage, ?IUser $user = null): void {
 		try {
 			$credentials = $this->credentialsStore->getLoginCredentials();
 		} catch (CredentialsUnavailableException $e) {

apps/files_external/lib/Lib/SessionStorageWrapper.php

@@ -9,13 +9,15 @@
 
 use OC\Files\Storage\Wrapper\PermissionsMask;
 use OCP\Constants;
+use OCP\Files\Storage;
+use OCP\Files\Storage\IStorage;
 
 /**
  * Wrap Storage in PermissionsMask for session ephemeral use
  */
 class SessionStorageWrapper extends PermissionsMask {
 	/**
-	 * @param array $parameters ['storage' => $storage]
+	 * @param array{storage: IStorage} $parameters
 	 */
 	public function __construct(array $parameters) {
 		// disable sharing permission

apps/files_external/tests/Settings/AdminTest.php

@@ -85,7 +85,7 @@ public function testGetForm(): void {
 		$this->initialState
 			->expects($this->atLeastOnce())
 			->method('provideInitialState')
-			->willReturnCallback(function () use (&$initialState) {
+			->willReturnCallback(function () use (&$initialState): void {
 				$args = func_get_args();
 				$initialState[$args[0]] = $args[1];
 			});