@@ -1086,7 +1086,7 @@ discard block |
||
1086 | 1086 | /** |
1087 | 1087 | * Find objects in the given relationships, merging them into the given list |
1088 | 1088 | * |
1089 | - * @param array $source Config property to extract relationships from |
|
1089 | + * @param string $source Config property to extract relationships from |
|
1090 | 1090 | * @param bool $recursive True if recursive |
1091 | 1091 | * @param ArrayList $list Optional list to add items to |
1092 | 1092 | * @return ArrayList The list |
@@ -1198,7 +1198,7 @@ discard block |
||
1198 | 1198 | /** |
1199 | 1199 | * Check if the current user can delete this record from live |
1200 | 1200 | * |
1201 | - * @param null $member |
|
1201 | + * @param Member|null $member |
|
1202 | 1202 | * @return mixed |
1203 | 1203 | */ |
1204 | 1204 | public function canUnpublish($member = null) |
@@ -1312,7 +1312,7 @@ discard block |
||
1312 | 1312 | * Extend permissions to include additional security for objects that are not published to live. |
1313 | 1313 | * |
1314 | 1314 | * @param Member $member |
1315 | - * @return bool|null |
|
1315 | + * @return false|null |
|
1316 | 1316 | */ |
1317 | 1317 | public function canView($member = null) |
1318 | 1318 | { |
@@ -1390,7 +1390,7 @@ discard block |
||
1390 | 1390 | * |
1391 | 1391 | * @param string $stage |
1392 | 1392 | * @param Member $member |
1393 | - * @return bool |
|
1393 | + * @return boolean|string |
|
1394 | 1394 | */ |
1395 | 1395 | public function canViewStage($stage = 'Live', $member = null) |
1396 | 1396 | { |
@@ -1459,7 +1459,7 @@ discard block |
||
1459 | 1459 | /** |
1460 | 1460 | * Determines if the current draft version is the same as live or rather, that there are no outstanding draft changes |
1461 | 1461 | * |
1462 | - * @return bool |
|
1462 | + * @return string |
|
1463 | 1463 | */ |
1464 | 1464 | public function latestPublished() |
1465 | 1465 | { |
@@ -2554,7 +2554,7 @@ discard block |
||
2554 | 2554 | /** |
2555 | 2555 | * Returns an array of possible stages. |
2556 | 2556 | * |
2557 | - * @return array |
|
2557 | + * @return string[] |
|
2558 | 2558 | */ |
2559 | 2559 | public function getVersionedStages() |
2560 | 2560 | { |
@@ -137,7 +137,7 @@ |
||
137 | 137 | * Remove a previously registered authenticator |
138 | 138 | * |
139 | 139 | * @param string $authenticator Name of the authenticator class to register |
140 | - * @return bool Returns TRUE on success, FALSE otherwise. |
|
140 | + * @return boolean|null Returns TRUE on success, FALSE otherwise. |
|
141 | 141 | */ |
142 | 142 | public static function unregister_authenticator($authenticator) |
143 | 143 | { |
@@ -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 | { |