@@ -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 | /** |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | * @param string $principalUri |
| 1037 | 1037 | * @param string $uri |
| 1038 | 1038 | * @param array $properties |
| 1039 | - * @return mixed |
|
| 1039 | + * @return integer |
|
| 1040 | 1040 | */ |
| 1041 | 1041 | function createSubscription($principalUri, $uri, array $properties) { |
| 1042 | 1042 | |
@@ -1377,6 +1377,9 @@ discard block |
||
| 1377 | 1377 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
| 1378 | 1378 | } |
| 1379 | 1379 | |
| 1380 | + /** |
|
| 1381 | + * @param boolean $toV2 |
|
| 1382 | + */ |
|
| 1380 | 1383 | private function convertPrincipal($principalUri, $toV2) { |
| 1381 | 1384 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1382 | 1385 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -187,7 +187,8 @@ discard block |
||
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | /** |
| 190 | - * @param $addressBookUri |
|
| 190 | + * @param string $addressBookUri |
|
| 191 | + * @param string $principal |
|
| 191 | 192 | * @return array|null |
| 192 | 193 | */ |
| 193 | 194 | public function getAddressBooksByUri($principal, $addressBookUri) { |
@@ -867,6 +868,7 @@ discard block |
||
| 867 | 868 | * * readOnly - boolean |
| 868 | 869 | * * summary - Optional, a description for the share |
| 869 | 870 | * |
| 871 | + * @param integer $addressBookId |
|
| 870 | 872 | * @return array |
| 871 | 873 | */ |
| 872 | 874 | public function getShares($addressBookId) { |
@@ -966,7 +968,7 @@ discard block |
||
| 966 | 968 | |
| 967 | 969 | /** |
| 968 | 970 | * For shared address books the sharee is set in the ACL of the address book |
| 969 | - * @param $addressBookId |
|
| 971 | + * @param integer $addressBookId |
|
| 970 | 972 | * @param $acl |
| 971 | 973 | * @return array |
| 972 | 974 | */ |
@@ -974,6 +976,9 @@ discard block |
||
| 974 | 976 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl); |
| 975 | 977 | } |
| 976 | 978 | |
| 979 | + /** |
|
| 980 | + * @param boolean $toV2 |
|
| 981 | + */ |
|
| 977 | 982 | private function convertPrincipal($principalUri, $toV2) { |
| 978 | 983 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 979 | 984 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | use OC\Share\MailNotifications; |
| 23 | -use OCP\IConfig; |
|
| 24 | 23 | use OCP\IL10N; |
| 25 | 24 | use OCP\IUser; |
| 26 | 25 | use OCP\Mail\IMailer; |
@@ -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); |
@@ -279,7 +279,7 @@ |
||
| 279 | 279 | /** |
| 280 | 280 | * get share ID |
| 281 | 281 | * |
| 282 | - * @return integer unique share ID |
|
| 282 | + * @return string unique share ID |
|
| 283 | 283 | */ |
| 284 | 284 | public function getShareId() { |
| 285 | 285 | return $this->newShare->getId(); |
@@ -202,7 +202,7 @@ |
||
| 202 | 202 | /** |
| 203 | 203 | * removes an entry from the comments run time cache |
| 204 | 204 | * |
| 205 | - * @param mixed $id the comment's id |
|
| 205 | + * @param string $id the comment's id |
|
| 206 | 206 | */ |
| 207 | 207 | protected function uncache($id) { |
| 208 | 208 | $id = strval($id); |
@@ -37,7 +37,6 @@ |
||
| 37 | 37 | use OC\HTTPHelper; |
| 38 | 38 | use OC_Util; |
| 39 | 39 | use OCP\IConfig; |
| 40 | -use OC\Setup; |
|
| 41 | 40 | use OCP\Util; |
| 42 | 41 | |
| 43 | 42 | class VersionCheck extends BasicEmitter { |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | * If an SQLLogger is configured, the execution is logged. |
| 168 | 168 | * |
| 169 | 169 | * @param string $query The SQL query to execute. |
| 170 | - * @param array $params The parameters to bind to the query, if any. |
|
| 170 | + * @param string[] $params The parameters to bind to the query, if any. |
|
| 171 | 171 | * @param array $types The types the previous parameters are in. |
| 172 | 172 | * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp The query cache profile, optional. |
| 173 | 173 | * |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | * columns or sequences. |
| 213 | 213 | * |
| 214 | 214 | * @param string $seqName Name of the sequence object from which the ID should be returned. |
| 215 | - * @return string A string representation of the last inserted ID. |
|
| 215 | + * @return integer A string representation of the last inserted ID. |
|
| 216 | 216 | */ |
| 217 | 217 | public function lastInsertId($seqName = null) |
| 218 | 218 | { |