@@ -856,7 +856,7 @@ |
||
| 856 | 856 | * Get the certificate manager for the user |
| 857 | 857 | * |
| 858 | 858 | * @param string $userId (optional) if not specified the current loggedin user is used |
| 859 | - * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in |
|
| 859 | + * @return null|CertificateManager | null if $uid is null and no user is logged in |
|
| 860 | 860 | */ |
| 861 | 861 | public function getCertificateManager($userId = null) { |
| 862 | 862 | if (is_null($userId)) { |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | |
| 154 | 154 | /** |
| 155 | 155 | * @param mixed $offset |
| 156 | - * @return mixed |
|
| 156 | + * @return string|null |
|
| 157 | 157 | */ |
| 158 | 158 | public function offsetGet($offset) { |
| 159 | 159 | return $this->get($offset); |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace OC\Session; |
| 25 | 25 | |
| 26 | -use OCP\AppFramework\Utility\ITimeFactory; |
|
| 27 | 26 | use OCP\IConfig; |
| 28 | 27 | use OCP\IRequest; |
| 29 | 28 | use OCP\ISession; |
@@ -91,5 +91,8 @@ |
||
| 91 | 91 | $this->tablePrefix = $dbTablePrefix; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | + /** |
|
| 95 | + * @param string $userName |
|
| 96 | + */ |
|
| 94 | 97 | abstract public function setupDatabase($userName); |
| 95 | 98 | } |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | - * @param IDbConnection $connection |
|
| 73 | + * @param IDBConnection $connection |
|
| 74 | 74 | * @throws \OC\DatabaseSetupException |
| 75 | 75 | */ |
| 76 | 76 | private function createDBUser($connection) { |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | * |
| 228 | 228 | * all return: http://localhost |
| 229 | 229 | * |
| 230 | - * @param string $shareWith |
|
| 230 | + * @param string $remote |
|
| 231 | 231 | * @return string |
| 232 | 232 | */ |
| 233 | 233 | protected static function fixRemoteURL($remote) { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | * split user and remote from federated cloud id |
| 245 | 245 | * |
| 246 | 246 | * @param string $id |
| 247 | - * @return array |
|
| 247 | + * @return string[] |
|
| 248 | 248 | * @throws HintException |
| 249 | 249 | */ |
| 250 | 250 | public static function splitUserRemote($id) { |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | * @param string $filename the shared file |
| 175 | 175 | * @param string $link the public link |
| 176 | 176 | * @param int $expiration expiration date (timestamp) |
| 177 | - * @return array $result of failed recipients |
|
| 177 | + * @return string[] $result of failed recipients |
|
| 178 | 178 | */ |
| 179 | 179 | public function sendLinkShareMail($recipient, $filename, $link, $expiration) { |
| 180 | 180 | $subject = (string)$this->l->t('%s shared »%s« with you', [$this->senderDisplayName, $filename]); |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | * @param string $filename the shared file |
| 211 | 211 | * @param string $link link to the shared file |
| 212 | 212 | * @param int $expiration expiration date (timestamp) |
| 213 | - * @param bool $prefix prefix of mail template files |
|
| 213 | + * @param string|boolean $prefix prefix of mail template files |
|
| 214 | 214 | * @return array an array of the html mail body and the plain text mail body |
| 215 | 215 | */ |
| 216 | 216 | private function createMailBody($filename, $link, $expiration, $prefix = '') { |
@@ -2211,6 +2211,16 @@ |
||
| 2211 | 2211 | return $id ? $id : false; |
| 2212 | 2212 | } |
| 2213 | 2213 | |
| 2214 | + /** |
|
| 2215 | + * @param string $itemType |
|
| 2216 | + * @param string $itemSource |
|
| 2217 | + * @param integer $shareType |
|
| 2218 | + * @param string $shareWith |
|
| 2219 | + * @param string $uidOwner |
|
| 2220 | + * @param integer $permissions |
|
| 2221 | + * @param string|null $itemSourceName |
|
| 2222 | + * @param null|\DateTime $expirationDate |
|
| 2223 | + */ |
|
| 2214 | 2224 | private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) { |
| 2215 | 2225 | $backend = self::getBackend($itemType); |
| 2216 | 2226 | |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use OCP\IUser; |
| 28 | 28 | use OCP\ILogger; |
| 29 | 29 | use OCP\Files\Folder; |
| 30 | - |
|
| 31 | 30 | use OC\Share20\Exception\ShareNotFound; |
| 32 | 31 | |
| 33 | 32 | /** |