@@ -30,7 +30,6 @@ |
||
30 | 30 | use OC\Files\Filesystem; |
31 | 31 | use OC\Files\View; |
32 | 32 | use OCP\Encryption\IEncryptionModule; |
33 | -use OCP\Files\Storage; |
|
34 | 33 | use OCP\IConfig; |
35 | 34 | |
36 | 35 | class Util { |
@@ -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 === '.') { |
@@ -386,6 +386,14 @@ discard block |
||
386 | 386 | return $size; |
387 | 387 | } |
388 | 388 | |
389 | + /** |
|
390 | + * @param string $path |
|
391 | + * @param boolean $recursive |
|
392 | + * @param integer $reuse |
|
393 | + * @param integer|null $folderId |
|
394 | + * @param boolean $lock |
|
395 | + * @param integer $size |
|
396 | + */ |
|
389 | 397 | private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) { |
390 | 398 | // we put this in it's own function so it cleans up the memory before we start recursing |
391 | 399 | $existingChildren = $this->getExistingChildren($folderId); |
@@ -485,6 +493,9 @@ discard block |
||
485 | 493 | } |
486 | 494 | } |
487 | 495 | |
496 | + /** |
|
497 | + * @param string|boolean $path |
|
498 | + */ |
|
488 | 499 | private function runBackgroundScanJob(callable $callback, $path) { |
489 | 500 | try { |
490 | 501 | $callback(); |
@@ -206,7 +206,7 @@ |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | - * @param $fileId |
|
209 | + * @param integer $fileId |
|
210 | 210 | * @return array |
211 | 211 | * @throws \OCP\Files\NotFoundException |
212 | 212 | */ |
@@ -24,14 +24,11 @@ |
||
24 | 24 | |
25 | 25 | namespace OC\Files\Config; |
26 | 26 | |
27 | -use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
|
28 | -use OC\Files\Filesystem; |
|
29 | 27 | use OCA\Files_Sharing\SharedMount; |
30 | 28 | use OCP\DB\QueryBuilder\IQueryBuilder; |
31 | 29 | use OCP\Files\Config\ICachedMountInfo; |
32 | 30 | use OCP\Files\Config\IUserMountCache; |
33 | 31 | use OCP\Files\Mount\IMountPoint; |
34 | -use OCP\Files\Node; |
|
35 | 32 | use OCP\Files\NotFoundException; |
36 | 33 | use OCP\ICache; |
37 | 34 | use OCP\IDBConnection; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | * Magic method to first get the real rootFolder and then |
53 | 53 | * call $method with $args on it |
54 | 54 | * |
55 | - * @param $method |
|
55 | + * @param string $method |
|
56 | 56 | * @param $args |
57 | 57 | * @return mixed |
58 | 58 | */ |
@@ -20,9 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | namespace OC\Files\Node; |
22 | 22 | |
23 | -use OC\Files\Mount\MountPoint; |
|
24 | 23 | use OCP\Files\IRootFolder; |
25 | -use OCP\Files\NotPermittedException; |
|
26 | 24 | |
27 | 25 | /** |
28 | 26 | * Class LazyRoot |
@@ -54,6 +54,9 @@ |
||
54 | 54 | $this->flysystem->addPlugin(new GetWithMetadata()); |
55 | 55 | } |
56 | 56 | |
57 | + /** |
|
58 | + * @param string $path |
|
59 | + */ |
|
57 | 60 | protected function buildPath($path) { |
58 | 61 | $fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path); |
59 | 62 | return ltrim($fullPath, '/'); |
@@ -99,6 +99,7 @@ discard block |
||
99 | 99 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
100 | 100 | * @param \OCP\Lock\ILockingProvider $provider |
101 | 101 | * @throws \OCP\Lock\LockedException |
102 | + * @return void |
|
102 | 103 | */ |
103 | 104 | public function acquireLock($path, $type, ILockingProvider $provider); |
104 | 105 | |
@@ -106,6 +107,7 @@ discard block |
||
106 | 107 | * @param string $path The path of the file to release the lock for |
107 | 108 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
108 | 109 | * @param \OCP\Lock\ILockingProvider $provider |
110 | + * @return void |
|
109 | 111 | */ |
110 | 112 | public function releaseLock($path, $type, ILockingProvider $provider); |
111 | 113 | |
@@ -114,6 +116,7 @@ discard block |
||
114 | 116 | * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE |
115 | 117 | * @param \OCP\Lock\ILockingProvider $provider |
116 | 118 | * @throws \OCP\Lock\LockedException |
119 | + * @return void |
|
117 | 120 | */ |
118 | 121 | public function changeLock($path, $type, ILockingProvider $provider); |
119 | 122 | } |
@@ -159,7 +159,7 @@ |
||
159 | 159 | * Checks whether the given path is a part file |
160 | 160 | * |
161 | 161 | * @param string $path Path that may identify a .part file |
162 | - * @return string File path without .part extension |
|
162 | + * @return boolean File path without .part extension |
|
163 | 163 | * @note this is needed for reusing keys |
164 | 164 | */ |
165 | 165 | private function isPartFile($path) { |
@@ -23,7 +23,6 @@ |
||
23 | 23 | |
24 | 24 | use OCP\Files\IMimeTypeLoader; |
25 | 25 | use OCP\IDBConnection; |
26 | - |
|
27 | 26 | use Doctrine\DBAL\Exception\UniqueConstraintViolationException; |
28 | 27 | |
29 | 28 | /** |