@@ -29,7 +29,6 @@ |
||
| 29 | 29 | namespace OCA\DAV\Connector\Sabre; |
| 30 | 30 | |
| 31 | 31 | use OC\Files\View; |
| 32 | -use OCA\DAV\Upload\FutureFile; |
|
| 33 | 32 | use OCP\Files\ForbiddenException; |
| 34 | 33 | use Sabre\DAV\Exception\Forbidden; |
| 35 | 34 | use Sabre\DAV\Exception\NotFound; |
@@ -216,7 +216,7 @@ |
||
| 216 | 216 | * |
| 217 | 217 | * @param \Google_Service_Drive_DriveFile |
| 218 | 218 | * |
| 219 | - * @return true if the file is a Google Doc file, false otherwise |
|
| 219 | + * @return boolean if the file is a Google Doc file, false otherwise |
|
| 220 | 220 | */ |
| 221 | 221 | private function isGoogleDocFile($file) { |
| 222 | 222 | return $this->getGoogleDocExtension($file->getMimeType()) !== ''; |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | /** |
| 52 | 52 | * @param string $appName |
| 53 | 53 | * @param IRequest $request |
| 54 | - * @param Manager $userManager |
|
| 54 | + * @param UserManager $userManager |
|
| 55 | 55 | * @param DefaultTokenProvider $tokenProvider |
| 56 | 56 | * @param ISecureRandom $secureRandom |
| 57 | 57 | */ |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | * and does not take the chroot into account ) |
| 201 | 201 | * |
| 202 | 202 | * @param string $path |
| 203 | - * @return \OCP\Files\Mount\IMountPoint |
|
| 203 | + * @return Mount\MountPoint|null |
|
| 204 | 204 | */ |
| 205 | 205 | public function getMount($path) { |
| 206 | 206 | return Filesystem::getMountManager()->find($this->getAbsolutePath($path)); |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | |
| 964 | 964 | /** |
| 965 | 965 | * @param string $path |
| 966 | - * @return bool|string |
|
| 966 | + * @return string|false |
|
| 967 | 967 | * @throws \OCP\Files\InvalidPathException |
| 968 | 968 | */ |
| 969 | 969 | public function toTmpFile($path) { |
@@ -1078,7 +1078,7 @@ discard block |
||
| 1078 | 1078 | * @param string $path |
| 1079 | 1079 | * @param array $hooks (optional) |
| 1080 | 1080 | * @param mixed $extraParam (optional) |
| 1081 | - * @return mixed |
|
| 1081 | + * @return string |
|
| 1082 | 1082 | * @throws \Exception |
| 1083 | 1083 | * |
| 1084 | 1084 | * This method takes requests for basic filesystem functions (e.g. reading & writing |
@@ -2086,7 +2086,7 @@ discard block |
||
| 2086 | 2086 | |
| 2087 | 2087 | /** |
| 2088 | 2088 | * @param string $filename |
| 2089 | - * @return array |
|
| 2089 | + * @return string[] |
|
| 2090 | 2090 | * @throws \OC\User\NoUserException |
| 2091 | 2091 | * @throws NotFoundException |
| 2092 | 2092 | */ |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | * |
| 293 | 293 | * @param string $uid |
| 294 | 294 | * @param string $password |
| 295 | - * @return boolean|null |
|
| 295 | + * @return boolean |
|
| 296 | 296 | * @throws LoginException |
| 297 | 297 | */ |
| 298 | 298 | public function login($uid, $password) { |
@@ -375,6 +375,9 @@ discard block |
||
| 375 | 375 | return $this->config->getSystemValue('token_auth_enforced', false); |
| 376 | 376 | } |
| 377 | 377 | |
| 378 | + /** |
|
| 379 | + * @param string $username |
|
| 380 | + */ |
|
| 378 | 381 | protected function isTwoFactorEnforced($username) { |
| 379 | 382 | Util::emitHook( |
| 380 | 383 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -446,6 +449,9 @@ discard block |
||
| 446 | 449 | return false; |
| 447 | 450 | } |
| 448 | 451 | |
| 452 | + /** |
|
| 453 | + * @param string $uid |
|
| 454 | + */ |
|
| 449 | 455 | private function loginWithToken($uid) { |
| 450 | 456 | // TODO: $this->manager->emit('\OC\User', 'preTokenLogin', array($uid)); |
| 451 | 457 | $user = $this->manager->get($uid); |