@@ -279,7 +279,7 @@ |
||
| 279 | 279 | /** |
| 280 | 280 | * get share ID |
| 281 | 281 | * |
| 282 | - * @return integer unique share ID |
|
| 282 | + * @return string unique share ID |
|
| 283 | 283 | */ |
| 284 | 284 | public function getShareId() { |
| 285 | 285 | return $this->newShare->getId(); |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | * if the size limit for the trash bin is reached, we delete the oldest |
| 672 | 672 | * files in the trash bin until we meet the limit again |
| 673 | 673 | * |
| 674 | - * @param array $files |
|
| 674 | + * @param \OCP\Files\FileInfo[] $files |
|
| 675 | 675 | * @param string $user |
| 676 | 676 | * @param int $availableSpace available disc space |
| 677 | 677 | * @return int size of deleted files |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | /** |
| 700 | 700 | * delete files older then max storage time |
| 701 | 701 | * |
| 702 | - * @param array $files list of files sorted by mtime |
|
| 702 | + * @param \OCP\Files\FileInfo[] $files list of files sorted by mtime |
|
| 703 | 703 | * @param string $user |
| 704 | 704 | * @return integer[] size of deleted files and number of deleted files |
| 705 | 705 | */ |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | namespace OCA\Testing\Locking; |
| 23 | 23 | |
| 24 | 24 | use OC\Lock\DBLockingProvider; |
| 25 | -use OC\Lock\MemcacheLockingProvider; |
|
| 26 | 25 | use OC\User\NoUserException; |
| 27 | 26 | use OCP\AppFramework\Http; |
| 28 | 27 | use OCP\Files\NotFoundException; |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | - * @return int |
|
| 80 | + * @return string |
|
| 81 | 81 | */ |
| 82 | 82 | static private function getRefreshInterval() { |
| 83 | 83 | //defaults to every hour |
@@ -102,6 +102,9 @@ |
||
| 102 | 102 | return \OC_App::getAppVersions(); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | + /** |
|
| 106 | + * @param string $appId |
|
| 107 | + */ |
|
| 105 | 108 | protected function getAppInfo($appId) { |
| 106 | 109 | return \OC_App::getAppInfo($appId); |
| 107 | 110 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | |
| 396 | 396 | /** |
| 397 | 397 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
| 398 | - * @param string $dn the dn of the user object |
|
| 398 | + * @param string $fdn the dn of the user object |
|
| 399 | 399 | * @param string $ldapName optional, the display name of the object |
| 400 | 400 | * @return string|false with with the name to use in ownCloud |
| 401 | 401 | */ |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | |
| 413 | 413 | /** |
| 414 | 414 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
| 415 | - * @param string $dn the dn of the user object |
|
| 415 | + * @param string $fdn the dn of the user object |
|
| 416 | 416 | * @param string $ldapName optional, the display name of the object |
| 417 | 417 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
| 418 | 418 | * @return string|false with with the name to use in ownCloud |
@@ -672,7 +672,7 @@ discard block |
||
| 672 | 672 | * the login filter. |
| 673 | 673 | * |
| 674 | 674 | * @param string $loginName |
| 675 | - * @param array $attributes optional, list of attributes to read |
|
| 675 | + * @param string[] $attributes optional, list of attributes to read |
|
| 676 | 676 | * @return array |
| 677 | 677 | */ |
| 678 | 678 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | |
| 739 | 739 | /** |
| 740 | 740 | * @param string $filter |
| 741 | - * @param string|string[] $attr |
|
| 741 | + * @param string[] $attr |
|
| 742 | 742 | * @param int $limit |
| 743 | 743 | * @param int $offset |
| 744 | 744 | * @return array |
@@ -786,7 +786,7 @@ discard block |
||
| 786 | 786 | |
| 787 | 787 | /** |
| 788 | 788 | * @param string $filter |
| 789 | - * @param string|string[] $attr |
|
| 789 | + * @param string[] $attr |
|
| 790 | 790 | * @param int $limit |
| 791 | 791 | * @param int $offset |
| 792 | 792 | * @return false|int |
@@ -836,6 +836,7 @@ discard block |
||
| 836 | 836 | * retrieved. Results will according to the order in the array. |
| 837 | 837 | * @param int $limit optional, maximum results to be counted |
| 838 | 838 | * @param int $offset optional, a starting point |
| 839 | + * @param string $filter |
|
| 839 | 840 | * @return array|false array with the search result as first value and pagedSearchOK as |
| 840 | 841 | * second | false if not successful |
| 841 | 842 | */ |
@@ -882,7 +883,7 @@ discard block |
||
| 882 | 883 | * @param bool $pagedSearchOK whether a paged search has been executed |
| 883 | 884 | * @param bool $skipHandling required for paged search when cookies to |
| 884 | 885 | * prior results need to be gained |
| 885 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
| 886 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
| 886 | 887 | */ |
| 887 | 888 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
| 888 | 889 | $cookie = null; |
@@ -1091,7 +1092,7 @@ discard block |
||
| 1091 | 1092 | |
| 1092 | 1093 | /** |
| 1093 | 1094 | * @param string $name |
| 1094 | - * @return bool|mixed|string |
|
| 1095 | + * @return string |
|
| 1095 | 1096 | */ |
| 1096 | 1097 | public function sanitizeUsername($name) { |
| 1097 | 1098 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1115,6 +1116,7 @@ discard block |
||
| 1115 | 1116 | * escapes (user provided) parts for LDAP filter |
| 1116 | 1117 | * @param string $input, the provided value |
| 1117 | 1118 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
| 1119 | + * @param string $input |
|
| 1118 | 1120 | * @return string the escaped string |
| 1119 | 1121 | */ |
| 1120 | 1122 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1673,7 +1675,7 @@ discard block |
||
| 1673 | 1675 | |
| 1674 | 1676 | /** |
| 1675 | 1677 | * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. |
| 1676 | - * @return boolean|null true on success, null or false otherwise |
|
| 1678 | + * @return boolean true on success, null or false otherwise |
|
| 1677 | 1679 | */ |
| 1678 | 1680 | public function getPagedSearchResultState() { |
| 1679 | 1681 | $result = $this->pagedSearchedSuccessful; |
@@ -1688,7 +1690,7 @@ discard block |
||
| 1688 | 1690 | * @param string[] $attr optional, when a certain attribute shall be filtered outside |
| 1689 | 1691 | * @param int $limit |
| 1690 | 1692 | * @param int $offset |
| 1691 | - * @return bool|true |
|
| 1693 | + * @return boolean |
|
| 1692 | 1694 | */ |
| 1693 | 1695 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
| 1694 | 1696 | $pagedSearchOK = false; |
@@ -74,8 +74,6 @@ |
||
| 74 | 74 | /** |
| 75 | 75 | * save the configuration value as provided |
| 76 | 76 | * @param string $configID |
| 77 | - * @param string $configKey |
|
| 78 | - * @param string $configValue |
|
| 79 | 77 | */ |
| 80 | 78 | protected function setValue($configID, $key, $value) { |
| 81 | 79 | $configHolder = new Configuration($configID); |
@@ -77,7 +77,7 @@ |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | - * @return int |
|
| 80 | + * @return string |
|
| 81 | 81 | */ |
| 82 | 82 | static private function getRefreshInterval() { |
| 83 | 83 | //defaults to every hour |
@@ -867,7 +867,7 @@ discard block |
||
| 867 | 867 | * @param integer $filterType int, for which use case the filter shall be created |
| 868 | 868 | * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or |
| 869 | 869 | * self::LFILTER_GROUP_LIST |
| 870 | - * @return string|false string with the filter on success, false otherwise |
|
| 870 | + * @return string string with the filter on success, false otherwise |
|
| 871 | 871 | * @throws \Exception |
| 872 | 872 | */ |
| 873 | 873 | private function composeLdapFilter($filterType) { |
@@ -1103,7 +1103,7 @@ discard block |
||
| 1103 | 1103 | } |
| 1104 | 1104 | |
| 1105 | 1105 | /** |
| 1106 | - * @param array $reqs |
|
| 1106 | + * @param string[] $reqs |
|
| 1107 | 1107 | * @return bool |
| 1108 | 1108 | */ |
| 1109 | 1109 | private function checkRequirements($reqs) { |
@@ -32,7 +32,6 @@ |
||
| 32 | 32 | use Symfony\Component\Console\Input\InputInterface; |
| 33 | 33 | use Symfony\Component\Console\Input\InputOption; |
| 34 | 34 | use Symfony\Component\Console\Output\OutputInterface; |
| 35 | -use Symfony\Component\EventDispatcher\EventDispatcher; |
|
| 36 | 35 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
| 37 | 36 | use Symfony\Component\EventDispatcher\GenericEvent; |
| 38 | 37 | |