From 9cc7efaedc563f5d3fe43c0e9757071c55fc9756 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 7 Feb 2019 13:44:35 +0100 Subject: [PATCH 1/2] Make sure the relative path is always a string Signed-off-by: Joas Schilling --- apps/sharebymail/lib/ShareByMailProvider.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index e255adfd3f..4af9b26d04 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -254,7 +254,7 @@ class ShareByMailProvider implements IShareProvider { [$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()) { @@ -268,7 +268,7 @@ class ShareByMailProvider implements IShareProvider { [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()], $share->getShareOwner(), $fileId, - $ownerFolder->getRelativePath($ownerPath) + (string) $ownerFolder->getRelativePath($ownerPath) ); } @@ -291,7 +291,7 @@ class ShareByMailProvider implements IShareProvider { [$userFolder->getRelativePath($share->getNode()->getPath())], $share->getSharedBy(), $share->getNode()->getId(), - $userFolder->getRelativePath($share->getNode()->getPath()) + (string) $userFolder->getRelativePath($share->getNode()->getPath()) ); } else { $this->publishActivity( @@ -299,7 +299,7 @@ class ShareByMailProvider implements IShareProvider { [$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith], $share->getSharedBy(), $share->getNode()->getId(), - $userFolder->getRelativePath($share->getNode()->getPath()) + (string) $userFolder->getRelativePath($share->getNode()->getPath()) ); } } @@ -308,13 +308,13 @@ class ShareByMailProvider implements IShareProvider { /** * 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') From b93aa586f4636c3863745056ccf0f498fe61ab7f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 7 Feb 2019 14:12:17 +0100 Subject: [PATCH 2/2] Fix wrong method call Signed-off-by: Joas Schilling --- apps/sharebymail/lib/ShareByMailProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index 4af9b26d04..30b3dc7916 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -264,7 +264,6 @@ class ShareByMailProvider implements IShareProvider { $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,