@@ -204,7 +204,7 @@ |
||
204 | 204 | |
205 | 205 | /** |
206 | 206 | * @param string $path |
207 | - * @return INode|null |
|
207 | + * @return null|Node |
|
208 | 208 | */ |
209 | 209 | protected function getNodeForPath($path){ |
210 | 210 | $node = parent::getNodeForPath($path); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | /** |
49 | 49 | * @param string $table name |
50 | - * @return int id of last insert statement |
|
50 | + * @return string id of last insert statement |
|
51 | 51 | */ |
52 | 52 | public function lastInsertId($table) { |
53 | 53 | return $this->conn->realLastInsertId($table); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | /** |
120 | 120 | * Inserts, or updates a row into the database. Returns the inserted or updated rows |
121 | - * @param $table string table name including **PREFIX** |
|
121 | + * @param string $table string table name including **PREFIX** |
|
122 | 122 | * @param $input array the key=>value pairs to insert into the db row |
123 | 123 | * @param $compare array columns that should be compared to look for existing arrays |
124 | 124 | * @return int the number of rows affected by the operation |
@@ -449,7 +449,7 @@ |
||
449 | 449 | * In some environments the system config file is readonly. Find out if this |
450 | 450 | * is the case. |
451 | 451 | * |
452 | - * @return boolean |
|
452 | + * @return false|string |
|
453 | 453 | * @since 10.0.3 |
454 | 454 | */ |
455 | 455 | public function isSystemConfigReadOnly() { |
@@ -109,7 +109,7 @@ |
||
109 | 109 | /** |
110 | 110 | * Returns the Reply-To address of this message |
111 | 111 | * |
112 | - * @return array |
|
112 | + * @return string |
|
113 | 113 | */ |
114 | 114 | public function getReplyTo() { |
115 | 115 | return $this->swiftMessage->getReplyTo(); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * This method should set up the required event subscriptions. |
63 | 63 | * |
64 | 64 | * @param \Sabre\DAV\Server $server |
65 | - * @return void |
|
65 | + * @return false|null |
|
66 | 66 | */ |
67 | 67 | public function initialize(\Sabre\DAV\Server $server) { |
68 | 68 | $this->server = $server; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @param RequestInterface $request |
97 | 97 | * @param ResponseInterface $response |
98 | 98 | * |
99 | - * @return false |
|
99 | + * @return false|null |
|
100 | 100 | */ |
101 | 101 | public function setOptionsRequestHeaders(RequestInterface $request, ResponseInterface $response) { |
102 | 102 | $authorization = $request->getHeader('Authorization'); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | /** |
123 | 123 | * List all installed apps |
124 | 124 | * |
125 | - * @return string[] |
|
125 | + * @return integer[] |
|
126 | 126 | */ |
127 | 127 | public function getInstalledApps() { |
128 | 128 | return array_keys($this->getInstalledAppsValues()); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | /** |
232 | 232 | * Do not allow more than one active app-theme |
233 | 233 | * |
234 | - * @param $appId |
|
234 | + * @param string $appId |
|
235 | 235 | * @throws AppManagerException |
236 | 236 | */ |
237 | 237 | protected function canEnableTheme($appId) { |
@@ -390,6 +390,9 @@ discard block |
||
390 | 390 | return in_array($appId, $this->shippedApps); |
391 | 391 | } |
392 | 392 | |
393 | + /** |
|
394 | + * @param string $appId |
|
395 | + */ |
|
393 | 396 | private function isAlwaysEnabled($appId) { |
394 | 397 | $alwaysEnabled = $this->getAlwaysEnabledApps(); |
395 | 398 | return in_array($appId, $alwaysEnabled); |
@@ -418,7 +421,7 @@ discard block |
||
418 | 421 | /** |
419 | 422 | * @param string $package package path |
420 | 423 | * @param bool $skipMigrations whether to skip migrations, which would only install the code |
421 | - * @return string|false app id or false in case of error |
|
424 | + * @return integer app id or false in case of error |
|
422 | 425 | * @since 10.0 |
423 | 426 | */ |
424 | 427 | public function installApp($package, $skipMigrations = false) { |
@@ -431,7 +434,7 @@ discard block |
||
431 | 434 | |
432 | 435 | /** |
433 | 436 | * @param string $package |
434 | - * @return mixed |
|
437 | + * @return boolean |
|
435 | 438 | * @since 10.0 |
436 | 439 | */ |
437 | 440 | public function updateApp($package) { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @param string $wrongPath wrong path of the entry to fix |
96 | 96 | * @param int $correctStorageNumericId numeric idea of the correct storage |
97 | 97 | * @param string $correctPath value to which to set the path of the entry |
98 | - * @return bool true for success |
|
98 | + * @return boolean|null true for success |
|
99 | 99 | */ |
100 | 100 | private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) { |
101 | 101 | // delete target if exists |
@@ -125,6 +125,9 @@ discard block |
||
125 | 125 | $out->advance(1, $text); |
126 | 126 | } |
127 | 127 | |
128 | + /** |
|
129 | + * @param \OCP\DB\QueryBuilder\IQueryBuilder $qb |
|
130 | + */ |
|
128 | 131 | private function addQueryConditionsParentIdWrongPath($qb) { |
129 | 132 | // thanks, VicDeo! |
130 | 133 | if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { |
@@ -164,6 +167,9 @@ discard block |
||
164 | 167 | } |
165 | 168 | } |
166 | 169 | |
170 | + /** |
|
171 | + * @param \OCP\DB\QueryBuilder\IQueryBuilder $qb |
|
172 | + */ |
|
167 | 173 | private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) { |
168 | 174 | // Subquery for parent existence |
169 | 175 | $qbe = $this->connection->getQueryBuilder(); |
@@ -193,6 +199,9 @@ discard block |
||
193 | 199 | } |
194 | 200 | } |
195 | 201 | |
202 | + /** |
|
203 | + * @param integer $storageNumericId |
|
204 | + */ |
|
196 | 205 | private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { |
197 | 206 | $qb = $this->connection->getQueryBuilder(); |
198 | 207 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -203,6 +212,9 @@ discard block |
||
203 | 212 | return $count; |
204 | 213 | } |
205 | 214 | |
215 | + /** |
|
216 | + * @param integer $storageNumericId |
|
217 | + */ |
|
206 | 218 | private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) { |
207 | 219 | $qb = $this->connection->getQueryBuilder(); |
208 | 220 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -353,6 +365,7 @@ discard block |
||
353 | 365 | * |
354 | 366 | * @param int $storageId storage id |
355 | 367 | * @param string $path path for which to create the parent entry |
368 | + * @param integer $reuseFileId |
|
356 | 369 | * @return int file id of the newly created parent |
357 | 370 | */ |
358 | 371 | private function getOrCreateEntry($storageId, $path, $reuseFileId = null) { |
@@ -269,6 +269,9 @@ discard block |
||
269 | 269 | ], 'file', 'create'); |
270 | 270 | } |
271 | 271 | |
272 | + /** |
|
273 | + * @param string $path |
|
274 | + */ |
|
272 | 275 | private function getPartFileBasePath($path) { |
273 | 276 | $partFileInStorage = \OC::$server->getConfig()->getSystemValue('part_file_in_storage', true); |
274 | 277 | if ($partFileInStorage) { |
@@ -654,7 +657,7 @@ discard block |
||
654 | 657 | /** |
655 | 658 | * Set $algo to get a specific checksum, leave null to get all checksums |
656 | 659 | * (space seperated) |
657 | - * @param null $algo |
|
660 | + * @param string $algo |
|
658 | 661 | * @return string |
659 | 662 | */ |
660 | 663 | public function getChecksum($algo = null) { |
@@ -677,6 +680,9 @@ discard block |
||
677 | 680 | return ''; |
678 | 681 | } |
679 | 682 | |
683 | + /** |
|
684 | + * @param string $string |
|
685 | + */ |
|
680 | 686 | protected function header($string) { |
681 | 687 | \header($string); |
682 | 688 | } |
@@ -23,11 +23,8 @@ |
||
23 | 23 | namespace OCA\Encryption\Command; |
24 | 24 | |
25 | 25 | use OC\Encryption\DecryptAll; |
26 | -use OC\Encryption\Exceptions\DecryptionFailedException; |
|
27 | 26 | use OC\Encryption\Manager; |
28 | -use OC\Files\Filesystem; |
|
29 | 27 | use OC\Files\View; |
30 | -use OC\Memcache\ArrayCache; |
|
31 | 28 | use OCA\Encryption\Crypto\EncryptAll; |
32 | 29 | use OCA\Encryption\KeyManager; |
33 | 30 | use OCA\Encryption\Users\Setup; |