@@ -109,8 +109,8 @@ |
||
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | /** |
| 112 | - * @param $controller |
|
| 113 | - * @param $methodName |
|
| 112 | + * @param Controller $controller |
|
| 113 | + * @param string $methodName |
|
| 114 | 114 | * @throws TwoFactorAuthRequiredException |
| 115 | 115 | * @throws UserAlreadyLoggedInException |
| 116 | 116 | */ |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | * @param string $userId |
| 275 | 275 | * @param string $domain |
| 276 | 276 | * @param \OCP\IConfig $config |
| 277 | - * @param array $headers |
|
| 277 | + * @param string[] $headers |
|
| 278 | 278 | * |
| 279 | 279 | * Format of $headers: |
| 280 | 280 | * Array [ |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | * This function adds the CORS headers for all domains |
| 319 | 319 | * |
| 320 | 320 | * @param Sabre\HTTP\ResponseInterface $response |
| 321 | - * @param Array $headers |
|
| 321 | + * @param string[] $headers |
|
| 322 | 322 | * |
| 323 | 323 | * Format of $headers: |
| 324 | 324 | * Array [ |
@@ -39,11 +39,8 @@ |
||
| 39 | 39 | use OC\Settings\Controller\AuthSettingsController; |
| 40 | 40 | use OC\Settings\Controller\CertificateController; |
| 41 | 41 | use OC\Settings\Controller\CheckSetupController; |
| 42 | -use OC\Settings\Controller\GroupsController; |
|
| 43 | 42 | use OC\Settings\Controller\LogSettingsController; |
| 44 | 43 | use OC\Settings\Controller\MailSettingsController; |
| 45 | -use OC\Settings\Controller\UsersController; |
|
| 46 | -use OC\Settings\Middleware\SubadminMiddleware; |
|
| 47 | 44 | use OCP\AppFramework\App; |
| 48 | 45 | use OCP\IContainer; |
| 49 | 46 | use OCP\Util; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | 175 | * @param Node $node |
| 176 | - * @param $correctChecksum |
|
| 176 | + * @param string $correctChecksum |
|
| 177 | 177 | * @throws NotFoundException |
| 178 | 178 | * @throws \OCP\Files\InvalidPathException |
| 179 | 179 | * @throws \OCP\Files\StorageNotAvailableException |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
| 191 | - * @param $path |
|
| 191 | + * @param string $path |
|
| 192 | 192 | * @param IStorage $storage |
| 193 | 193 | * @return string |
| 194 | 194 | * @throws \OCP\Files\StorageNotAvailableException |
@@ -270,6 +270,9 @@ discard block |
||
| 270 | 270 | return \array_values($calendars); |
| 271 | 271 | } |
| 272 | 272 | |
| 273 | + /** |
|
| 274 | + * @param string $principalUri |
|
| 275 | + */ |
|
| 273 | 276 | public function getUsersOwnCalendars($principalUri) { |
| 274 | 277 | $principalUri = $this->convertPrincipal($principalUri, true); |
| 275 | 278 | $fields = \array_values($this->propertyMap); |
@@ -1276,7 +1279,7 @@ discard block |
||
| 1276 | 1279 | * @param string $principalUri |
| 1277 | 1280 | * @param string $uri |
| 1278 | 1281 | * @param array $properties |
| 1279 | - * @return mixed |
|
| 1282 | + * @return integer |
|
| 1280 | 1283 | * @throws Forbidden |
| 1281 | 1284 | */ |
| 1282 | 1285 | function createSubscription($principalUri, $uri, array $properties) { |
@@ -1682,6 +1685,9 @@ discard block |
||
| 1682 | 1685 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
| 1683 | 1686 | } |
| 1684 | 1687 | |
| 1688 | + /** |
|
| 1689 | + * @param boolean $toV2 |
|
| 1690 | + */ |
|
| 1685 | 1691 | private function convertPrincipal($principalUri, $toV2 = null) { |
| 1686 | 1692 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
| 1687 | 1693 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -246,7 +246,7 @@ |
||
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | - * @return array|null |
|
| 249 | + * @return string |
|
| 250 | 250 | */ |
| 251 | 251 | public function getLocalSystemAddressBook() { |
| 252 | 252 | if (\is_null($this->localSystemAddressBook)) { |
@@ -172,6 +172,10 @@ |
||
| 172 | 172 | 'data' => ['sharedSecret' => $sharedSecret]]; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | + /** |
|
| 176 | + * @param string $url |
|
| 177 | + * @param string $token |
|
| 178 | + */ |
|
| 175 | 179 | protected function isValidToken($url, $token) { |
| 176 | 180 | $storedToken = $this->dbHandler->getToken($url); |
| 177 | 181 | return \hash_equals($storedToken, $token); |
@@ -284,6 +284,9 @@ discard block |
||
| 284 | 284 | return $this->leave(__FUNCTION__, $result); |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | + /** |
|
| 288 | + * @param string $path |
|
| 289 | + */ |
|
| 287 | 290 | private function removeFromCache($path) { |
| 288 | 291 | $path = \trim($path, '/'); |
| 289 | 292 | // TODO The CappedCache does not really clear by prefix. It just clears all. |
@@ -673,7 +676,7 @@ discard block |
||
| 673 | 676 | * if smb.logging.enable is set to true in the config will log a leave line |
| 674 | 677 | * with the given function, the return value or the exception |
| 675 | 678 | * |
| 676 | - * @param $function |
|
| 679 | + * @param string $function |
|
| 677 | 680 | * @param mixed $result an exception will be logged and then returned |
| 678 | 681 | * @return mixed |
| 679 | 682 | */ |
@@ -700,6 +703,9 @@ discard block |
||
| 700 | 703 | return $result; |
| 701 | 704 | } |
| 702 | 705 | |
| 706 | + /** |
|
| 707 | + * @param string $function |
|
| 708 | + */ |
|
| 703 | 709 | private function swallow($function, \Exception $exception) { |
| 704 | 710 | if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true) { |
| 705 | 711 | Util::writeLog('smb', "$function swallowing ".\get_class($exception) |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | * split user and remote from federated cloud id |
| 444 | 444 | * |
| 445 | 445 | * @param string $address federated share address |
| 446 | - * @return array [user, remoteURL] |
|
| 446 | + * @return string[] [user, remoteURL] |
|
| 447 | 447 | * @throws \Exception |
| 448 | 448 | */ |
| 449 | 449 | public function splitUserRemote($address) { |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | * trusted domain entries |
| 659 | 659 | * |
| 660 | 660 | * @param string $target target |
| 661 | - * @return true if one match was found, false otherwise |
|
| 661 | + * @return boolean if one match was found, false otherwise |
|
| 662 | 662 | */ |
| 663 | 663 | protected function isInstanceDomain($target) { |
| 664 | 664 | if (\strpos($target, '/') !== false) { |