Make psalm happy again

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Nov 10, 2023 · c6111f2 · c6111f2
1 parent d0a6680
commit c6111f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/lib/Controller/FederationController.php b/lib/Controller/FederationController.php
@@ -147,7 +147,7 @@ public function initiatorUser($token): DataResponse {
 			return new DataResponse([
 				'userId' => $user->getUID(),
 				'displayName' => $user->getDisplayName(),
-				'avatar' => $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => WopiControllerTest::WOPI_AVATAR_SIZE])
+				'avatar' => $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => WopiController::WOPI_AVATAR_SIZE])
 			]);
 		} catch (UnknownTokenException $e) {
 			$this->logger->debug('COOL-Federation-Initiator-User: Token ' . $token . 'not found');

diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
@@ -22,7 +22,6 @@
 namespace OCA\Richdocuments\Controller;
 
 use OCA\Files_Versions\Versions\IVersionManager;
-use OCA\Richdocuments\AppConfig;
 use OCA\Richdocuments\AppInfo\Application;
 use OCA\Richdocuments\Db\Wopi;
 use OCA\Richdocuments\Db\WopiMapper;
@@ -48,7 +47,6 @@
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\GenericFileException;
-use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
 use OCP\Files\Lock\ILock;
 use OCP\Files\Lock\ILockManager;

diff --git a/tests/lib/PermissionManagerTest.php b/tests/lib/PermissionManagerTest.php
@@ -102,7 +102,7 @@ public function testIsEnabledForUserEnabledNotInGroup() {
 		$this->groupManager
 			->expects(self::any())
 			->method('getUserGroupIds')
-			->willReturnCallback(function($user) {
+			->willReturnCallback(function ($user) {
 				return [];
 			});
 
@@ -159,7 +159,7 @@ public function testFeatureLock($editGroups, $userGroups, $result): void {
 		$this->groupManager
 			->expects(self::any())
 			->method('isInGroup')
-			->willReturnCallback(function($user, $group) {
+			->willReturnCallback(function ($user, $group) {
 				if ($user === 'TestUser' && $group === 'Enabled2') {
 					return true;
 				}

diff --git a/tests/lib/Service/WatermarkServiceTest.php b/tests/lib/Service/WatermarkServiceTest.php
@@ -130,7 +130,7 @@ public function dataWatermark(): Generator {
 	private function createWatermarkConfigMock(array $config): void {
 		$this->config->expects(self::any())
 			->method('getAppValue')
-			->willReturnCallback(function($app, $key, $default) use ($config) {
+			->willReturnCallback(function ($app, $key, $default) use ($config) {
 				if (isset($config[$key])) {
 					if (is_bool($config[$key])) {
 						return $config[$key] ? 'yes' : 'no';
@@ -148,7 +148,7 @@ public function testWatermark(bool $isPublic, ?string $user, array $config, bool
 		$this->createWatermarkConfigMock($config);
 		$this->groupManager->expects(self::any())
 			->method('isInGroup')
-			->willReturnCallback(function($userId, $groupId) {
+			->willReturnCallback(function ($userId, $groupId) {
 				return ($userId === 'user1' && $groupId === 'group1');
 			});