@@ -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')) { |
@@ -745,7 +745,7 @@ discard block |
||
745 | 745 | |
746 | 746 | /** |
747 | 747 | * @param string $filter |
748 | - * @param string|string[] $attr |
|
748 | + * @param string[] $attr |
|
749 | 749 | * @param int $limit |
750 | 750 | * @param int $offset |
751 | 751 | * @return array |
@@ -793,7 +793,7 @@ discard block |
||
793 | 793 | |
794 | 794 | /** |
795 | 795 | * @param string $filter |
796 | - * @param string|string[] $attr |
|
796 | + * @param string[] $attr |
|
797 | 797 | * @param int $limit |
798 | 798 | * @param int $offset |
799 | 799 | * @return false|int |
@@ -843,6 +843,7 @@ discard block |
||
843 | 843 | * retrieved. Results will according to the order in the array. |
844 | 844 | * @param int $limit optional, maximum results to be counted |
845 | 845 | * @param int $offset optional, a starting point |
846 | + * @param string $filter |
|
846 | 847 | * @return array|false array with the search result as first value and pagedSearchOK as |
847 | 848 | * second | false if not successful |
848 | 849 | */ |
@@ -889,7 +890,7 @@ discard block |
||
889 | 890 | * @param bool $pagedSearchOK whether a paged search has been executed |
890 | 891 | * @param bool $skipHandling required for paged search when cookies to |
891 | 892 | * prior results need to be gained |
892 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
893 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
893 | 894 | */ |
894 | 895 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
895 | 896 | $cookie = null; |
@@ -1098,7 +1099,7 @@ discard block |
||
1098 | 1099 | |
1099 | 1100 | /** |
1100 | 1101 | * @param string $name |
1101 | - * @return bool|mixed|string |
|
1102 | + * @return string |
|
1102 | 1103 | */ |
1103 | 1104 | public function sanitizeUsername($name) { |
1104 | 1105 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1122,6 +1123,7 @@ discard block |
||
1122 | 1123 | * escapes (user provided) parts for LDAP filter |
1123 | 1124 | * @param string $input, the provided value |
1124 | 1125 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1126 | + * @param string $input |
|
1125 | 1127 | * @return string the escaped string |
1126 | 1128 | */ |
1127 | 1129 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1100,7 +1100,7 @@ |
||
1100 | 1100 | } |
1101 | 1101 | |
1102 | 1102 | /** |
1103 | - * @param array $reqs |
|
1103 | + * @param string[] $reqs |
|
1104 | 1104 | * @return bool |
1105 | 1105 | */ |
1106 | 1106 | private function checkRequirements($reqs) { |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | /** |
72 | 72 | * @param array $entry |
73 | - * @return array |
|
73 | + * @return string |
|
74 | 74 | */ |
75 | 75 | protected function formatCacheEntry($entry) { |
76 | 76 | if (isset($entry['path'])) { |
@@ -189,6 +189,9 @@ discard block |
||
189 | 189 | return $this->cache->getStatus($this->getSourcePath($file)); |
190 | 190 | } |
191 | 191 | |
192 | + /** |
|
193 | + * @param \OCP\Files\Cache\ICacheEntry[] $results |
|
194 | + */ |
|
192 | 195 | private function formatSearchResults($results) { |
193 | 196 | $results = array_filter($results, array($this, 'filterCacheEntry')); |
194 | 197 | $results = array_values($results); |
@@ -52,7 +52,7 @@ |
||
52 | 52 | * Wrapper around file_put_contents($filename, $data) |
53 | 53 | * |
54 | 54 | * @param string $filename |
55 | - * @param $data |
|
55 | + * @param string $data |
|
56 | 56 | * @return int|false |
57 | 57 | */ |
58 | 58 | public function file_put_contents($filename, $data) { |
@@ -150,7 +150,6 @@ |
||
150 | 150 | /** |
151 | 151 | * saves database schema to xml file |
152 | 152 | * @param string $file name of file |
153 | - * @param int $mode |
|
154 | 153 | * @return bool |
155 | 154 | * |
156 | 155 | * TODO: write more documentation |
@@ -412,6 +412,10 @@ |
||
412 | 412 | return $url; |
413 | 413 | } |
414 | 414 | |
415 | + /** |
|
416 | + * @param string $feature |
|
417 | + * @param string $value |
|
418 | + */ |
|
415 | 419 | public function triggerChange($feature, $value = null) { |
416 | 420 | if ($this->emitter) { |
417 | 421 | $this->emitter->emit('\OC\User', 'changeUser', array($this, $feature, $value)); |
@@ -122,7 +122,7 @@ |
||
122 | 122 | * @param RequestInterface $request |
123 | 123 | * @param ResponseInterface $response |
124 | 124 | * |
125 | - * @return null|bool |
|
125 | + * @return null|false |
|
126 | 126 | */ |
127 | 127 | public function httpPost(RequestInterface $request, ResponseInterface $response) |
128 | 128 | { |
@@ -22,7 +22,6 @@ |
||
22 | 22 | namespace OCA\DAV\Tests\Unit\Sabre\Connector; |
23 | 23 | |
24 | 24 | use OCA\DAV\Connector\Sabre\FilesReportPlugin as FilesReportPluginImplementation; |
25 | -use Sabre\DAV\Exception\NotFound; |
|
26 | 25 | use OCP\SystemTag\ISystemTagObjectMapper; |
27 | 26 | use OC\Files\View; |
28 | 27 | use OCP\Files\Folder; |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | * if wnd.logging.enable is set to true in the config will log a leave line |
509 | 509 | * with the given function, the return value or the exception |
510 | 510 | * |
511 | - * @param $function |
|
511 | + * @param string $function |
|
512 | 512 | * @param mixed $result an exception will be logged and then returned |
513 | 513 | * @return mixed |
514 | 514 | */ |
@@ -535,6 +535,9 @@ discard block |
||
535 | 535 | return $result; |
536 | 536 | } |
537 | 537 | |
538 | + /** |
|
539 | + * @param string $function |
|
540 | + */ |
|
538 | 541 | private function swallow($function, \Exception $exception) { |
539 | 542 | if (\OC::$server->getConfig()->getSystemValue('wnd.logging.enable', false) === true) { |
540 | 543 | Util::writeLog('wnd', "$function swallowing ".get_class($exception) |