@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param string $wrongPath wrong path of the entry to fix |
98 | 98 | * @param int $correctStorageNumericId numeric idea of the correct storage |
99 | 99 | * @param string $correctPath value to which to set the path of the entry |
100 | - * @return bool true for success |
|
100 | + * @return boolean|null true for success |
|
101 | 101 | */ |
102 | 102 | private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) { |
103 | 103 | // delete target if exists |
@@ -122,6 +122,9 @@ discard block |
||
122 | 122 | $out->advance(1, $text); |
123 | 123 | } |
124 | 124 | |
125 | + /** |
|
126 | + * @param IQueryBuilder $qb |
|
127 | + */ |
|
125 | 128 | private function addQueryConditionsParentIdWrongPath($qb) { |
126 | 129 | // thanks, VicDeo! |
127 | 130 | if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { |
@@ -161,6 +164,9 @@ discard block |
||
161 | 164 | } |
162 | 165 | } |
163 | 166 | |
167 | + /** |
|
168 | + * @param IQueryBuilder $qb |
|
169 | + */ |
|
164 | 170 | private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) { |
165 | 171 | // Subquery for parent existence |
166 | 172 | $qbe = $this->connection->getQueryBuilder(); |
@@ -190,6 +196,9 @@ discard block |
||
190 | 196 | } |
191 | 197 | } |
192 | 198 | |
199 | + /** |
|
200 | + * @param integer $storageNumericId |
|
201 | + */ |
|
193 | 202 | private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { |
194 | 203 | $qb = $this->connection->getQueryBuilder(); |
195 | 204 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -200,6 +209,9 @@ discard block |
||
200 | 209 | return $count; |
201 | 210 | } |
202 | 211 | |
212 | + /** |
|
213 | + * @param integer $storageNumericId |
|
214 | + */ |
|
203 | 215 | private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) { |
204 | 216 | $qb = $this->connection->getQueryBuilder(); |
205 | 217 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -350,6 +362,7 @@ discard block |
||
350 | 362 | * |
351 | 363 | * @param int $storageId storage id |
352 | 364 | * @param string $path path for which to create the parent entry |
365 | + * @param integer $reuseFileId |
|
353 | 366 | * @return int file id of the newly created parent |
354 | 367 | */ |
355 | 368 | private function getOrCreateEntry($storageId, $path, $reuseFileId = null) { |
@@ -21,8 +21,6 @@ |
||
21 | 21 | |
22 | 22 | namespace OC\Repair; |
23 | 23 | |
24 | -use Doctrine\DBAL\Platforms\PostgreSqlPlatform; |
|
25 | -use OCP\DB\QueryBuilder\IQueryBuilder; |
|
26 | 24 | use OCP\Migration\IOutput; |
27 | 25 | use OCP\Migration\IRepairStep; |
28 | 26 | use Doctrine\DBAL\Platforms\MySqlPlatform; |
@@ -50,6 +50,9 @@ |
||
50 | 50 | return $location; |
51 | 51 | } |
52 | 52 | |
53 | + /** |
|
54 | + * @param string $path |
|
55 | + */ |
|
53 | 56 | public function buildPath($path) { |
54 | 57 | $location = parent::buildPath($path); |
55 | 58 | if ($this->isCaseInsensitiveStorage) { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * @param string $path |
175 | 175 | * @throws \OCP\Files\NotFoundException |
176 | 176 | * @throws \OCP\Files\NotPermittedException |
177 | - * @return string |
|
177 | + * @return \OCP\Files\Node |
|
178 | 178 | */ |
179 | 179 | public function get($path) { |
180 | 180 | $path = $this->normalizePath($path); |
@@ -371,6 +371,9 @@ discard block |
||
371 | 371 | |
372 | 372 | } |
373 | 373 | |
374 | + /** |
|
375 | + * @param string $fullPath |
|
376 | + */ |
|
374 | 377 | private function resolveVirtualNode($fullPath) { |
375 | 378 | $pieces = explode('/', $fullPath); |
376 | 379 | if ($pieces[1] !== 'meta') { |
@@ -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,6 @@ |
||
47 | 47 | use OCP\Files\StorageNotAvailableException; |
48 | 48 | use OCP\Util; |
49 | 49 | use Sabre\DAV\Xml\Property\ResourceType; |
50 | -use Sabre\HTTP\ClientException; |
|
51 | 50 | use Sabre\HTTP\ClientHttpException; |
52 | 51 | use Sabre\DAV\Exception\InsufficientStorage; |
53 | 52 | use OCA\DAV\Connector\Sabre\Exception\Forbidden; |
@@ -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 |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * @param IRequest $request |
305 | 305 | * @throws LoginException |
306 | 306 | * @throws PasswordLoginForbiddenException |
307 | - * @return boolean |
|
307 | + * @return boolean|null |
|
308 | 308 | */ |
309 | 309 | public function logClientIn($user, $password, IRequest $request) { |
310 | 310 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -347,6 +347,9 @@ discard block |
||
347 | 347 | return $this->config->getSystemValue('token_auth_enforced', false); |
348 | 348 | } |
349 | 349 | |
350 | + /** |
|
351 | + * @param string $username |
|
352 | + */ |
|
350 | 353 | protected function isTwoFactorEnforced($username) { |
351 | 354 | Util::emitHook( |
352 | 355 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -790,7 +793,7 @@ discard block |
||
790 | 793 | /** |
791 | 794 | * logout the user from the session |
792 | 795 | * |
793 | - * @return bool |
|
796 | + * @return boolean|null |
|
794 | 797 | */ |
795 | 798 | public function logout() { |
796 | 799 | |
@@ -871,6 +874,9 @@ discard block |
||
871 | 874 | } |
872 | 875 | } |
873 | 876 | |
877 | + /** |
|
878 | + * @param IRequest $request |
|
879 | + */ |
|
874 | 880 | public function verifyAuthHeaders($request) { |
875 | 881 | foreach ($this->getAuthModules(true) as $module) { |
876 | 882 | $user = $module->auth($request); |
@@ -890,7 +896,7 @@ discard block |
||
890 | 896 | } |
891 | 897 | |
892 | 898 | /** |
893 | - * @param $includeBuiltIn |
|
899 | + * @param boolean $includeBuiltIn |
|
894 | 900 | * @return \Generator | IAuthModule[] |
895 | 901 | * @throws Exception |
896 | 902 | */ |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | * Set the flag to true, so that the file would be |
673 | 673 | * in the decrypted state. |
674 | 674 | * |
675 | - * @param $isDisabled bool |
|
675 | + * @param boolean $isDisabled bool |
|
676 | 676 | */ |
677 | 677 | public static function setDisableWriteEncryption($isDisabled) { |
678 | 678 | self::$disableWriteEncryption = $isDisabled; |
@@ -929,7 +929,7 @@ discard block |
||
929 | 929 | /** |
930 | 930 | * return header size of given file |
931 | 931 | * |
932 | - * @param string|resource $path |
|
932 | + * @param string $path |
|
933 | 933 | * @return int |
934 | 934 | */ |
935 | 935 | protected function getHeaderSize($path) { |
@@ -980,7 +980,7 @@ discard block |
||
980 | 980 | /** |
981 | 981 | * read header from file |
982 | 982 | * |
983 | - * @param string|resource $path |
|
983 | + * @param string $path |
|
984 | 984 | * @return array |
985 | 985 | */ |
986 | 986 | protected function getHeader($path) { |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | /** |
1077 | 1077 | * check if path points to a files version |
1078 | 1078 | * |
1079 | - * @param $path |
|
1079 | + * @param string $path |
|
1080 | 1080 | * @return bool |
1081 | 1081 | */ |
1082 | 1082 | protected function isVersion($path) { |
@@ -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() { |