@@ -398,7 +398,6 @@ discard block |
||
398 | 398 | * @see SQLConditionalExpression::addWhere() for syntax examples |
399 | 399 | * |
400 | 400 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
401 | - * @param mixed $where,... Unlimited additional predicates |
|
402 | 401 | * @return $this Self reference |
403 | 402 | */ |
404 | 403 | public function setWhere($where) |
@@ -485,7 +484,6 @@ discard block |
||
485 | 484 | * </code> |
486 | 485 | * |
487 | 486 | * @param mixed $where Predicate(s) to set, as escaped SQL statements or paramaterised queries |
488 | - * @param mixed $where,... Unlimited additional predicates |
|
489 | 487 | * @return $this Self reference |
490 | 488 | */ |
491 | 489 | public function addWhere($where) |
@@ -502,7 +500,6 @@ discard block |
||
502 | 500 | * @see SQLConditionalExpression::addWhere() |
503 | 501 | * |
504 | 502 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
505 | - * @param mixed $filters,... Unlimited additional predicates |
|
506 | 503 | * @return $this Self reference |
507 | 504 | */ |
508 | 505 | public function setWhereAny($filters) |
@@ -517,7 +514,6 @@ discard block |
||
517 | 514 | * @see SQLConditionalExpression::addWhere() |
518 | 515 | * |
519 | 516 | * @param mixed $filters Predicate(s) to set, as escaped SQL statements or paramaterised queries |
520 | - * @param mixed $filters,... Unlimited additional predicates |
|
521 | 517 | * @return $this Self reference |
522 | 518 | */ |
523 | 519 | public function addWhereAny($filters) |
@@ -409,6 +409,7 @@ |
||
409 | 409 | * Overloaded to ensure the code is always descent. |
410 | 410 | * |
411 | 411 | * @param string |
412 | + * @param string $val |
|
412 | 413 | */ |
413 | 414 | public function setCode($val) |
414 | 415 | { |
@@ -157,7 +157,7 @@ |
||
157 | 157 | * @param Form $form Optional: If passed, better error messages can be |
158 | 158 | * produced by using |
159 | 159 | * {@link Form::sessionMessage()} |
160 | - * @return bool|Member Returns FALSE if authentication fails, otherwise |
|
160 | + * @return Member|null Returns FALSE if authentication fails, otherwise |
|
161 | 161 | * the member object |
162 | 162 | * @see Security::setDefaultAdmin() |
163 | 163 | */ |
@@ -47,7 +47,7 @@ |
||
47 | 47 | * Eg: $this->characterStrength(3, array("lowercase", "uppercase", "digits", "punctuation")) |
48 | 48 | * |
49 | 49 | * @param int $minScore The minimum number of character tests that must pass |
50 | - * @param array $testNames The names of the tests to perform |
|
50 | + * @param string[] $testNames The names of the tests to perform |
|
51 | 51 | * @return $this |
52 | 52 | */ |
53 | 53 | public function characterStrength($minScore, $testNames) |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | * will be checked for the current user |
123 | 123 | * @param bool $strict Use "strict" checking (which means a permission |
124 | 124 | * will be granted if the key does not exist at all)? |
125 | - * @return int|bool The ID of the permission record if the permission |
|
125 | + * @return boolean|string The ID of the permission record if the permission |
|
126 | 126 | * exists; FALSE otherwise. If "strict" checking is |
127 | 127 | * disabled, TRUE will be returned if the permission does not exist at all. |
128 | 128 | */ |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | * @param string $arg Optional argument (e.g. a permissions for a specific page) |
163 | 163 | * @param bool $strict Use "strict" checking (which means a permission |
164 | 164 | * will be granted if the key does not exist at all)? |
165 | - * @return int|bool The ID of the permission record if the permission |
|
165 | + * @return boolean|string The ID of the permission record if the permission |
|
166 | 166 | * exists; FALSE otherwise. If "strict" checking is |
167 | 167 | * disabled, TRUE will be returned if the permission does not exist at all. |
168 | 168 | */ |
@@ -58,7 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * Get permissions |
60 | 60 | * |
61 | - * @return array Associative array of permissions in this permission |
|
61 | + * @return string Associative array of permissions in this permission |
|
62 | 62 | * group. The array indicies are the permission codes as |
63 | 63 | * used in {@link Permission::check()}. The value is |
64 | 64 | * suitable for using in an interface. |
@@ -85,6 +85,9 @@ |
||
85 | 85 | return $this->token; |
86 | 86 | } |
87 | 87 | |
88 | + /** |
|
89 | + * @param string $token |
|
90 | + */ |
|
88 | 91 | public function setToken($token) |
89 | 92 | { |
90 | 93 | $this->token = $token; |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | * Combine the given forms into a formset with a tabbed interface |
533 | 533 | * |
534 | 534 | * @param array $forms List of LoginForm instances |
535 | - * @return string |
|
535 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
536 | 536 | */ |
537 | 537 | protected function generateLoginFormSet($forms) |
538 | 538 | { |
@@ -1149,7 +1149,7 @@ discard block |
||
1149 | 1149 | /** |
1150 | 1150 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
1151 | 1151 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
1152 | - * @param $flag True or false |
|
1152 | + * @param boolean $flag True or false |
|
1153 | 1153 | */ |
1154 | 1154 | public static function set_ignore_disallowed_actions($flag) |
1155 | 1155 | { |
@@ -150,6 +150,7 @@ |
||
150 | 150 | /** |
151 | 151 | * Get the body element, or false if there isn't one (we haven't loaded any content |
152 | 152 | * or this instance is in an invalid state) |
153 | + * @return \DOMElement |
|
153 | 154 | */ |
154 | 155 | public function getBody() |
155 | 156 | { |