diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-15 13:57:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 13:57:00 +0200 |
| commit | cf7c4a4439da66055db5b43f9d6bc6e4671aa3e4 (patch) | |
| tree | c78e6c65270dda98dba1cc1831821d26c921bb66 /lib | |
| parent | c5f14ac884b32d749edfcfc89434333930287ae5 (diff) | |
| parent | 8366dfa50b26632007462699085ef1f8c02ab880 (diff) | |
| download | nextcloud-server-cf7c4a4439da66055db5b43f9d6bc6e4671aa3e4.tar.gz nextcloud-server-cf7c4a4439da66055db5b43f9d6bc6e4671aa3e4.zip | |
Merge pull request #6123 from nextcloud/cleanup-shareItem
Cleanup usage of shareItem in internal code base
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share/Share.php | 5 | ||||
| -rw-r--r-- | lib/public/Share.php | 19 |
2 files changed, 3 insertions, 21 deletions
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index 57e5742077b..7f2abb8b6a2 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 78f2bcf586d..8007068abc9 100644 --- a/lib/public/Share.php +++ b/lib/public/Share.php @@ -168,25 +168,6 @@ class Share extends \OC\Share\Constants { } /** - * 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 * @param string $itemSource |