@@ -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 | } |
@@ -649,7 +649,7 @@ |
||
| 649 | 649 | /** |
| 650 | 650 | * Expire versions which exceed the quota |
| 651 | 651 | * |
| 652 | - * @param $filename |
|
| 652 | + * @param string $filename |
|
| 653 | 653 | * @param int|null $versionsSize |
| 654 | 654 | * @param int $offset |
| 655 | 655 | * @return bool|int|null |
@@ -58,6 +58,9 @@ discard block |
||
| 58 | 58 | ); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $gid |
|
| 63 | + */ |
|
| 61 | 64 | private function createGroup($gid) { |
| 62 | 65 | $group = $this->getMock('OCP\IGroup'); |
| 63 | 66 | $group |
@@ -66,6 +69,9 @@ discard block |
||
| 66 | 69 | return $group; |
| 67 | 70 | } |
| 68 | 71 | |
| 72 | + /** |
|
| 73 | + * @param string $uid |
|
| 74 | + */ |
|
| 69 | 75 | private function createUser($uid) { |
| 70 | 76 | $user = $this->getMock('OCP\IUser'); |
| 71 | 77 | $user |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | use OCA\Provisioning_API\Users; |
| 30 | 30 | use OCP\IUserManager; |
| 31 | 31 | use OCP\IConfig; |
| 32 | -use OCP\IGroupManager; |
|
| 33 | 32 | use OCP\IUserSession; |
| 34 | 33 | use Test\TestCase as OriginalTest; |
| 35 | 34 | use OCP\ILogger; |
@@ -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 |
@@ -864,7 +864,7 @@ discard block |
||
| 864 | 864 | * @param integer $filterType int, for which use case the filter shall be created |
| 865 | 865 | * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or |
| 866 | 866 | * self::LFILTER_GROUP_LIST |
| 867 | - * @return string|false string with the filter on success, false otherwise |
|
| 867 | + * @return string string with the filter on success, false otherwise |
|
| 868 | 868 | * @throws \Exception |
| 869 | 869 | */ |
| 870 | 870 | private function composeLdapFilter($filterType) { |
@@ -1107,7 +1107,7 @@ discard block |
||
| 1107 | 1107 | } |
| 1108 | 1108 | |
| 1109 | 1109 | /** |
| 1110 | - * @param array $reqs |
|
| 1110 | + * @param string[] $reqs |
|
| 1111 | 1111 | * @return bool |
| 1112 | 1112 | */ |
| 1113 | 1113 | private function checkRequirements($reqs) { |
@@ -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; |