fix(psalm)

Author: marcelklehr

lib/Controller/ConfigController.php

@@ -76,8 +76,7 @@ public function setConfig(array $values): DataResponse {
 			$result['user_name'] = '';
 		} else {
 			if (isset($values['drive_output_dir'])) {
-				/** @var \OCP\Files\IRootFolder $root */
-				$root = \OC::$server->get(\OCP\Files\IRootFolder::class);
+				$root = \OCP\Server::get(\OCP\Files\IRootFolder::class);
 				$userRoot = $root->getUserFolder($this->userId);
 				$result['free_space'] = \OCA\Google\Settings\Personal::getFreeSpace($userRoot, $values['drive_output_dir']);
 			}

lib/Service/GoogleCalendarAPIService.php

@@ -234,6 +234,7 @@ public function importCalendar(string $userId, string $calId, string $calName, ?
 		$nbAdded = 0;
 		$nbUpdated = 0;
 
+		/** @var array{id: string, start?: array{date?: string, dateTime?: string}, end?: array{date?: string, dateTime?: string}, colorId?: string, summary?: string, visibility?: string, sequence?: string, location?: string, description?: string, status?: string, created?: string, updated?: string, reminders?: array{useDefault?: bool, overrides?: list{array{minutes?: string, hours?: string, days?: string, weeks?: string}}}, recurrence?: list<string>} $e */
 		foreach ($events as $e) {
 			$objectUri = $e['id'];
 
@@ -249,6 +250,9 @@ public function importCalendar(string $userId, string $calId, string $calName, ?
 				// check if it already exists and if we should update it
 				$existingEvent = $this->caldavBackend->getCalendarObject($ncCalId, $objectUri);
 				if ($existingEvent !== null) {
+					if (!isset($e['updated'])) {
+						continue;
+					}
 					$remoteEventUpdatedTimestamp = (new DateTime($e['updated']))->getTimestamp();
 					$localEventUpdatedTimestamp = $this->getEventLastModifiedTimestamp($existingEvent['calendardata']);
 					if ($localEventUpdatedTimestamp !== null && $remoteEventUpdatedTimestamp <= $localEventUpdatedTimestamp) {
@@ -269,7 +273,7 @@ public function importCalendar(string $userId, string $calId, string $calName, ?
 			}
 			$calData .= isset($e['summary'])
 				? ('SUMMARY:' . substr(str_replace("\n", '\n', $e['summary']), 0, 250) . "\n")
-				: ($e['visibility'] ?? '' === 'private'
+				: (($e['visibility'] ?? '') === 'private'
 					? ('SUMMARY:' . $this->l10n->t('Private event') . "\n")
 					: '');
 			$calData .= isset($e['sequence']) ? ('SEQUENCE:' . $e['sequence'] . "\n") : '';

lib/Service/GoogleContactsAPIService.php

@@ -210,6 +210,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $
 			$displayName = '';
 			// we just take first name
 			if (isset($c['names']) && is_array($c['names'])) {
+				/** @var array{displayName?: string, familyName?: string, givenName?: string, middleName?: string, honorificPrefix?: string, honorificSuffix?: string } $n */
 				foreach ($c['names'] as $n) {
 					$displayName = $n['displayName'] ?? '';
 					$familyName = $n['familyName'] ?? '';
@@ -324,6 +325,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $
 
 			// address
 			if (isset($c['addresses']) && is_array($c['addresses'])) {
+				/** @var array{streetAddress?: string, extendedAddress?: string, postalCode?: string, city?: string, type?: string, country?: string, poBox?: string} $address */
 				foreach ($c['addresses'] as $address) {
 					$streetAddress = $address['streetAddress'] ?? '';
 					$extendedAddress = $address['extendedAddress'] ?? '';
@@ -380,6 +382,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $
 			}
 
 			if (isset($c['emailAddresses']) && is_array($c['emailAddresses'])) {
+				/** @var array{value?: string, type?: string} $email */
 				foreach ($c['emailAddresses'] as $email) {
 					if (isset($email['value'])) {
 						$addrType = $email['type'] ?? '';
@@ -405,6 +408,7 @@ public function importContacts(string $userId, ?string $uri, int $key, ?string $
 
 			// we just take first org
 			if (isset($c['organizations']) && is_array($c['organizations'])) {
+				/** @var array{title?: string, name?: string} $org */
 				foreach ($c['organizations'] as $org) {
 					$name = $org['name'] ?? '';
 					if ($name) {

lib/Service/GoogleDriveAPIService.php

@@ -329,7 +329,7 @@ public function importFiles(
 						$fileName = $this->getFileName($fileItem, $userId, in_array($fileItem['id'], $conflictingIds));
 
 						// If file already exists in folder, don't download unless timestamp is different
-						if ($saveFolder->nodeExists($fileName)) {
+						if ($saveFolder->nodeExists($fileName) === true) {
 							$savedFile = $saveFolder->get($fileName);
 							$timestampOnFile = $savedFile->getMtime();
 							$d = new DateTime($fileItem['modifiedTime']);
@@ -349,7 +349,7 @@ public function importFiles(
 							$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_files', $alreadyImported + $nbDownloaded);
 							$downloadedSize += $size;
 							$this->config->setUserValue($userId, Application::APP_ID, 'drive_imported_size', $alreadyImportedSize + $downloadedSize);
-							if ($maxDownloadSize && $downloadedSize > $maxDownloadSize) {
+							if ($maxDownloadSize !== null && $downloadedSize > $maxDownloadSize) {
 								return [
 									'nbDownloaded' => $nbDownloaded,
 									'targetPath' => $targetPath,
@@ -362,7 +362,7 @@ public function importFiles(
 						}
 					} catch (\Throwable $e) {
 						$this->logger->warning('Error while importing file', ['exception' => $e]);
-						$this->logger->debug('Skipping file ' . $fileItem['id']);
+						$this->logger->debug('Skipping file ' . strval($fileItem['id']));
 						continue;
 					}
 				}
@@ -692,11 +692,11 @@ private function getFile(string $userId, array $fileItem, Folder $saveFolder, st
 			$documentFormat = $this->getUserDocumentFormat($userId);
 			// potentially a doc
 			$params = $this->getDocumentRequestParams($fileItem['mimeType'], $documentFormat);
-			$fileUrl = 'https://www.googleapis.com/drive/v3/files/' . urlencode($fileItem['id']) . '/export';
+			$fileUrl = 'https://www.googleapis.com/drive/v3/files/' . urlencode((string) $fileItem['id']) . '/export';
 			return $this->downloadAndSaveFile($saveFolder, $fileName, $userId, $fileUrl, $fileItem, $params);
 		} elseif (isset($fileItem['webContentLink'])) {
 			// classic file
-			$fileUrl = 'https://www.googleapis.com/drive/v3/files/' . urlencode($fileItem['id']) . '?alt=media';
+			$fileUrl = 'https://www.googleapis.com/drive/v3/files/' . urlencode((string) $fileItem['id']) . '?alt=media';
 			return $this->downloadAndSaveFile($saveFolder, $fileName, $userId, $fileUrl, $fileItem);
 		}
 		return null;

lib/Service/GooglePhotosAPIService.php

@@ -303,7 +303,7 @@ public function importPhotos(
 							$nbDownloaded++;
 							$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_photos', $alreadyImported + $nbDownloaded);
 							$downloadedSize += $size;
-							if ($maxDownloadSize && $downloadedSize > $maxDownloadSize) {
+							if ($maxDownloadSize !== null && $downloadedSize > $maxDownloadSize) {
 								return [
 									'nbDownloaded' => $nbDownloaded,
 									'targetPath' => $targetPath,
@@ -337,7 +337,7 @@ public function importPhotos(
 							$nbDownloaded++;
 							$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_photos', $alreadyImported + $nbDownloaded);
 							$downloadedSize += $size;
-							if ($maxDownloadSize && $downloadedSize > $maxDownloadSize) {
+							if ($maxDownloadSize !== null && $downloadedSize > $maxDownloadSize) {
 								return [
 									'nbDownloaded' => $nbDownloaded,
 									'targetPath' => $targetPath,

lib/Settings/Personal.php

@@ -98,6 +98,12 @@ public function getPriority(): int {
 		return 10;
 	}
 
+	/**
+	 * @param \OCP\Files\Folder $userRoot
+	 * @param string $outputDir
+	 * @return bool|float|int
+	 * @throws NotFoundException
+	 */
 	public static function getFreeSpace(\OCP\Files\Folder $userRoot, string $outputDir) {
 		try {
 			// OutputDir can be on an external storage which can have more free space