@@ -230,6 +230,9 @@ |
||
230 | 230 | return false; |
231 | 231 | } |
232 | 232 | |
233 | + /** |
|
234 | + * @param string $path |
|
235 | + */ |
|
233 | 236 | private function batchDelete ($path = null) { |
234 | 237 | $params = [ |
235 | 238 | 'Bucket' => $this->bucket |
@@ -32,7 +32,6 @@ |
||
32 | 32 | */ |
33 | 33 | namespace OCA\Files_External\Lib\Storage; |
34 | 34 | use Icewind\Streams\IteratorDirectory; |
35 | - |
|
36 | 35 | use Icewind\Streams\RetryWrapper; |
37 | 36 | use phpseclib\Net\SFTP\Stream; |
38 | 37 |
@@ -325,6 +325,9 @@ |
||
325 | 325 | return $result; |
326 | 326 | } |
327 | 327 | |
328 | + /** |
|
329 | + * @param string $mountPoint |
|
330 | + */ |
|
328 | 331 | public function removeShare($mountPoint) { |
329 | 332 | |
330 | 333 | $mountPointObj = $this->mountManager->find($mountPoint); |
@@ -23,7 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace OCA\Files_Trashbin\BackgroundJob; |
25 | 25 | |
26 | -use OCP\IConfig; |
|
27 | 26 | use OCP\IUser; |
28 | 27 | use OCP\IUserManager; |
29 | 28 | use OCA\Files_Trashbin\AppInfo\Application; |
@@ -109,7 +109,7 @@ |
||
109 | 109 | * check if it is a file located in data/user/files only files in the |
110 | 110 | * 'files' directory should be moved to the trash |
111 | 111 | * |
112 | - * @param $path |
|
112 | + * @param string $path |
|
113 | 113 | * @return bool |
114 | 114 | */ |
115 | 115 | protected function shouldMoveToTrash($path){ |
@@ -80,7 +80,7 @@ |
||
80 | 80 | |
81 | 81 | /** |
82 | 82 | * @param array $parameters |
83 | - * @return int |
|
83 | + * @return string |
|
84 | 84 | */ |
85 | 85 | protected function getPath($parameters) { |
86 | 86 | $node = \OC::$server->getRootFolder() |
@@ -22,7 +22,6 @@ |
||
22 | 22 | namespace OCA\Testing\Locking; |
23 | 23 | |
24 | 24 | use OC\Lock\DBLockingProvider; |
25 | -use OC\Lock\MemcacheLockingProvider; |
|
26 | 25 | use OC\User\NoUserException; |
27 | 26 | use OCP\AppFramework\Http; |
28 | 27 | use OCP\Files\NotFoundException; |
@@ -33,7 +33,6 @@ |
||
33 | 33 | use OC\Core\Controller\CloudController; |
34 | 34 | use OC\Core\Controller\LoginController; |
35 | 35 | use OC\Core\Controller\LostController; |
36 | -use OC\Core\Controller\OccController; |
|
37 | 36 | use OC\Core\Controller\TokenController; |
38 | 37 | use OC\Core\Controller\TwoFactorChallengeController; |
39 | 38 | use OC\Core\Controller\UserController; |
@@ -101,6 +101,10 @@ |
||
101 | 101 | // TODO: dont check/enforce 2FA if a auth token is used |
102 | 102 | } |
103 | 103 | |
104 | + /** |
|
105 | + * @param Controller $controller |
|
106 | + * @param string $methodName |
|
107 | + */ |
|
104 | 108 | private function checkTwoFactor($controller, $methodName) { |
105 | 109 | // If two-factor auth is in progress disallow access to any controllers |
106 | 110 | // defined within "LoginController". |
@@ -402,6 +402,9 @@ |
||
402 | 402 | } |
403 | 403 | } |
404 | 404 | |
405 | + /** |
|
406 | + * @param string $path |
|
407 | + */ |
|
405 | 408 | private function getParentPath($path) { |
406 | 409 | $parent = dirname($path); |
407 | 410 | if ($parent === '.') { |