summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-02-07 13:44:35 +0100
committerBackportbot <backportbot-noreply@rullzer.com>2019-02-07 22:40:10 +0000
commit86b76bb514ef5c4f229e550c50dc84875821085d (patch)
treebab81c5d499c132893db81d060c9534c3f9f8fb9 /apps
parent252d49dd79f896c0530a0639b1f2068de137ce21 (diff)
downloadnextcloud-server-86b76bb514ef5c4f229e550c50dc84875821085d.tar.gz
nextcloud-server-86b76bb514ef5c4f229e550c50dc84875821085d.zip
Make sure the relative path is always a string
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/sharebymail/lib/ShareByMailProvider.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index c74c5eb1a7f..48e5f446aa1 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')