chore: Fix psalm issues and update baseline

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

apps/comments/lib/Search/CommentsSearchProvider.php

@@ -53,10 +53,6 @@ public function getOrder(string $route, array $routeParameters): int {
 	public function search(IUser $user, ISearchQuery $query): SearchResult {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 
-		if ($userFolder === null) {
-			return SearchResult::complete($this->l10n->t('Comments'), []);
-		}
-
 		$result = [];
 		$numComments = 50;
 		$offset = 0;

apps/files_sharing/tests/ApiTest.php

@@ -85,7 +85,7 @@ protected function setUp(): void {
 		$mount = $this->view->getMount($this->filename);
 		$mount->getStorage()->getScanner()->scan('', Scanner::SCAN_RECURSIVE);
 
-		$this->userFolder = \OC::$server->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
+		$this->userFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->appConfig = $this->createMock(IAppConfig::class);
 	}

apps/files_versions/lib/Storage.php

@@ -889,15 +889,11 @@ public static function expire($filename, $uid) {
 				if ($softQuota) {
 					$root = Server::get(IRootFolder::class);
 					$userFolder = $root->getUserFolder($uid);
-					if (is_null($userFolder)) {
-						$availableSpace = 0;
+					$free = $quota - $userFolder->getSize(false); // remaining free space for user
+					if ($free > 0) {
+						$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
 					} else {
-						$free = $quota - $userFolder->getSize(false); // remaining free space for user
-						if ($free > 0) {
-							$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
-						} else {
-							$availableSpace = $free - $versionsSize;
-						}
+						$availableSpace = $free - $versionsSize;
 					}
 				} else {
 					$availableSpace = $quota;

build/psalm-baseline.xml

@@ -507,6 +507,9 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/dav/lib/Connector/Sabre/Directory.php">
+    <DeprecatedMethod>
+      <code><![CDATA[\OC_Helper::getStorageInfo($relativePath, $this->info, false)]]></code>
+    </DeprecatedMethod>
     <InternalMethod>
       <code><![CDATA[copy]]></code>
       <code><![CDATA[file_exists]]></code>
@@ -1275,6 +1278,7 @@
   </file>
   <file src="apps/files/lib/Controller/ApiController.php">
     <DeprecatedMethod>
+      <code><![CDATA[\OC_Helper::getStorageInfo($dir ?: '/')]]></code>
       <code><![CDATA[getUserValue]]></code>
       <code><![CDATA[setUserValue]]></code>
       <code><![CDATA[setUserValue]]></code>
@@ -1292,6 +1296,7 @@
   </file>
   <file src="apps/files/lib/Controller/ViewController.php">
     <DeprecatedMethod>
+      <code><![CDATA[\OC_Helper::getStorageInfo($dir, $rootInfo ?: null)]]></code>
       <code><![CDATA[getUserValue]]></code>
     </DeprecatedMethod>
   </file>
@@ -2087,6 +2092,7 @@
       <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code>
     </DeprecatedConstant>
     <DeprecatedMethod>
+      <code><![CDATA[\OC_Helper::getStorageInfo('/', null, true, false)]]></code>
       <code><![CDATA[\OC_Util::tearDownFS()]]></code>
       <code><![CDATA[getUserValue]]></code>
       <code><![CDATA[getUserValue]]></code>
@@ -2254,6 +2260,7 @@
       <code><![CDATA[IAccountManager::PROPERTY_TWITTER]]></code>
     </DeprecatedConstant>
     <DeprecatedMethod>
+      <code><![CDATA[\OC_Helper::getStorageInfo('/')]]></code>
       <code><![CDATA[getUserValue]]></code>
       <code><![CDATA[getUserValue]]></code>
       <code><![CDATA[getUserValue]]></code>
@@ -3581,14 +3588,6 @@
       <code><![CDATA[$this->__call(__FUNCTION__, func_get_args())]]></code>
     </InvalidReturnStatement>
   </file>
-  <file src="lib/private/Files/Node/LazyUserFolder.php">
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$node]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[Folder]]></code>
-    </MoreSpecificReturnType>
-  </file>
   <file src="lib/private/Files/Node/Node.php">
     <InvalidNullableReturnType>
       <code><![CDATA[FileInfo]]></code>
@@ -3975,9 +3974,6 @@
     <InternalMethod>
       <code><![CDATA[getAbsolutePath]]></code>
     </InternalMethod>
-    <UndefinedInterfaceMethod>
-      <code><![CDATA[getQuota]]></code>
-    </UndefinedInterfaceMethod>
   </file>
   <file src="lib/private/legacy/OC_User.php">
     <UndefinedClass>