@@ -242,6 +242,9 @@ |
||
242 | 242 | // noop |
243 | 243 | } |
244 | 244 | |
245 | + /** |
|
246 | + * @param string $path |
|
247 | + */ |
|
245 | 248 | public function stripUserFilesPathDummy($path) { |
246 | 249 | return $this->stripUserFilesPath($path); |
247 | 250 | } |
@@ -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){ |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * |
148 | 148 | * @param string $sourcePath |
149 | 149 | * @param string $owner |
150 | - * @param $targetPath |
|
150 | + * @param string $targetPath |
|
151 | 151 | * @param $user |
152 | 152 | * @param integer $timestamp |
153 | 153 | */ |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | * @param string $uniqueFilename new file name to restore the file without overwriting existing files |
425 | 425 | * @param string $location location if file |
426 | 426 | * @param int $timestamp deletion time |
427 | - * @return bool |
|
427 | + * @return false|null |
|
428 | 428 | */ |
429 | 429 | private static function restoreVersions(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) { |
430 | 430 | |
@@ -514,9 +514,10 @@ discard block |
||
514 | 514 | |
515 | 515 | /** |
516 | 516 | * @param \OC\Files\View $view |
517 | - * @param $file |
|
518 | - * @param $filename |
|
519 | - * @param $timestamp |
|
517 | + * @param string $file |
|
518 | + * @param string $filename |
|
519 | + * @param integer|null $timestamp |
|
520 | + * @param string $user |
|
520 | 521 | * @return int |
521 | 522 | */ |
522 | 523 | private static function deleteVersions(\OC\Files\View $view, $file, $filename, $timestamp, $user) { |
@@ -700,7 +701,7 @@ discard block |
||
700 | 701 | * |
701 | 702 | * @param array $files list of files sorted by mtime |
702 | 703 | * @param string $user |
703 | - * @return array size of deleted files and number of deleted files |
|
704 | + * @return integer[] size of deleted files and number of deleted files |
|
704 | 705 | */ |
705 | 706 | public static function deleteExpiredFiles($files, $user) { |
706 | 707 | $application = new Application(); |
@@ -246,8 +246,8 @@ discard block |
||
246 | 246 | |
247 | 247 | /** |
248 | 248 | * verify that the array contains the expected results |
249 | - * @param array $result |
|
250 | - * @param array $expected |
|
249 | + * @param OCP\Files\FileInfo[] $result |
|
250 | + * @param string[] $expected |
|
251 | 251 | */ |
252 | 252 | private function verifyArray($result, $expected) { |
253 | 253 | $this->assertSame(count($expected), count($result)); |
@@ -266,6 +266,11 @@ discard block |
||
266 | 266 | } |
267 | 267 | } |
268 | 268 | |
269 | + /** |
|
270 | + * @param OCP\Files\FileInfo[] $files |
|
271 | + * @param string $trashRoot |
|
272 | + * @param integer $expireDate |
|
273 | + */ |
|
269 | 274 | private function manipulateDeleteTime($files, $trashRoot, $expireDate) { |
270 | 275 | $counter = 0; |
271 | 276 | foreach ($files as &$file) { |
@@ -625,7 +630,6 @@ discard block |
||
625 | 630 | /** |
626 | 631 | * @param string $user |
627 | 632 | * @param bool $create |
628 | - * @param bool $password |
|
629 | 633 | */ |
630 | 634 | public static function loginHelper($user, $create = false) { |
631 | 635 | if ($create) { |
@@ -648,11 +652,20 @@ discard block |
||
648 | 652 | |
649 | 653 | // just a dummy class to make protected methods available for testing |
650 | 654 | class TrashbinForTesting extends Files_Trashbin\Trashbin { |
655 | + |
|
656 | + /** |
|
657 | + * @param OCP\Files\FileInfo[] $files |
|
658 | + * @param integer $limit |
|
659 | + */ |
|
651 | 660 | public function dummyDeleteExpiredFiles($files, $limit) { |
652 | 661 | // dummy value for $retention_obligation because it is not needed here |
653 | 662 | return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0); |
654 | 663 | } |
655 | 664 | |
665 | + /** |
|
666 | + * @param OCP\Files\FileInfo[] $files |
|
667 | + * @param integer $availableSpace |
|
668 | + */ |
|
656 | 669 | public function dummyDeleteFiles($files, $availableSpace) { |
657 | 670 | return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace); |
658 | 671 | } |
@@ -73,8 +73,6 @@ |
||
73 | 73 | /** |
74 | 74 | * save the configuration value as provided |
75 | 75 | * @param string $configID |
76 | - * @param string $configKey |
|
77 | - * @param string $configValue |
|
78 | 76 | */ |
79 | 77 | protected function setValue($configID, $key, $value) { |
80 | 78 | $configHolder = new Configuration($configID); |
@@ -281,7 +281,6 @@ |
||
281 | 281 | * |
282 | 282 | * @param string $varName name of config-key |
283 | 283 | * @param array|string $value to set |
284 | - * @param boolean $trim Trim value? (default: false) |
|
285 | 284 | */ |
286 | 285 | protected function setMultiLine($varName, $value) { |
287 | 286 | if(empty($value)) { |
@@ -68,7 +68,7 @@ |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
71 | - * @return int |
|
71 | + * @return string |
|
72 | 72 | */ |
73 | 73 | static private function getRefreshInterval() { |
74 | 74 | //defaults to every hour |
@@ -21,7 +21,6 @@ |
||
21 | 21 | |
22 | 22 | namespace OCA\user_ldap\tests\integration\lib; |
23 | 23 | |
24 | -use OCA\user_ldap\lib\user\Manager as LDAPUserManager; |
|
25 | 24 | use OCA\user_ldap\tests\integration\AbstractIntegrationTest; |
26 | 25 | use OCA\User_LDAP\Mapping\UserMapping; |
27 | 26 | use OCA\user_ldap\USER_LDAP; |
@@ -149,8 +149,8 @@ |
||
149 | 149 | * Get a list of all users |
150 | 150 | * |
151 | 151 | * @param string $search |
152 | - * @param null|int $limit |
|
153 | - * @param null|int $offset |
|
152 | + * @param integer $limit |
|
153 | + * @param integer $offset |
|
154 | 154 | * @return string[] an array of all uids |
155 | 155 | */ |
156 | 156 | public function getUsers($search = '', $limit = 10, $offset = 0) { |