Merge pull request #14101 from nextcloud/backport/14083/stable15

[stable15] Make sure the relative path is always a string

Author: nickvergessen

apps/sharebymail/lib/ShareByMailProvider.php

@@ -254,7 +254,7 @@ protected function createShareActivity(IShare $share, string $type = 'share') {
 			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
 			$share->getSharedBy(),
 			$share->getNode()->getId(),
-			$userFolder->getRelativePath($share->getNode()->getPath())
+			(string) $userFolder->getRelativePath($share->getNode()->getPath())
 		);
 
 		if ($share->getShareOwner() !== $share->getSharedBy()) {
@@ -264,11 +264,10 @@ protected function createShareActivity(IShare $share, string $type = 'share') {
 			$ownerPath = $nodes[0]->getPath();
 			$this->publishActivity(
 				$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
-				Activity::SUBJECT_SHARED_EMAIL_BY,
 				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
 				$share->getShareOwner(),
 				$fileId,
-				$ownerFolder->getRelativePath($ownerPath)
+				(string) $ownerFolder->getRelativePath($ownerPath)
 			);
 		}
 
@@ -291,15 +290,15 @@ protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendT
 				[$userFolder->getRelativePath($share->getNode()->getPath())],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		} else {
 			$this->publishActivity(
 				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
 				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
 				$share->getSharedBy(),
 				$share->getNode()->getId(),
-				$userFolder->getRelativePath($share->getNode()->getPath())
+				(string) $userFolder->getRelativePath($share->getNode()->getPath())
 			);
 		}
 	}
@@ -308,13 +307,13 @@ protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendT
 	/**
 	 * publish activity if a file/folder was shared by mail
 	 *
-	 * @param $subject
-	 * @param $parameters
-	 * @param $affectedUser
-	 * @param $fileId
-	 * @param $filePath
+	 * @param string $subject
+	 * @param array $parameters
+	 * @param string $affectedUser
+	 * @param int $fileId
+	 * @param string $filePath
 	 */
-	protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) {
+	protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
 		$event = $this->activityManager->generateEvent();
 		$event->setApp('sharebymail')
 			->setType('shared')