@@ -108,6 +108,9 @@ |
||
108 | 108 | return $addressBooks; |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $addressBookUri |
|
113 | + */ |
|
111 | 114 | private function getAddressBooksByUri($addressBookUri) { |
112 | 115 | $query = $this->db->getQueryBuilder(); |
113 | 116 | $result = $query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken']) |
@@ -78,7 +78,7 @@ |
||
78 | 78 | * the next element. |
79 | 79 | * |
80 | 80 | * @param Reader $reader |
81 | - * @return mixed |
|
81 | + * @return TagList |
|
82 | 82 | */ |
83 | 83 | static function xmlDeserialize(Reader $reader) { |
84 | 84 | $tags = []; |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | |
391 | 391 | /** |
392 | 392 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
393 | - * @param string $dn the dn of the user object |
|
393 | + * @param string $fdn the dn of the user object |
|
394 | 394 | * @param string $ldapName optional, the display name of the object |
395 | 395 | * @return string|false with with the name to use in ownCloud |
396 | 396 | */ |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | |
408 | 408 | /** |
409 | 409 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
410 | - * @param string $dn the dn of the user object |
|
410 | + * @param string $fdn the dn of the user object |
|
411 | 411 | * @param string $ldapName optional, the display name of the object |
412 | 412 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
413 | 413 | * @return string|false with with the name to use in ownCloud |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | * the login filter. |
663 | 663 | * |
664 | 664 | * @param string $loginName |
665 | - * @param array $attributes optional, list of attributes to read |
|
665 | + * @param string[] $attributes optional, list of attributes to read |
|
666 | 666 | * @return array |
667 | 667 | */ |
668 | 668 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -768,7 +768,7 @@ discard block |
||
768 | 768 | |
769 | 769 | /** |
770 | 770 | * @param string $filter |
771 | - * @param string|string[] $attr |
|
771 | + * @param string[] $attr |
|
772 | 772 | * @param int $limit |
773 | 773 | * @param int $offset |
774 | 774 | * @return false|int |
@@ -818,6 +818,7 @@ discard block |
||
818 | 818 | * retrieved. Results will according to the order in the array. |
819 | 819 | * @param int $limit optional, maximum results to be counted |
820 | 820 | * @param int $offset optional, a starting point |
821 | + * @param string $filter |
|
821 | 822 | * @return array|false array with the search result as first value and pagedSearchOK as |
822 | 823 | * second | false if not successful |
823 | 824 | */ |
@@ -864,7 +865,7 @@ discard block |
||
864 | 865 | * @param bool $pagedSearchOK whether a paged search has been executed |
865 | 866 | * @param bool $skipHandling required for paged search when cookies to |
866 | 867 | * prior results need to be gained |
867 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
868 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
868 | 869 | */ |
869 | 870 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
870 | 871 | $cookie = null; |
@@ -1081,7 +1082,7 @@ discard block |
||
1081 | 1082 | |
1082 | 1083 | /** |
1083 | 1084 | * @param string $name |
1084 | - * @return bool|mixed|string |
|
1085 | + * @return string |
|
1085 | 1086 | */ |
1086 | 1087 | public function sanitizeUsername($name) { |
1087 | 1088 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1105,6 +1106,7 @@ discard block |
||
1105 | 1106 | * escapes (user provided) parts for LDAP filter |
1106 | 1107 | * @param string $input, the provided value |
1107 | 1108 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1109 | + * @param string $input |
|
1108 | 1110 | * @return string the escaped string |
1109 | 1111 | */ |
1110 | 1112 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1552,7 +1554,7 @@ discard block |
||
1552 | 1554 | |
1553 | 1555 | /** |
1554 | 1556 | * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. |
1555 | - * @return boolean|null true on success, null or false otherwise |
|
1557 | + * @return boolean true on success, null or false otherwise |
|
1556 | 1558 | */ |
1557 | 1559 | public function getPagedSearchResultState() { |
1558 | 1560 | $result = $this->pagedSearchedSuccessful; |
@@ -1567,7 +1569,7 @@ discard block |
||
1567 | 1569 | * @param string[] $attr optional, when a certain attribute shall be filtered outside |
1568 | 1570 | * @param int $limit |
1569 | 1571 | * @param int $offset |
1570 | - * @return bool|true |
|
1572 | + * @return boolean |
|
1571 | 1573 | */ |
1572 | 1574 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
1573 | 1575 | $pagedSearchOK = false; |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use OCP\IUser; |
28 | 28 | use OCP\ILogger; |
29 | 29 | use OCP\Files\Folder; |
30 | - |
|
31 | 30 | use OC\Share20\Exception\ShareNotFound; |
32 | 31 | |
33 | 32 | /** |
@@ -144,6 +144,9 @@ |
||
144 | 144 | return true; |
145 | 145 | } |
146 | 146 | |
147 | + /** |
|
148 | + * @param string $path |
|
149 | + */ |
|
147 | 150 | public function url_stat($path) { |
148 | 151 | if (isset(self::$data[$path])) { |
149 | 152 | $size = strlen(self::$data[$path]); |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use OCP\IUser; |
28 | 28 | use OCP\ILogger; |
29 | 29 | use OCP\Files\Folder; |
30 | - |
|
31 | 30 | use OC\Share20\Exception\ShareNotFound; |
32 | 31 | |
33 | 32 | /** |
@@ -93,7 +93,6 @@ discard block |
||
93 | 93 | |
94 | 94 | /** |
95 | 95 | * @When /^sending "([^"]*)" to "([^"]*)" with$/ |
96 | - * @param \Behat\Gherkin\Node\TableNode|null $formData |
|
97 | 96 | */ |
98 | 97 | public function sendingToWith($verb, $url, $body) { |
99 | 98 | $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php" . $url; |
@@ -136,6 +135,10 @@ discard block |
||
136 | 135 | PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode()); |
137 | 136 | } |
138 | 137 | |
138 | + /** |
|
139 | + * @param string $path |
|
140 | + * @param string $filename |
|
141 | + */ |
|
139 | 142 | public static function removeFile($path, $filename){ |
140 | 143 | if (file_exists("$path" . "$filename")) { |
141 | 144 | unlink("$path" . "$filename"); |
@@ -1,7 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Behat\Behat\Context\Context; |
|
4 | -use Behat\Behat\Context\SnippetAcceptingContext; |
|
5 | 3 | use GuzzleHttp\Client; |
6 | 4 | use GuzzleHttp\Message\ResponseInterface; |
7 | 5 |
@@ -1,7 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Behat\Behat\Context\Context; |
|
4 | -use Behat\Behat\Context\SnippetAcceptingContext; |
|
5 | 3 | use GuzzleHttp\Client; |
6 | 4 | use GuzzleHttp\Message\ResponseInterface; |
7 | 5 |
@@ -19,7 +19,6 @@ discard block |
||
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @When /^creating a share with$/ |
22 | - * @param \Behat\Gherkin\Node\TableNode|null $formData |
|
23 | 22 | */ |
24 | 23 | public function creatingShare($body) { |
25 | 24 | $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v1/shares"; |
@@ -149,6 +148,9 @@ discard block |
||
149 | 148 | PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode()); |
150 | 149 | } |
151 | 150 | |
151 | + /** |
|
152 | + * @param integer $shareType |
|
153 | + */ |
|
152 | 154 | public function createShare($user, |
153 | 155 | $path = null, |
154 | 156 | $shareType = null, |
@@ -356,7 +358,6 @@ discard block |
||
356 | 358 | |
357 | 359 | /** |
358 | 360 | * @Then /^Share fields of last share match with$/ |
359 | - * @param \Behat\Gherkin\Node\TableNode|null $formData |
|
360 | 361 | */ |
361 | 362 | public function checkShareFields($body){ |
362 | 363 | if ($body instanceof \Behat\Gherkin\Node\TableNode) { |
@@ -1,9 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use Behat\Behat\Context\Context; |
|
4 | -use Behat\Behat\Context\SnippetAcceptingContext; |
|
5 | 3 | use GuzzleHttp\Client; |
6 | -use GuzzleHttp\Message\ResponseInterface; |
|
7 | 4 | |
8 | 5 | require __DIR__ . '/../../vendor/autoload.php'; |
9 | 6 |