@@ -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 | { |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | use SilverStripe\ORM\Hierarchy\Hierarchy; |
| 31 | 31 | use SilverStripe\ORM\ManyManyList; |
| 32 | 32 | use SilverStripe\ORM\UnsavedRelationList; |
| 33 | -use SilverStripe\View\Requirements; |
|
| 34 | 33 | |
| 35 | 34 | /** |
| 36 | 35 | * A security group. |
@@ -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 | */ |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\ClassInfo; |
| 6 | 6 | use SilverStripe\Core\Resettable; |
| 7 | -use SilverStripe\Dev\Debug; |
|
| 8 | 7 | use SilverStripe\Dev\TestOnly; |
| 9 | 8 | use SilverStripe\i18n\i18nEntityProvider; |
| 10 | 9 | use SilverStripe\ORM\DB; |
@@ -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; |
@@ -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 | { |
@@ -197,6 +197,9 @@ |
||
| 197 | 197 | |
| 198 | 198 | // -------------------------------------------------------------------------------------------------------------- |
| 199 | 199 | |
| 200 | + /** |
|
| 201 | + * @param DOMElement $node |
|
| 202 | + */ |
|
| 200 | 203 | protected function removeNode($node) |
| 201 | 204 | { |
| 202 | 205 | $node->parentNode->removeChild($node); |
@@ -139,6 +139,7 @@ |
||
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * @param boolean |
| 142 | + * @param boolean $bool |
|
| 142 | 143 | */ |
| 143 | 144 | public function setAllowMultibyte($bool) |
| 144 | 145 | { |