@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * |
71 | 71 | * @NoAdminRequired |
72 | 72 | * @NoSubadminRequired |
73 | - * @return array |
|
73 | + * @return DataResponse |
|
74 | 74 | */ |
75 | 75 | public function addPersonalRootCertificate() { |
76 | 76 | return $this->addCertificate($this->userCertificateManager); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Add a new root certificate to a trust store |
81 | 81 | * |
82 | 82 | * @param ICertificateManager $certificateManager |
83 | - * @return array |
|
83 | + * @return DataResponse |
|
84 | 84 | */ |
85 | 85 | private function addCertificate(ICertificateManager $certificateManager) { |
86 | 86 | $headers = []; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | /** |
159 | 159 | * Add a new personal root certificate to the system's trust store |
160 | 160 | * |
161 | - * @return array |
|
161 | + * @return DataResponse |
|
162 | 162 | */ |
163 | 163 | public function addSystemRootCertificate() { |
164 | 164 | return $this->addCertificate($this->systemCertificateManager); |
@@ -90,9 +90,9 @@ |
||
90 | 90 | |
91 | 91 | /** |
92 | 92 | * @param string $key |
93 | - * @param mixed $value |
|
93 | + * @param string|null $value |
|
94 | 94 | * @param int $ttl |
95 | - * @return bool|mixed |
|
95 | + * @return boolean |
|
96 | 96 | * @throws \OC\ForbiddenException |
97 | 97 | */ |
98 | 98 | public function set($key, $value, $ttl = 0) { |
@@ -110,7 +110,7 @@ |
||
110 | 110 | |
111 | 111 | /** |
112 | 112 | * Gets the correct header |
113 | - * @param Http::CONSTANT $status the constant from the Http class |
|
113 | + * @param integer $status the constant from the Http class |
|
114 | 114 | * @param \DateTime $lastModified formatted last modified date |
115 | 115 | * @param string $ETag the etag |
116 | 116 | * @return string |
@@ -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 | */ |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * Magic method to first get the real rootFolder and then |
35 | 35 | * call $method with $args on it |
36 | 36 | * |
37 | - * @param $method |
|
37 | + * @param string $method |
|
38 | 38 | * @param $args |
39 | 39 | * @return mixed |
40 | 40 | */ |
@@ -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 | } |
@@ -22,7 +22,6 @@ |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | namespace OC\Files\Storage; |
25 | -use OCP\Files\Storage\IStorage; |
|
26 | 25 | use OCP\Lock\ILockingProvider; |
27 | 26 | |
28 | 27 | /** |
@@ -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) { |
@@ -26,7 +26,6 @@ |
||
26 | 26 | namespace OC\Files\Storage\Wrapper; |
27 | 27 | |
28 | 28 | use OCP\Files\Cache\ICacheEntry; |
29 | -use OCP\Files\Storage\IStorage; |
|
30 | 29 | |
31 | 30 | class Quota extends Wrapper { |
32 | 31 |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | /** |
94 | 94 | * Formats the date of the given timestamp |
95 | 95 | * |
96 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
96 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
97 | 97 | * @param string $format Either 'full', 'long', 'medium' or 'short' |
98 | 98 | * full: e.g. 'EEEE, MMMM d, y' => 'Wednesday, August 20, 2014' |
99 | 99 | * long: e.g. 'MMMM d, y' => 'August 20, 2014' |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | /** |
193 | 193 | * Gives the relative past time of the timestamp |
194 | 194 | * |
195 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
195 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
196 | 196 | * @param int|\DateTime $baseTimestamp Timestamp to compare $timestamp against, defaults to current time |
197 | 197 | * @return string Dates returned are: |
198 | 198 | * < 60 sec => seconds ago |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * Formats the date and time of the given timestamp |
230 | 230 | * |
231 | - * @param int|\DateTime $timestamp Either a Unix timestamp or DateTime object |
|
231 | + * @param integer $timestamp Either a Unix timestamp or DateTime object |
|
232 | 232 | * @param string $formatDate See formatDate() for description |
233 | 233 | * @param string $formatTime See formatTime() for description |
234 | 234 | * @param \DateTimeZone $timeZone The timezone to use |
@@ -383,6 +383,14 @@ discard block |
||
383 | 383 | return $size; |
384 | 384 | } |
385 | 385 | |
386 | + /** |
|
387 | + * @param string $path |
|
388 | + * @param boolean $recursive |
|
389 | + * @param integer $reuse |
|
390 | + * @param integer|null $folderId |
|
391 | + * @param boolean $lock |
|
392 | + * @param integer $size |
|
393 | + */ |
|
386 | 394 | private function handleChildren($path, $recursive, $reuse, $folderId, $lock, &$size) { |
387 | 395 | // we put this in it's own function so it cleans up the memory before we start recursing |
388 | 396 | $existingChildren = $this->getExistingChildren($folderId); |
@@ -479,6 +487,9 @@ discard block |
||
479 | 487 | } |
480 | 488 | } |
481 | 489 | |
490 | + /** |
|
491 | + * @param string|boolean $path |
|
492 | + */ |
|
482 | 493 | private function runBackgroundScanJob(callable $callback, $path) { |
483 | 494 | try { |
484 | 495 | $callback(); |