From 8366dfa50b26632007462699085ef1f8c02ab880 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 15 Aug 2017 11:57:18 +0200 Subject: Cleanup usage of shareItem in internal code base Signed-off-by: Morris Jobke --- lib/private/Share/Share.php | 5 +++-- lib/public/Share.php | 19 ------------------- 2 files changed, 3 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 52b382e6678..8abb52a7cfb 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -351,11 +351,12 @@ class Share extends Constants { * @param string $shareWith User or group the item is being shared with * @param int $permissions CRUDS * @param string $itemSourceName - * @param \DateTime $expirationDate - * @param bool $passwordChanged + * @param \DateTime|null $expirationDate + * @param bool|null $passwordChanged * @return boolean|string Returns true on success or false on failure, Returns token on success for links * @throws \OC\HintException when the share type is remote and the shareWith is invalid * @throws \Exception + * @since 5.0.0 - parameter $itemSourceName was added in 6.0.0, parameter $expirationDate was added in 7.0.0, parameter $passwordChanged added in 9.0.0 */ public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null, $passwordChanged = null) { diff --git a/lib/public/Share.php b/lib/public/Share.php index bc07ce4b78c..c03a200ab21 100644 --- a/lib/public/Share.php +++ b/lib/public/Share.php @@ -180,25 +180,6 @@ class Share extends \OC\Share\Constants { return \OC\Share\Share::getItemShared($itemType, $itemSource, $format, $parameters, $includeCollections); } - /** - * Share an item with a user, group, or via private link - * @param string $itemType - * @param string $itemSource - * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK - * @param string $shareWith User or group the item is being shared with - * @param int $permissions CRUDS - * @param string $itemSourceName - * @param \DateTime|null $expirationDate - * @param bool|null $passwordChanged - * @return bool|string Returns true on success or false on failure, Returns token on success for links - * @throws \OC\HintException when the share type is remote and the shareWith is invalid - * @throws \Exception - * @since 5.0.0 - parameter $itemSourceName was added in 6.0.0, parameter $expirationDate was added in 7.0.0, parameter $passwordChanged added in 9.0.0 - */ - public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null, \DateTime $expirationDate = null, $passwordChanged = null) { - return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName, $expirationDate, $passwordChanged); - } - /** * Unshare an item from a user, group, or delete a private link * @param string $itemType -- cgit v1.2.3